Merge branch 'develop'

[ci skip] Updated packages #63
2024-09-24 20:10:52 +02:00 · 2024-04-24 00:09:30 +00:00 · 2024-04-23 11:54:04 +02:00 · 2024-03-20 12:00:40 +00:00 · 2024-03-20 11:59:14 +00:00 · 2024-03-19 16:04:26 +01:00
48 changed files with 15949 additions and 2765 deletions
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ ng serve
 ```
 *Go*`

-Point your browser to http://localhost:4200
+Point your browser to http://localhost:4200 

 *ESLint*

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "farmmaps-lib-app",
-  "version": "4.18.0",
-  "scripts":   {
+  "version": "4.10.0",
+  "scripts": {
    "ng": "ng",
    "start": "ng serve",
    "build": "ng build",
@@ -10,16 +10,16 @@
    "e2e": "ng e2e"
  },
  "private": true,
-  "dependencies":   {
+  "dependencies": {
    "@angular-eslint/eslint-plugin": "^18.2.0",
-    "@angular/animations": "18.2.3",
-    "@angular/common": "18.2.3",
-    "@angular/compiler": "18.2.3",
-    "@angular/core": "18.2.3",
-    "@angular/forms": "18.2.3",
-    "@angular/platform-browser": "18.2.3",
-    "@angular/platform-browser-dynamic": "18.2.3",
-    "@angular/router": "18.2.3",
+    "@angular/animations": "^18.2.3",
+    "@angular/common": "^18.2.3",
+    "@angular/compiler": "^18.2.3",
+    "@angular/core": "^18.2.3",
+    "@angular/forms": "^18.2.3",
+    "@angular/platform-browser": "^18.2.3",
+    "@angular/platform-browser-dynamic": "^18.2.3",
+    "@angular/router": "^18.2.3",
    "@farmmaps/common": "file:dist/common",
    "@farmmaps/common-map": "file:dist/common-map",
    "@farmmaps/common-map3d": "file:dist/common-map3d",
@@ -56,17 +56,17 @@
    "util": "^0.12.4",
    "zone.js": "~0.14.10"
  },
-  "optionalDependencies":   {
+  "optionalDependencies": {
    "@lmdb/lmdb-linux-x64": "^3.1.0",
    "@rollup/rollup-linux-x64-gnu": "^4.21.2"
  },
-  "devDependencies":   {
+  "devDependencies": {
    "@angular-builders/custom-webpack": "^18.0.0",
-    "@angular-devkit/build-angular": "18.2.3",
-    "@angular/cli": "18.2.3",
-    "@angular/compiler-cli": "18.2.3",
-    "@angular/language-service": "18.2.3",
-    "@angular/localize": "18.2.3",
+    "@angular-devkit/build-angular": "^18.2.3",
+    "@angular/cli": "^18.2.3",
+    "@angular/compiler-cli": "^18.2.3",
+    "@angular/language-service": "^18.2.3",
+    "@angular/localize": "^18.2.3",
    "@types/arcgis-rest-api": "^10.4.5",
    "@types/jasmine": "~2.8.8",
    "@types/jasminewd2": "^2.0.9",
@@ -90,4 +90,4 @@
    "ts-node": "^8.8.1",
    "typescript": "~5.4.4"
  }
-}
+}
--- a/projects/common-map/package.json
+++ b/projects/common-map/package.json
@@ -8,7 +8,7 @@
    "tslib": "^2.0.0"
  },
  "peerDependencies": {
-    "@angular/core": "18.2.3",
+    "@angular/core": "^18.2.3",
    "ngrx-store-localstorage": "^18.0.0",
    "@ngrx/effects": "^18.0.2",
    "@ngrx/router-store": "^18.0.2",
--- a/projects/common-map/src/fm-map/common-map.module.ts
+++ b/projects/common-map/src/fm-map/common-map.module.ts
@@ -36,12 +36,10 @@ import { RotationResetComponent } from './components/aol/rotation-reset/rotation
 import { ZoomToExtentComponent } from './components/aol/zoom-to-extent/zoom-to-extent.component';
 import { FeatureListContainerComponent } from './components/feature-list-container/feature-list-container.component';
 import { FeatureListCropfieldComponent } from './components/feature-list-cropfield/feature-list-cropfield.component';
-import { FeatureListObservationComponent } from './components/feature-list-observation/feature-list-observation.component';
 import { FeatureListCroppingschemeComponent } from './components/feature-list-croppingscheme/feature-list-croppingscheme.component';
 import { FeatureListFeatureContainerComponent } from './components/feature-list-feature-container/feature-list-feature-container.component';
 import { FeatureListFeatureCropfieldComponent } from './components/feature-list-feature-cropfield/feature-list-feature-cropfield.component';
 import { FeatureListFeatureCroppingschemeComponent } from './components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component';
-import { FeatureListFeatureObservationComponent } from './components/feature-list-feature-observation/feature-list-feature-observation.component';
 import { AbstractFeatureListFeatureComponent, FeatureListFeatureComponent } from './components/feature-list-feature/feature-list-feature.component';
 import { AbstractFeatureListComponent, FeatureListComponent } from './components/feature-list/feature-list.component';
 import { GeometryThumbnailComponent } from './components/feature-thumbnail/feature-thumbnail.component';
@@ -107,7 +105,7 @@ const metaReducers: Array<MetaReducer<any, any>> = [LocalStorageSync];

 export {
  AbstractFeatureListComponent,
-  AbstractFeatureListFeatureComponent, AbstractItemListComponent, AbstractItemListItemComponent, AbstractItemWidgetComponent, AbstractSelectedItemComponent, DeviceOrientationService, FeatureIconService, FeatureListComponent, FeatureListContainerComponent, FeatureListCropfieldComponent, FeatureListObservationComponent, FeatureListCroppingschemeComponent, FeatureListFeatureComponent, FeatureListFeatureContainerComponent, FeatureListFeatureCropfieldComponent, FeatureListFeatureObservationComponent, FeatureListFeatureCroppingschemeComponent, FileDropTargetComponent, ForChild,
+  AbstractFeatureListFeatureComponent, AbstractItemListComponent, AbstractItemListItemComponent, AbstractItemWidgetComponent, AbstractSelectedItemComponent, DeviceOrientationService, FeatureIconService, FeatureListComponent, FeatureListContainerComponent, FeatureListCropfieldComponent, FeatureListCroppingschemeComponent, FeatureListFeatureComponent, FeatureListFeatureContainerComponent, FeatureListFeatureCropfieldComponent, FeatureListFeatureCroppingschemeComponent, FileDropTargetComponent, ForChild,
  ForItemType, ForPackage, ForSourceTask, GeolocationService, GeometryThumbnailComponent, GpsLocation, IClickedFeature, ifZoomToShowDirective, IItemLayer, IMapState, IPeriodState, ISelectedFeatures, ItemLayer, ItemLayersComponent, ItemListComponent, ItemListItemComponent,
  ItemListItemContainerComponent, ITemporalItemLayer, ItemVectorSourceComponent, ItemWidgetListComponent, LayerListComponent, LayerSwitcher, LayerVectorImageComponent, LegendComponent, mapActions, MapComponent, mapEffects,
  mapReducers, MapSearchComponent, MetaDataModalComponent, PanToLocation, RotationResetComponent, SelectedItemComponent, SelectedItemContainerComponent, SelectedItemCropfieldComponent,
@@ -144,12 +142,10 @@ export {
        FeatureListContainerComponent,
        FeatureListCroppingschemeComponent,
        FeatureListCropfieldComponent,
-        FeatureListObservationComponent,
        FeatureListFeatureContainerComponent,
        FeatureListFeatureComponent,
        FeatureListFeatureCroppingschemeComponent,
        FeatureListFeatureCropfieldComponent,
-        FeatureListFeatureObservationComponent,
        SelectedItemContainerComponent,
        SelectedItemComponent,
        SelectedItemCropfieldComponent,
@@ -182,7 +178,6 @@ export {
        LayerSwitcher,
        FeatureListFeatureComponent,
        FeatureListFeatureCropfieldComponent,
-        FeatureListFeatureObservationComponent,
        FeatureListFeatureCroppingschemeComponent,
        SelectedItemContainerComponent,
        SelectedItemComponent,
@@ -206,7 +201,6 @@ export {
        FeatureListContainerComponent,
        FeatureListCroppingschemeComponent,
        FeatureListCropfieldComponent,
-        FeatureListObservationComponent,
        FeatureListFeatureContainerComponent,
        ZoomToExtentComponent,
        ifZoomToShowDirective,
@@ -220,11 +214,9 @@ export {
        TemporalService,
        { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
        { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
-        { provide: AbstractFeatureListComponent, useClass: FeatureListObservationComponent, multi: true },        
        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
-        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureObservationComponent, multi: true },        
        { provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
        { provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
        { provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
--- a/projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.html
+++ b/projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.html
@@ -1,10 +0,0 @@
-<div *ngIf="feature;let feature">
-  <div class="row m-0">
-    <div class="col-3 m-0 p-2 thumbnail">
-      <img [src]="getSource(feature)" style="width: 34px">
-    </div>
-    <div class="col p-2" style="margin: auto;">
-      <h1 class="card-title" title="{{feature.get('name')}}">{{feature.get('name')}}</h1>
-    </div>  
-  </div>
-</div>
--- a/projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.scss
+++ b/projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.scss
@@ -1,22 +0,0 @@
-.card-title {
-  font-size: 1rem;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.card-text {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-
-.col {
-  overflow: hidden;
-}
-
-.thumbnail {
-  width: 4em;
-  height: 4em;
-}
-
--- a/projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.ts
+++ b/projects/common-map/src/fm-map/components/feature-list-feature-observation/feature-list-feature-observation.component.ts
@@ -1,29 +0,0 @@
-import { Component, Injectable } from '@angular/core';
-import { AppConfig, commonReducers, ItemTypeService } from '@farmmaps/common';
-import { Store } from '@ngrx/store';
-import { Feature } from 'ol';
-import { Geometry } from 'ol/geom';
-import * as mapReducers from '../../reducers/map.reducer';
-import { AbstractFeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component';
-import { ForItemType } from '../for-item/for-itemtype.decorator';
-
-@ForItemType("vnd.farmmaps.itemtype.observation")
-@Injectable()
-@Component({
-  selector: 'fm-map-feature-list-feature-observation',
-  templateUrl: './feature-list-feature-observation.component.html',
-  styleUrls: ['./feature-list-feature-observation.component.scss']
-})
-export class FeatureListFeatureObservationComponent extends AbstractFeatureListFeatureComponent {
-
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService,config:AppConfig) {
-    super(store, itemTypeService,config);
-  }
-
-  getSource(feature: Feature<Geometry>): string {
-    let source = "/images/decease.png";
-    var type = feature.get('type');
-    source = '/images/' + type + '.png';
-    return source;
-  }
-}
--- a/projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.html
+++ b/projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.html
@@ -1,14 +0,0 @@
-<div class="card border-0">
-  <div class="card-body" *ngIf="(schemeItem|async);let schemeItem">
-    <fm-back-button></fm-back-button>
-    <h4 i18n>Farm</h4>
-    <h3>{{schemeItem.name}}</h3>
-    <div *ngIf="features;let features">
-        <div class="cropfields">
-          <div class="row m-0 ps-3 pe-3" *ngFor="let feature of features" [ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
-          <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
--- a/projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.scss
+++ b/projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.scss
@@ -1,20 +0,0 @@
-fm-map-feature-list-feature-container {
-  width:100%;
-  pointer-events:none;
-}
-
-.row {
-  border-bottom: 1px solid var(--bs-gray-500);
-  user-select: none;
-  padding-left:1.5rem;
-}
-
-.row.selected {
-  background-color: var(--bs-gray-100);
-}
-
-.cropfields {
-  border-top: 1px solid var(--bs-gray-500);
-  margin-left: -1.25rem;
-  margin-right: -1.25rem;
-}
--- a/projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.ts
+++ b/projects/common-map/src/fm-map/components/feature-list-observation/feature-list-observation.component.ts
@@ -1,30 +0,0 @@
-import { Component, Injectable,AfterViewInit, OnInit,SimpleChanges, ChangeDetectorRef} from '@angular/core';
-import { Location } from '@angular/common';
-import { AbstractFeatureListComponent } from '../feature-list/feature-list.component';
-import {ForItemType } from '../for-item/for-itemtype.decorator';
-import {ForChild } from '../for-item/for-child.decorator';
-import { Store } from '@ngrx/store';
-import * as mapReducers from '../../reducers/map.reducer';
-import { commonReducers, ItemTypeService, IItem,ItemService } from '@farmmaps/common';
-import { Observable } from 'rxjs';
-
-@ForChild()
-@ForItemType("vnd.farmmaps.itemtype.observation")
-@Injectable()
-@Component({
-  selector: 'fm-map-feature-list-observation',
-    templateUrl: './feature-list-observation.component.html',
-    styleUrls: ['./feature-list-observation.component.scss']
-})
-export class FeatureListObservationComponent extends AbstractFeatureListComponent implements OnInit {
-
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, private itemService: ItemService) {
-    super(store, itemTypeService,location);
-  }
-
-  public schemeItem: Observable<IItem>
-
-  ngOnInit() {
-    this.schemeItem = this.itemService.getItem(this.queryState.parentCode);
-  } 
-}
--- a/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html
+++ b/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html
@@ -10,7 +10,7 @@
        <li class="nav-item py-0">
          <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Base maps</span></span>
          <div  class="mb-4">
-            <fm-map-layer-list [baseLayers]="true" [itemLayers]="baseMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
+            <fm-map-layer-list [baseLayers]="true" [itemLayers]="baseLayers|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
          </div>
        </li>
        <li class="nav-item py-0">
@@ -20,17 +20,12 @@
          </div>
        </li>
        <li class="nav-item py-0" *ngIf="selectedItemLayer$ | async as selectedItemLayer">
-          <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Overlay slider</span><span class="slideButton"><a href="#" title="Compare" class="btn btn-light btn-sm" (click)="handleToggleShowDatalayerSlide($event)"><i class="fal fa-sliders-h-square"></i></a></span></span>
+          <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Data</span><span class="slideButton"><a href="#" title="Compare" class="btn btn-light btn-sm" (click)="handleToggleShowDatalayerSlide($event)"><i class="fal fa-sliders-h-square"></i></a></span></span>
          <div class="mb-4">
            <fm-map-layer-list [dataLayers]="true" [itemLayers]="[selectedItemLayer]" [selectedLayer]="selectedItemLayer" (onToggleVisibility)="handleOnToggleVisibility($event)" (onSetOpacity)="handleOnSetOpacity($event)" (onZoomToExtent)="handleZoomToExtent($event)" (onSelectLayer)="handleSelectOverlayLayer($event)"></fm-map-layer-list>
          </div>
        </li>
-        <li class="nav-item py-0">
-          <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Aerial photos</span></span>
-          <div  class="mb-4">
-            <fm-map-layer-list [baseLayers]="true" [itemLayers]="aerialMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
-          </div>
-        </li>
+
      </ul>
  </div>
  </div>
--- a/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.ts
+++ b/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.ts
@@ -4,7 +4,7 @@ import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
 import * as mapActions from '../../actions/map.actions';
 import {createEmpty,extend } from 'ol/extent';
-import { filter, map, Observable } from 'rxjs';
+import { Observable } from 'rxjs';

@Component({
  selector: 'fm-map-layer-switcher',
@@ -17,8 +17,7 @@ export class LayerSwitcher  implements OnInit,OnChanges{
  public overlayLayers: Observable<Array<IItemLayer>>;
  public selectedOverlayLayer: Observable<IItemLayer>;
  public selectedItemLayer$: Observable<IItemLayer>;
-  public baseMaps: Observable<Array<IItemLayer>>;
-  public aerialMaps: Observable<Array<IItemLayer>>;
+  public baseLayers: Observable<Array<IItemLayer>>;
  public selectedBaseLayer: Observable<IItemLayer>;

  constructor( private store: Store<mapReducers.State>) {
@@ -27,8 +26,7 @@ export class LayerSwitcher  implements OnInit,OnChanges{
  ngOnInit() { 
    this.overlayLayers = this.store.select(mapReducers.selectGetOverlayLayers);
    this.selectedOverlayLayer = this.store.select(mapReducers.selectGetSelectedOverlayLayer);
-    this.baseMaps = this.store.select(mapReducers.selectGetBaseMaps);
-    this.aerialMaps = this.store.select(mapReducers.selectGetArealMaps);
+    this.baseLayers = this.store.select(mapReducers.selectGetBaseLayers);
    this.selectedBaseLayer = this.store.select(mapReducers.selectGetSelectedBaseLayer);
    this.selectedItemLayer$ = this.store.select(mapReducers.selectGetSelectedItemLayer)
    this.showLayerSwitcher = this.store.select(mapReducers.selectGetShowLayerSwitcher);
@@ -85,4 +83,3 @@ export class LayerSwitcher  implements OnInit,OnChanges{
    event.preventDefault();
  }
 }
- 
--- a/projects/common-map/src/fm-map/components/map/map.component.scss
+++ b/projects/common-map/src/fm-map/components/map/map.component.scss
@@ -52,20 +52,11 @@ aol-map { position:absolute;width:100%;height:calc( 100vh );}
  pointer-events: none;
 }

-@media screen and (max-width: 768px) {
-  .control-container {
-    margin-left: 1em;
-    margin-right: 1em;
-    pointer-events: all;
-  }
-}

-@media screen and (min-width: 768px) {
-  .control-container {    
-    float: right;
-    margin-right: 1em;
-    pointer-events: all;
-  }
+.control-container {
+  float:right;
+  margin-right: 1em;
+  pointer-events: all;
 }

 .fullscreen .viewport-container {
--- a/projects/common-map/src/fm-map/components/map/map.component.ts
+++ b/projects/common-map/src/fm-map/components/map/map.component.ts
@@ -1,39 +1,39 @@
-import { Component, OnInit, OnDestroy, HostListener, ViewChild, AfterViewInit, NgZone, ElementRef } from '@angular/core';
+import { Component, OnInit, OnDestroy, HostListener, ViewChild, AfterViewInit,NgZone,ElementRef } from '@angular/core';
 import { Location } from '@angular/common';
-import { Observable, Subject, Subscription, from, of, EMPTY } from 'rxjs';
-import { withLatestFrom, switchMap, skip } from 'rxjs/operators';
+import { Observable, Subject, Subscription, from,of ,EMPTY } from 'rxjs';
+import { withLatestFrom, switchMap,skip  } from 'rxjs/operators';
 import { Router, ActivatedRoute, ParamMap } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { DeviceService } from '@farmmaps/common';
-import { getRenderPixel } from 'ol/render';
+import {getRenderPixel} from 'ol/render';

 // Map
 import * as mapReducers from '../../reducers/map.reducer';
 import * as mapActions from '../../actions/map.actions';
-import { IMapState } from '../../models/map.state';
-import { IClickedFeature } from '../../models/clicked.feature';
+import { IMapState} from '../../models/map.state';
+import { IClickedFeature} from '../../models/clicked.feature';
 import { IQuery } from '../../reducers/map.reducer'
 import { ISelectedFeatures } from '../../models/selected.features';
 import { IItemLayer } from '../../models/item.layer';
 import { IListItem, IQueryState } from '@farmmaps/common';
 import { IPeriodState } from '../../models/period.state';
-import { IStyles } from '../../models/style.cache';
+import {IStyles} from '../../models/style.cache';
 import { IDroppedFile } from '../aol/file-drop-target/file-drop-target.component';
 import { StateSerializerService } from '@farmmaps/common';
-import { GeolocationService } from '../../services/geolocation.service';
+import { GeolocationService} from '../../services/geolocation.service';
 import { GeolocatorService } from '@farmmaps/common';
-import { DeviceOrientationService } from '../../services/device-orientation.service';
+import {DeviceOrientationService} from '../../services/device-orientation.service';

 // AppCommon
 import { ResumableFileUploadService, ItemTypeService } from '@farmmaps/common';
 import { IItemType, IItem } from '@farmmaps/common';
-import { commonReducers } from '@farmmaps/common';
-import { commonActions } from '@farmmaps/common';
+import {commonReducers} from '@farmmaps/common';
+import {commonActions} from '@farmmaps/common';

-import { Feature } from 'ol';
-import { Geometry, Point, Circle } from 'ol/geom';
-import { Extent, createEmpty, extend } from 'ol/extent';
-import { transform } from 'ol/proj';
+import {Feature} from 'ol';
+import {Geometry,Point,Circle} from 'ol/geom';
+import {Extent,createEmpty,extend } from 'ol/extent';
+import {transform} from 'ol/proj';
 import { tassign } from 'tassign';
 import * as style from 'ol/style';

@@ -44,7 +44,7 @@ import * as style from 'ol/style';
  styleUrls: ['./map.component.scss']
 })

-export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
+export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
  title = 'Map';
  public openedModalName$: Observable<string> = this.store.select(commonReducers.selectOpenedModalName);
  public itemTypes$: Observable<{ [id: string]: IItemType }>;
@@ -54,51 +54,49 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
  public selectedOverlayLayer$: Observable<IItemLayer> = this.store.select(mapReducers.selectGetSelectedOverlayLayer);
  public selectedItemLayer$: Observable<IItemLayer> = this.store.select(mapReducers.selectGetSelectedItemLayer);
  public baseLayers$: Observable<Array<IItemLayer>> = this.store.select(mapReducers.selectGetBaseLayers);
-  public selectedBaseLayer$: Observable<IItemLayer> = this.store.select(mapReducers.selectGetSelectedBaseLayer);
+  public selectedBaseLayer$: Observable<IItemLayer> =  this.store.select(mapReducers.selectGetSelectedBaseLayer);
  public projection$: Observable<string> = this.store.select(mapReducers.selectGetProjection);
  public selectedFeatures$: Subject<ISelectedFeatures> = new Subject<ISelectedFeatures>();
-  public droppedFile$: Subject<IDroppedFile> = new Subject<IDroppedFile>();
+  public droppedFile$: Subject<IDroppedFile>  = new Subject<IDroppedFile>();
  private paramSub: Subscription;
  private itemTypeSub: Subscription;
  private stateSub: Subscription;
  private queryStateSub: Subscription;
  private querySub: Subscription;
-  public parentCode$: Observable<string> = this.store.select(mapReducers.selectGetParentCode);
+  public parentCode$: Observable<string> =this.store.select(mapReducers.selectGetParentCode);
  public panelVisible$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelVisible);
  public panelCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelCollapsed);
  public panelExtraWide$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelExtraWide);
  public selectedFeature$: Observable<Feature<Geometry>> = this.store.select(mapReducers.selectGetSelectedFeature);
  public clickedFeature: Subject<Feature<Geometry>> = new Subject<Feature<Geometry>>();
  public selectedItem$: Observable<IItem> = this.store.select(mapReducers.selectGetSelectedItem);
-  public parentItem$: Observable<IItem> = this.store.select(mapReducers.selectGetParentItem);
+  public parentItem$: Observable<IItem> =this.store.select(mapReducers.selectGetParentItem);
  public queryState$: Observable<IQueryState> = this.store.select(mapReducers.selectGetQueryState);
-  public state$: Observable<{ mapState: IMapState, queryState: IQueryState }> = this.store.select(mapReducers.selectGetState);
+  public state$:Observable<{mapState:IMapState,queryState:IQueryState}> = this.store.select(mapReducers.selectGetState);
  public period$: Observable<IPeriodState> = this.store.select(mapReducers.selectGetPeriod);
  public clearEnabled$: Observable<boolean> = this.store.select(mapReducers.selectGetClearEnabled);
  public searchCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetSearchCollapsed);
  public searchMinified$: Observable<boolean> = this.store.select(mapReducers.selectGetSearchMinified);
  public showDataLayerSlide$: Observable<boolean> = this.store.select(mapReducers.selectGetShowdataLayerSlide);
  public menuVisible$: Observable<boolean>;
-  public query$: Observable<IQuery> = this.store.select(mapReducers.selectGetQuery);
+  public query$: Observable<IQuery> =  this.store.select(mapReducers.selectGetQuery);
  public position$: Observable<GeolocationPosition> = this.geolocationService.getCurrentPosition();
  public compassHeading$: Observable<number> = this.deviceorientationService.getCurrentCompassHeading();
  public baseLayersCollapsed = true;
  public overlayLayersCollapsed = true;
  public extent$: Observable<Extent> = this.store.select(mapReducers.selectGetExtent);
-  public styles$: Observable<IStyles> = this.store.select(mapReducers.selectGetStyles);
+  public styles$:Observable<IStyles> = this.store.select(mapReducers.selectGetStyles);
  public fullscreen$: Observable<boolean> = this.store.select(commonReducers.selectGetFullScreen);
  private lastUrl = "";
  private initialized = false;
  public noContent = false;
  public overrideSelectedItemLayer = false;
  public overrideOverlayLayers = false;
-  public hideShowLayerValues = false;
-  public const
  public dataLayerSlideValue = 50;
  public dataLayerSlideEnabled = false;
  private visibleAreaBottom = 0;
  private viewEnabled = true;
-
+  
  @ViewChild('map') map;
  @ViewChild('contentDiv') contentDiv: ElementRef;

@@ -112,48 +110,47 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
    private geolocationService: GeolocationService,
    private geolocaterService: GeolocatorService,
    private zone: NgZone,
-    private deviceorientationService: DeviceOrientationService,
-    public devicesService: DeviceService) {
-    if (route && route.snapshot && route.snapshot.data && route.snapshot.data["fm-map-map"]) {
-      const params = route.snapshot.data["fm-map-map"];
-      this.overrideSelectedItemLayer = params["overrideSelectedItemlayer"] ? params["overrideSelectedItemlayer"] : false;
-      this.overrideOverlayLayers = params["overrideOverlayLayers"] ? params["overrideOverlayLayers"] : false;
-      this.hideShowLayerValues = params["hideShowLayerValues"] ? params["hideShowLayerValues"] : false;
-    }
-    this.querySub = this.query$.pipe(skip(1), withLatestFrom(this.mapState$)).subscribe(([query, mapState]) => {
-      if (query && query.querystate) {
-        let newQueryState = tassign(mapReducers.initialQueryState);
-        //console.debug(`Do Query`);
-        const urlparts = [];
-        if (query.querystate.itemCode && query.querystate.itemCode != "") {
-          if (query.querystate.itemType && query.querystate.itemType != "") {
-            const itemType = this.itemTypeService.itemTypes[query.querystate.itemType];
-            if (itemType && itemType.viewer && itemType.viewer == "edit_in_editor" && itemType.editor) {
-              urlparts.push('/editor');
-              urlparts.push(itemType.editor);
-              urlparts.push('item');
-              urlparts.push(query.querystate.itemCode);
-            }
-          }
-        } else {
-          newQueryState = query.querystate;
-        }
-        if (urlparts.length == 0) {
-          newQueryState.itemCode = query.querystate.itemCode;
-          this.zone.run(() => {
-            this.replaceUrl(mapState, newQueryState, query.replace);
-          })
-        } else {
-          this.router.navigate(urlparts);
-        }
+    private deviceorientationService:DeviceOrientationService,
+    public devicesService:DeviceService) {
+      if(route && route.snapshot && route.snapshot.data && route.snapshot.data["fm-map-map"]) {
+        const params = route.snapshot.data["fm-map-map"];
+        this.overrideSelectedItemLayer = params["overrideSelectedItemlayer"] ? params["overrideSelectedItemlayer"] : false;
+        this.overrideOverlayLayers = params["overrideOverlayLayers"] ? params["overrideOverlayLayers"] : false;
      }
-    });
-    this.store.dispatch(new mapActions.Init());
-    // this.store.select(commonReducers.getRootItems).subscribe((l) => {
-    //    if(l && l.length>0) {
-    //      this.store.dispatch(new mapActions.Init());
-    //    }
-    // });
+      this.querySub = this.query$.pipe(skip(1), withLatestFrom(this.mapState$)).subscribe(([query,mapState]) =>{
+        if(query && query.querystate) {
+          let newQueryState = tassign(mapReducers.initialQueryState);
+          //console.debug(`Do Query`);
+          const urlparts=[];
+          if (query.querystate.itemCode && query.querystate.itemCode != "") {
+            if(query.querystate.itemType && query.querystate.itemType!= "") {
+              const itemType = this.itemTypeService.itemTypes[query.querystate.itemType];
+              if (itemType && itemType.viewer && itemType.viewer == "edit_in_editor" && itemType.editor) {
+                urlparts.push('/editor');
+                urlparts.push(itemType.editor);
+                urlparts.push('item');
+                urlparts.push(query.querystate.itemCode);
+              }
+            }
+          } else {
+            newQueryState= query.querystate;
+          }
+          if(urlparts.length==0 ) {
+            newQueryState.itemCode = query.querystate.itemCode;
+            this.zone.run(() => {
+              this.replaceUrl(mapState,newQueryState,query.replace);             
+            })
+          } else {
+            this.router.navigate(urlparts);
+          }
+        }
+      });
+      this.store.dispatch(new mapActions.Init());
+      // this.store.select(commonReducers.getRootItems).subscribe((l) => {
+      //    if(l && l.length>0) {
+      //      this.store.dispatch(new mapActions.Init());
+      //    }
+      // });
  }

  @HostListener('document:keyup', ['$event'])
@@ -164,27 +161,27 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
    }
  }

-  handlePanelResize(resizeTop: number) {
-    if (resizeTop == 100 || !this.devicesService.IsMobile()) {
-      this.visibleAreaBottom = 0;
+  handlePanelResize(resizeTop:number) {
+    if(resizeTop==100 || !this.devicesService.IsMobile() ) {
+      this.visibleAreaBottom=0;
    } else {
-      this.visibleAreaBottom = 100 - resizeTop;
-      if (this.visibleAreaBottom > 60) {
-        this.visibleAreaBottom = 60;
+      this.visibleAreaBottom=100-resizeTop;
+      if(this.visibleAreaBottom>60) {
+        this.visibleAreaBottom=60;
      }
-    }
+    }      
  }

-  bottom(panelVisible: boolean) {
-    if (panelVisible) {
-      return this.visibleAreaBottom + '%';
+  bottom(panelVisible:boolean) {
+    if(panelVisible) {
+      return this.visibleAreaBottom + '%';     
    } else {
      return "0%";
    }
  }

  handleOpenModal(modalName: string) {
-    this.store.dispatch(new commonActions.OpenModal(modalName));
+    this.store.dispatch(new  commonActions.OpenModal(modalName));
  }

  handleCloseModal() {
@@ -192,7 +189,7 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
  }

  handleFileDropped(droppedFile: IDroppedFile) {
-    this.uploadService.addFiles(droppedFile.files, droppedFile.event, { parentCode: droppedFile.parentCode, geometry: droppedFile.geometry });
+    this.uploadService.addFiles(droppedFile.files, droppedFile.event, { parentCode:droppedFile.parentCode, geometry:droppedFile.geometry });
  }

  handleFeatureClick(feature: Feature<Geometry>) {
@@ -208,26 +205,26 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
    this.store.dispatch(new mapActions.DoQuery(queryState));
  }

-  handleSidepaneloutletActivate(component: any) {
-    if (component && component.hasOwnProperty('clickedFeature')) {
-      (component as IClickedFeature).clickedFeature = this.clickedFeature;
-    }
-    if (component && component.hasOwnProperty('extrawide')) {
-      this.store.dispatch(new mapActions.SetPanelExtraWide(true));
-    }
+  handleSidepaneloutletActivate(component:any) {
+   if(component && component.hasOwnProperty('clickedFeature')) {
+     (component as IClickedFeature).clickedFeature = this.clickedFeature;
+   }
+   if(component && component.hasOwnProperty('extrawide')) {
+    this.store.dispatch(new mapActions.SetPanelExtraWide(true));
  }
+ }

-  handleSidepaneloutletDeactivate(component: any) {
-    if (component && component.hasOwnProperty('clickedFeature')) {
+  handleSidepaneloutletDeactivate(component:any) {
+    if(component && component.hasOwnProperty('clickedFeature')) {
      (component as IClickedFeature).clickedFeature = null;
    }
-    if (component && component.hasOwnProperty('extrawide')) {
+    if(component && component.hasOwnProperty('extrawide')) {
      this.store.dispatch(new mapActions.SetPanelExtraWide(false));
    }
  }

-  handlePrerender(event: any) {
-    if (!this.dataLayerSlideEnabled) return;
+  handlePrerender(event:any) {
+    if(!this.dataLayerSlideEnabled) return;
    const ctx = event.context;
    const mapSize = this.map.instance.getSize();
    const width = mapSize[0] * (this.dataLayerSlideValue / 100);
@@ -246,74 +243,72 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
    ctx.clip();
  }

-  handleSlideChange(event: any) {
-    this.dataLayerSlideValue = event.target.value;
-    this.map.instance.render();
+  handleSlideChange(event:any) {
+     this.dataLayerSlideValue = event.target.value;
+     this.map.instance.render();
  }

-  ngOnInit() {
+  ngOnInit() {    
    this.initialized = false;
    //console.debug("Init");
    this.store.dispatch(new mapActions.Clear());
-    this.selectedFeatures$.next({ x: 0, y: 0, features: [] });
+    this.selectedFeatures$.next({x:0,y:0,features:[]});
    this.selectedFeatures$.next(null);
  }

  initCustomStyles() {
-    this.store.dispatch(new mapActions.SetStyle('vnd.farmmaps.itemtype.layer', new style.Style({
+    this.store.dispatch(new mapActions.SetStyle('vnd.farmmaps.itemtype.layer',new style.Style({
      stroke: new style.Stroke({
        color: 'red',
-        lineDash: [5, 5],
+        lineDash: [ 5,5],
        width: 1
      }),
-      geometry: (feature) => feature.getGeometry()
+      geometry:(feature) =>feature.getGeometry()
    })));
-    this.store.dispatch(new mapActions.SetStyle('vnd.farmmaps.itemtype.layer_selected', new style.Style({
+    this.store.dispatch(new mapActions.SetStyle('vnd.farmmaps.itemtype.layer_selected',new style.Style({
      stroke: new style.Stroke({
        color: 'red',
-        lineDash: [5, 5],
+        lineDash: [ 5,5],
        width: 3
      }),
-      geometry: (feature) => feature.getGeometry()
+      geometry:(feature) =>feature.getGeometry()
    })));
  }

-  round(value: number, decimals: number): number {
+  round(value:number,decimals:number):number {
    const d = Math.pow(10, decimals);
-    return Math.round((value + Number.EPSILON) * d) / d;
+    return Math.round((value + Number.EPSILON)*d)/d;
  }

-  getMapStateFromUrl(params: ParamMap): IMapState {
+  getMapStateFromUrl(params:ParamMap):IMapState {
    const hasUrlmapState = params.has("xCenter") && params.has("yCenter");
    if (hasUrlmapState) {
      const xCenter = parseFloat(params.get("xCenter"));
      const yCenter = parseFloat(params.get("yCenter"));
      const zoom = parseFloat(params.get("zoom"));
      const rotation = parseFloat(params.get("rotation"));
-      const baseLayer = params.get("baseLayer") ? params.get("baseLayer") : "";
-      const newMapState = { zoom: zoom, rotation: rotation, xCenter: xCenter, yCenter: yCenter, baseLayerCode: baseLayer };
+      const baseLayer = params.get("baseLayer")?params.get("baseLayer"):"";
+      const newMapState = {zoom: zoom, rotation: rotation, xCenter: xCenter, yCenter: yCenter, baseLayerCode: baseLayer };
      return newMapState;
    } else {
      return null;
    }
  }

-  normalizeMapState(mapState: IMapState): IMapState {
-    if (!mapState) return null;
-    return {
-      zoom: this.round(mapState.zoom, 0),
-      rotation: this.round(mapState.rotation, 2),
-      xCenter: this.round(mapState.xCenter, 5),
-      yCenter: this.round(mapState.yCenter, 5),
-      baseLayerCode: mapState.baseLayerCode
-    };
+  normalizeMapState(mapState:IMapState):IMapState {
+    if(!mapState) return null;
+    return {zoom: this.round(mapState.zoom,0),
+      rotation: this.round(mapState.rotation,2),
+      xCenter: this.round(mapState.xCenter,5),
+      yCenter: this.round(mapState.yCenter,5),
+      baseLayerCode: mapState.baseLayerCode };
  }

-  serializeMapState(mapState: IMapState): string {
+  serializeMapState(mapState:IMapState):string {
    return JSON.stringify(this.normalizeMapState(mapState));
  }

-  getQueryStateFromUrl(params: ParamMap): IQueryState {
+  getQueryStateFromUrl(params:ParamMap):IQueryState {
    if (params.has("queryState")) {
      const queryState = params.get("queryState");
      let newQueryState = tassign(mapReducers.initialQueryState);
@@ -328,65 +323,65 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {

  ngAfterViewInit() {
    //console.debug("View init");
-    this.noContent = true;
+    this.noContent=true;
    this.route.children.forEach((entry) => {
-      if (entry.outlet == "primary") {
-        this.noContent = false;
+      if(entry.outlet=="primary") {
+        this.noContent=false;
      }
    });
-
+      
    this.initCustomStyles();

    // url to state

-    const urlMapState = this.getMapStateFromUrl(this.route.snapshot.paramMap);
-    const urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap);
-    if (urlQueryState && urlMapState && this.noContent) {
-      this.store.dispatch(new mapActions.SetState(urlMapState, urlQueryState));
-      window.localStorage.setItem("FarmMapsCommonMap_mapState", this.serializeMapState(urlMapState));
-    } else if (urlQueryState && this.noContent) {
-      this.store.dispatch(new mapActions.SetQueryState(urlQueryState));
-    } else {
-      this.store.dispatch(new mapActions.SetReplaceUrl(true));
-    }
+      const urlMapState = this.getMapStateFromUrl(this.route.snapshot.paramMap);
+      const urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap);
+      if(urlQueryState && urlMapState && this.noContent) {
+        this.store.dispatch(new mapActions.SetState(urlMapState,urlQueryState));
+        window.localStorage.setItem("FarmMapsCommonMap_mapState",this.serializeMapState(urlMapState));
+      } else if(urlQueryState && this.noContent) {
+        this.store.dispatch(new mapActions.SetQueryState(urlQueryState));
+      }  else {
+        this.store.dispatch(new mapActions.SetReplaceUrl(true));
+      }

-    this.paramSub = this.route.paramMap.pipe(withLatestFrom(this.state$), switchMap(([params, state]) => {
-      if (this.initialized && this.noContent) {
-        const urlQueryState = this.getQueryStateFromUrl(params);
-        if (this.serializeService.serialize(state.queryState) != this.serializeService.serialize(urlQueryState)) {
-          return of(new mapActions.SetState(state.mapState, urlQueryState));
+      this.paramSub = this.route.paramMap.pipe(withLatestFrom(this.state$),switchMap(([params,state]) => {
+         if(this.initialized && this.noContent) {
+          const urlQueryState = this.getQueryStateFromUrl(params);
+          if( this.serializeService.serialize(state.queryState) != this.serializeService.serialize(urlQueryState)) {
+            return of(new mapActions.SetState(state.mapState,urlQueryState));
+          }          
+         } 
+         return EMPTY;        
+      })).subscribe((action) => {
+        if(action) {
+          this.zone.run(() => {
+            //console.debug("Url to state");
+            this.store.dispatch(action);
+          });
        }
-      }
-      return EMPTY;
-    })).subscribe((action) => {
-      if (action) {
-        this.zone.run(() => {
-          //console.debug("Url to state");
-          this.store.dispatch(action);
-        });
-      }
-    });
+      });

    // state to url

    this.stateSub = this.state$.pipe(switchMap((state) => {
      const newUrl = this.serializeMapState(state.mapState) + "_" + this.serializeService.serialize(state.queryState);
-      if (this.lastUrl != newUrl) {
-        this.lastUrl = newUrl;
+      if(this.lastUrl!=newUrl) {
+        this.lastUrl=newUrl;
        return of(state);
      }
      else {
        return of(null);
      }
    })).subscribe((newUrlState: any) => {
-      if (newUrlState) {
-        //console.debug(`State to url`);
-        this.replaceUrl(newUrlState.mapState, newUrlState.queryState, newUrlState.replaceUrl);
-      }
-    });
-    this.initialized = true;
+        if(newUrlState) {
+          //console.debug(`State to url`);
+          this.replaceUrl(newUrlState.mapState,newUrlState.queryState,newUrlState.replaceUrl);
+        }
+      });
+    this.initialized = true;   
    this.showDataLayerSlide$.subscribe((v) => {
-      this.dataLayerSlideEnabled = v;
+      this.dataLayerSlideEnabled=v;
      this.map.instance.render();
    });
    this.store.select(mapReducers.selectGetViewEnabled).subscribe((v) => {
@@ -406,7 +401,7 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
    this.store.dispatch(new commonActions.ToggleMenu());
  }

-  handleToggleBaseLayers(event: MouseEvent) {
+  handleToggleBaseLayers(event:MouseEvent) {
    this.baseLayersCollapsed = !this.baseLayersCollapsed;
    event.preventDefault();
  }
@@ -423,30 +418,30 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
  }

  replaceUrl(mapState: IMapState, queryState: IQueryState, replace = true) {
-    if (this.noContent) {
-      const newMapState = this.serializeMapState(mapState);
-      const newQueryState = this.serializeService.serialize(queryState);
-      const currentMapState = this.serializeMapState(this.getMapStateFromUrl(this.route.snapshot.paramMap));
-      const urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap);
-      const currentQueryState = urlQueryState == null ? "" : this.serializeService.serialize(urlQueryState);
-      if (mapState.baseLayerCode != "" && ((newMapState != currentMapState) || (newQueryState != currentQueryState))) {
-        const parts = ["."];
-        parts.push(mapState.xCenter.toFixed(5));
-        parts.push(mapState.yCenter.toFixed(5));
-        parts.push(mapState.zoom.toFixed(0));
-        parts.push(mapState.rotation.toFixed(2));
-        parts.push(mapState.baseLayerCode);
-        parts.push(this.serializeService.serialize(queryState));
-
-        //console.debug("Replace url",parts);
-        this.router.navigate(parts, { replaceUrl: replace, relativeTo: this.route.parent });
-      }
-    }
+      if(this.noContent) {
+        const newMapState = this.serializeMapState(mapState);
+        const newQueryState = this.serializeService.serialize(queryState);
+        const currentMapState = this.serializeMapState(this.getMapStateFromUrl(this.route.snapshot.paramMap));
+        const urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap);
+        const currentQueryState = urlQueryState==null?"":this.serializeService.serialize(urlQueryState);
+        if(mapState.baseLayerCode!="" && ((newMapState!= currentMapState)  || (newQueryState!=currentQueryState))) {
+          const parts =["."];
+          parts.push(mapState.xCenter.toFixed(5));
+          parts.push(mapState.yCenter.toFixed(5));
+          parts.push( mapState.zoom.toFixed(0));
+          parts.push( mapState.rotation.toFixed(2));        
+          parts.push(mapState.baseLayerCode);
+          parts.push( this.serializeService.serialize(queryState));
+          
+          //console.debug("Replace url",parts);
+          this.router.navigate(parts, { replaceUrl: replace,relativeTo:this.route.parent });
+        }  
+      }     
  }

-  handleOnMoveEnd(event) {
-    if (this.initialized && this.viewEnabled) {
-      this.zone.run(() => {
+  handleOnMoveEnd(event) {    
+    if(this.initialized && this.viewEnabled) {
+      this.zone.run(() =>{
        //console.debug("Move end");
        const map = event.map;
        const view = map.getView();
@@ -466,23 +461,21 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
          }
        });
      });
-    }
+    }   
  }

  handleOnMouseDown(event: MouseEvent) {
    event.stopPropagation();
-    this.zone.run(() => {
+    this.zone.run(() =>{
      this.store.dispatch(new commonActions.CloseAll());
    });
  }

  handleShowLayerValues(event: MouseEvent) {
-    if (!this.hideShowLayerValues) {
-      event.stopPropagation();
-      this.zone.run(() => {
-        this.store.dispatch(new mapActions.ToggleLayerValuesEnabled());
-      });
-    }
+    event.stopPropagation();
+    this.zone.run(() =>{
+      this.store.dispatch(new mapActions.ToggleLayerValuesEnabled());
+    });
  }

  handleOnDownload(event) {
@@ -498,15 +491,15 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
  }

  handleOnToggleVisibility(itemLayer: IItemLayer) {
-    this.store.dispatch(new mapActions.SetVisibility(itemLayer, !itemLayer.visible));
+    this.store.dispatch(new mapActions.SetVisibility(itemLayer,!itemLayer.visible));
  }

-  handleOnSetOpacity(event: { layer: IItemLayer, opacity: number }) {
+  handleOnSetOpacity(event:{ layer: IItemLayer,opacity:number }) {
    this.store.dispatch(new mapActions.SetOpacity(event.layer, event.opacity));
  }

  handleZoomToExtent(itemLayer: IItemLayer) {
-    const extent = createEmpty();
+    const extent =  createEmpty();
    extend(extent, itemLayer.layer.getExtent());
    if (extent) {
      this.store.dispatch(new mapActions.SetExtent(extent));
@@ -521,21 +514,21 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
    this.store.dispatch(new mapActions.SelectOverlayLayer(itemLayer));
  }

-  handlePeriodChange(period: IPeriodState) {
+  handlePeriodChange(period:IPeriodState) {
    this.store.dispatch(new mapActions.SetPeriod(period));
  }

-  handleCitySearch(location: string) {
+  handleCitySearch(location:string) {
    this.geolocaterService.geocode(location).subscribe(locations => {
-      if (locations.length > 0) {
-        const point = new Point([locations[0].coordinates.lon, locations[0].coordinates.lat]);
+      if( locations.length > 0) {
+        const point = new  Point([locations[0].coordinates.lon,locations[0].coordinates.lat]);
        point.transform('EPSG:4326', 'EPSG:3857');
-        const circle = new Circle(point.getCoordinates(), 5000);// 
+        const circle = new Circle(point.getCoordinates(),5000);// 
        const extent = createEmpty();
        extend(extent, circle.getExtent());
        this.store.dispatch(new mapActions.SetExtent(extent))
      }
-    });
+     });
  }

  ngOnDestroy() {
--- a/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts
+++ b/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts
@@ -25,7 +25,7 @@ export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponen
  public items: Observable<IListItem[]>;

  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
-    super(store, itemTypeService, itemService$, location,router);
+    super(store, itemTypeService,location,router);
  }

  areaInHa(item:IItem):number {
--- a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html
+++ b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html
@@ -7,31 +7,28 @@
        <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
        <h1>{{item.name}}</h1>
      </div>
-      <ng-container *ngIf="item?.data.layers;let layers">
-        <div class="legend-container">
-          <div class="card menu-card">
-            <div *ngIf="layers.length>1">
-              <select (change)="onLayerChanged($event.target.value)">
-                <option *ngFor="let l of layers;" [value]="l.index"  [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option>
-              </select>
-            </div>
-            <fm-map-layer-legend [showTitle]="layers.length == 1"
-              [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
-          </div>
-        </div>
+      <div class="legend-container" *ngIf="item?.data.layers;let layers">
        <div class="card menu-card">
-          <ul class="p-0 mt-2">
-            <li *ngIf="item.isEditable"><a href="#" class="ms-1 me-1" (click)="handleOnEdit(item)"><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
-            <ng-container *ngIf="itemTypeService.isLayer(item)">
-              <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-plus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
-              <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
-            </ng-container>
-            <li><fm-item-link class="text-primary p-0" [itemCode]="item.code" pathSuffix="data" [showText]="true"></fm-item-link></li>
-            <li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
-          </ul>
+          <div *ngIf="layers.length>1">
+            <select (change)="onLayerChanged($event.target.value)">
+              <option *ngFor="let l of layers;" [value]="l.index"  [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option>
+            </select>
+          </div>
+          <fm-map-layer-legend [showTitle]="layers.length == 1"
+            [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
        </div>
-        <fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
-      </ng-container>
+      </div>
+      <div class="card menu-card">
+        <ul class="p-0 mt-2">
+          <li *ngIf="item.isEditable"><a href="#" class="ms-1 me-1" (click)="handleOnEdit(item)"><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
+          <ng-container *ngIf="itemTypeService.isLayer(item)">
+            <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-plus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
+            <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
+          </ng-container>
+          <li><fm-item-link class="text-primary p-0" [itemCode]="item.code" pathSuffix="data" [showText]="true"></fm-item-link></li>
+        </ul>
+      </div>
+      <fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
    </div>
  </div>
 </div>
--- a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts
+++ b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts
@@ -1,13 +1,12 @@
+import { Component, Injectable } from '@angular/core';
 import { Location } from '@angular/common';
-import { Component, Injectable, OnDestroy } from '@angular/core';
-import { Router } from '@angular/router';
-import { commonReducers, FolderService, IItem, IItemLinkType, ItemService, ItemTypeService, IUrlType } from '@farmmaps/common';
 import { Store } from '@ngrx/store';
-import { Subscription } from 'rxjs';
-import * as mapActions from '../../actions/map.actions';
 import * as mapReducers from '../../reducers/map.reducer';
+import { commonReducers, ItemTypeService, ItemService, FolderService } from '@farmmaps/common';
+import { Router } from '@angular/router';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
+import * as mapActions from '../../actions/map.actions';


@ForItemType("vnd.farmmaps.itemtype.geotiff.processed")
@@ -17,15 +16,10 @@ import { AbstractSelectedItemComponent } from '../selected-item/selected-item.co
  templateUrl: './selected-item-geotiff.component.html',
  styleUrls: ['./selected-item-geotiff.component.scss']
 })
-export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent implements OnDestroy {
-  sub: Subscription;
+export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent {

-  constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
-    super(store, itemTypeService,itemService,location,router);
-  }
-
-  ngOnDestroy(): void {
-    if (this.sub) this.sub.unsubscribe();
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
+    super(store, itemTypeService,location,router);
  }

  onLayerChanged(layerIndex: number) {
@@ -35,13 +29,4 @@ export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent
  layer(layers:any,layerIndex:number) {
    return layers.find(l => l.index == layerIndex);
  }
-  
-  download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) {
-    event.stopPropagation();
-    event.preventDefault();
-    const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10}
-    this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {  
-        window.location.href = itemLinkUrl.url;     
-    })
-  }
 }
--- a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html
+++ b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html
@@ -7,28 +7,25 @@
        <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
        <h1>{{item.name}}</h1>
      </div>
-      <ng-container *ngIf="item?.data.layers;let layers">
-        <div class="legend-container">
-          <div class="card menu-card">
-            <div *ngIf="layers.length>1">
-              <select (change)="onLayerChanged($event.target.value)">
-                <option *ngFor="let l of layers;" [value]="l.index" [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option>
-              </select>
-            </div>
-            <fm-map-layer-legend [showTitle]="layers.length==1" [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
-          </div>
-        </div>
+      <div class="legend-container" *ngIf="item?.data.layers;let layers">
        <div class="card menu-card">
-          <ul class="p-0 mt-2">
-            <li *ngIf="item.isEditable"><a href="#" class="mt-1 me-1" (click)="handleOnEdit(item)" ><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
-            <ng-container *ngIf="itemTypeService.isLayer(item)">
-              <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-olus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
-              <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
-            </ng-container>
-            <li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
-          </ul>
+          <div *ngIf="layers.length>1">
+            <select (change)="onLayerChanged($event.target.value)">
+              <option *ngFor="let l of layers;" [value]="l.index" [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option>
+            </select>
+          </div>
+          <fm-map-layer-legend [showTitle]="layers.length==1" [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
        </div>
-      </ng-container>
+      </div>
+      <div class="card menu-card">
+        <ul class="p-0 mt-2">
+          <li *ngIf="item.isEditable"><a href="#" class="mt-1 me-1" (click)="handleOnEdit(item)" ><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
+          <ng-container *ngIf="itemTypeService.isLayer(item)">
+            <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-olus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
+            <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
+          </ng-container>
+        </ul>
+      </div>
      <fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
    </div>
  </div>
--- a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts
+++ b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts
@@ -1,13 +1,14 @@
+import { Component, Input, Injectable, OnInit } from '@angular/core';
 import { Location } from '@angular/common';
-import { Component, Injectable, OnDestroy } from '@angular/core';
-import { Router } from '@angular/router';
-import { commonReducers, FolderService, IItem, IItemLinkType, ItemService, ItemTypeService, IUrlType } from '@farmmaps/common';
+import { Feature } from 'ol';
 import { Store } from '@ngrx/store';
-import * as mapActions from '../../actions/map.actions';
 import * as mapReducers from '../../reducers/map.reducer';
+import { commonReducers, ItemTypeService, IItem, Item, ItemService, FolderService, IListItem} from '@farmmaps/common';
+import * as mapActions from '../../actions/map.actions';
+import { Router, ActivatedRoute, ParamMap, Event } from '@angular/router';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
-import { Subscription } from 'rxjs';
+import { Observable } from 'rxjs';


@ForItemType("vnd.farmmaps.itemtype.shape.processed")
@@ -17,18 +18,13 @@ import { Subscription } from 'rxjs';
  templateUrl: './selected-item-shape.component.html',
  styleUrls: ['./selected-item-shape.component.scss']
 })
-export class SelectedItemShapeComponent extends AbstractSelectedItemComponent implements OnDestroy {
+export class SelectedItemShapeComponent extends AbstractSelectedItemComponent {
+
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
+    super(store, itemTypeService,location,router);
+  }
  public selectedLayer = 0;
-  sub: Subscription;
-
-  constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
-    super(store, itemTypeService,itemService,location,router);
-  }
-
-  ngOnDestroy(): void {
-    if (this.sub) this.sub.unsubscribe();
-  }
-
+  
  onLayerChanged(layerIndex: number) {
    this.store.dispatch(new mapActions.SetLayerIndex(layerIndex));
  }
@@ -36,13 +32,4 @@ export class SelectedItemShapeComponent extends AbstractSelectedItemComponent im
  layer(layers:any,layerIndex:number) {
    return layers.find(l => l.index == layerIndex);
  }
-    
-  download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) {
-    event.stopPropagation();
-    event.preventDefault();
-    const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10}
-    this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {  
-        window.location.href = itemLinkUrl.url;     
-    })
-  }
 }
--- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html
+++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html
@@ -7,46 +7,43 @@
        <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
        <h1>{{item.name}}</h1>
      </div>
-      <ng-container *ngIf="item?.data.layers;let layers">
-        <div class="legend-container">
-          <div class="card menu-card">
-            <h5><span i18n>Date</span>: {{temporalService.selectedDate(itemLayer)}}</h5>
-            <div class="d-flex justify-content-between">
-              <div>
-                <button  *ngIf="temporalService.hasPrevious(itemLayer)" type="button" class="btn btn-link p-0" (click)="handlePreviousTemporal($event)">
-                  <i class="fal fa-arrow-circle-left" aria-hidden="true" i18n-title title="Previous"></i>&nbsp;{{ temporalService.previousDate(itemLayer) }}
-                </button>
-              </div>
-              <div>
-                <button  *ngIf="temporalService.hasNext(itemLayer)" type="button" class="btn btn-link p-0" (click)="handleNextTemporal($event)">
-                  {{ temporalService.nextDate(itemLayer)}}&nbsp;<i class="fal fa-arrow-circle-right" aria-hidden="true" i18n-title title="Next"></i>
-                </button>
-              </div>
-            </div>
-            <fm-map-zoom-to-show-alert [layer]="currentItemLayer()?.layer"></fm-map-zoom-to-show-alert>
-          </div>
-          <div class="card menu-card pt-2">
-            <div *ngIf="layers.length>1">
-              <select (change)="onLayerChanged($event.target.value)">
-                <option *ngFor="let l of layers;" [value]="l.index"  [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option>
-              </select>
-            </div>
-            <fm-map-layer-legend [showTitle]="layers.length == 1"
-              [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
-          </div>
-        </div>
+      <div class="legend-container" *ngIf="item?.data.layers;let layers">
        <div class="card menu-card">
-          <ul class="p-0 mt-2">
-            <li *ngIf="item.isEditable"><a href="#" class="mt-1 me-1" (click)="handleOnEdit(item)"><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
-            <ng-container *ngIf="itemTypeService.isLayer(item)">
-              <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-plus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
-              <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
-            </ng-container>
-            <li><a href="#" (click)="handleGoToChart(item)"><i class="fal fa-line-chart" aria-hidden="true" i18m-title title="Show chart"></i>&nbsp;<span i18n>Show chart</span></a></li>
-            <li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
-          </ul>
+          <h5><span i18n>Date</span>: {{temporalService.selectedDate(itemLayer)}}</h5>
+          <div class="d-flex justify-content-between">
+            <div>
+              <button  *ngIf="temporalService.hasPrevious(itemLayer)" type="button" class="btn btn-link p-0" (click)="handlePreviousTemporal($event)">
+                <i class="fal fa-arrow-circle-left" aria-hidden="true" i18n-title title="Previous"></i>&nbsp;{{ temporalService.previousDate(itemLayer) }}
+              </button>
+            </div>
+            <div>
+              <button  *ngIf="temporalService.hasNext(itemLayer)" type="button" class="btn btn-link p-0" (click)="handleNextTemporal($event)">
+                {{ temporalService.nextDate(itemLayer)}}&nbsp;<i class="fal fa-arrow-circle-right" aria-hidden="true" i18n-title title="Next"></i>
+              </button>
+            </div>
+          </div>
+          <fm-map-zoom-to-show-alert [layer]="currentItemLayer()?.layer"></fm-map-zoom-to-show-alert>
        </div>
-      </ng-container>
+        <div class="card menu-card pt-2">
+          <div *ngIf="layers.length>1">
+            <select (change)="onLayerChanged($event.target.value)">
+              <option *ngFor="let l of layers;" [value]="l.index"  [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option>
+            </select>
+          </div>
+          <fm-map-layer-legend [showTitle]="layers.length == 1"
+            [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
+        </div>
+      </div>
+      <div class="card menu-card">
+        <ul class="p-0 mt-2">
+          <li *ngIf="item.isEditable"><a href="#" class="mt-1 me-1" (click)="handleOnEdit(item)"><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
+          <ng-container *ngIf="itemTypeService.isLayer(item)">
+            <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-plus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
+            <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
+          </ng-container>
+          <li><a href="#" (click)="handleGoToChart(item)"><i class="fal fa-line-chart" aria-hidden="true" i18m-title title="Show chart"></i>&nbsp;<span i18n>Show chart</span></a></li>
+        </ul>
+      </div>
    </div>
  </div>
 </div>
--- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts
+++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts
@@ -1,15 +1,16 @@
+import { Component, Injectable } from '@angular/core';
 import { Location } from '@angular/common';
-import { Component, Injectable, OnDestroy } from '@angular/core';
-import { Router } from '@angular/router';
-import { commonReducers, IItem, IItemLinkType, ItemService, ItemTypeService, IUrlType } from '@farmmaps/common';
 import { Store } from '@ngrx/store';
-import { Subscription } from 'rxjs';
-import * as mapActions from '../../actions/map.actions';
-import { IItemLayer, ITemporalItemLayer } from '../../models/item.layer';
 import * as mapReducers from '../../reducers/map.reducer';
-import { TemporalService } from '../../services/temporal.service';
+import { commonReducers, ItemTypeService, IItem } from '@farmmaps/common';
+import { Router } from '@angular/router';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
+import { ITemporalItemLayer} from '../../models/item.layer';
+import * as mapActions from '../../actions/map.actions';
+import { IItemLayer } from '../../models/item.layer';
+import {TemporalService} from '../../services/temporal.service';
+

@ForItemType("vnd.farmmaps.itemtype.temporal")
@Injectable()
@@ -18,15 +19,10 @@ import { AbstractSelectedItemComponent } from '../selected-item/selected-item.co
  templateUrl: './selected-item-temporal.component.html',
  styleUrls: ['./selected-item-temporal.component.scss']
 })
-export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent implements OnDestroy {
-  sub: Subscription;
+export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent {

-  constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
-    super(store, itemTypeService,itemService,location,router);
-  }
-  
-  ngOnDestroy(): void {
-    if (this.sub) this.sub.unsubscribe();
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
+    super(store, itemTypeService,location,router);
  }

  onLayerChanged(layerIndex: number) {
@@ -37,6 +33,8 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
    return  (this.itemLayer as ITemporalItemLayer)?.selectedItemLayer
  }

+  
+
  handleNextTemporal(event:MouseEvent) {
    this.store.dispatch(new mapActions.NextTemporal());
    event.preventDefault();    
@@ -63,13 +61,4 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
    this.router.navigate(['/viewer', 'temporal', 'item', item.parentCode, new Date(Date.parse(item.dataDate)).getUTCFullYear()]);
    return false;
  }
-  
-  download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) {
-    event.stopPropagation();
-    event.preventDefault();
-    const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10}
-    this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {  
-       window.location.href = itemLinkUrl.url;       
-    })
-  }
 }
--- a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts
+++ b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts
@@ -2,7 +2,7 @@ import {Component, Injectable, Input, Directive} from '@angular/core';
 import {Location} from '@angular/common';
 import {Store} from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
-import {AppConfig, commonReducers, IItem, ItemService, ItemTypeService} from '@farmmaps/common';
+import {AppConfig, commonReducers, IItem, ItemTypeService} from '@farmmaps/common';
 import * as mapActions from '../../actions/map.actions';
 import {Router} from '@angular/router';
 import { IItemLayer } from '../../models/item.layer';
@@ -15,7 +15,7 @@ export abstract class AbstractSelectedItemComponent {
  @Input() parentItem: IItem;
  @Input() itemLayer: IItemLayer;
  @Input() overlayLayers: Array<IItemLayer>;
-  constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, public itemService: ItemService, private location: Location, public router: Router) {
+  constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, private location: Location, public router: Router) {
  }

  handleOnView(item: IItem) {
@@ -37,11 +37,6 @@ export abstract class AbstractSelectedItemComponent {
    return false;
  }

-  handleOnDelete(item: IItem) {
-    this.itemService.deleteItem(item.code);
-    return false;
-  }
-
  handleAddAsLayer(item: IItem,layerIndex = -1) {
    this.store.dispatch(new mapActions.AddLayer(item,layerIndex));
    return false;
@@ -81,8 +76,8 @@ export abstract class AbstractSelectedItemComponent {
 })
 export class SelectedItemComponent extends AbstractSelectedItemComponent {

-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, itemService: ItemService, location: Location, router: Router, public config:AppConfig) {
-    super(store, itemTypeService,itemService,location,router);
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, public config:AppConfig) {
+    super(store, itemTypeService,location,router);
  }

  getThumbnailUrl(item:IItem):string {
--- a/projects/common-map/src/fm-map/reducers/map.reducer.ts
+++ b/projects/common-map/src/fm-map/reducers/map.reducer.ts
@@ -637,8 +637,6 @@ export const selectGetExtent = createSelector(selectMapState, getExtent);
 export const selectGetViewExtent = createSelector(selectMapState, getViewExtent);
 export const selectGetOverlayLayers = createSelector(selectMapState, getOverlayLayers);
 export const selectGetBaseLayers = createSelector(selectMapState, getBaseLayers);
-export const selectGetBaseMaps = createSelector(selectGetBaseLayers, (layers) => layers.filter(layer => layer.item.data.category === "baseMap"));
-export const selectGetArealMaps = createSelector(selectGetBaseLayers, (layers) => layers.filter(layer => layer.item.data.category === "aerialPhoto").sort((a, b) => a.item.dataDate <= b.item.dataDate ? 1 : -1));
 export const selectGetProjection = createSelector(selectMapState, getProjection);
 export const selectGetSelectedBaseLayer = createSelector(selectMapState, getSelectedBaseLayer);
 export const selectGetSelectedOverlayLayer = createSelector(selectMapState, getSelectedOverlayLayer);
--- a/projects/common-map3d/package.json
+++ b/projects/common-map3d/package.json
@@ -8,8 +8,8 @@
    "tslib": "^2.0.0"
  },
  "peerDependencies": {
-    "@angular/common": "18.2.3",
-    "@angular/core":  "18.2.3",
+    "@angular/common": "^18.2.3",
+    "@angular/core":  "^18.2.3",
    "cesium": "^1.97.0",
    "ol-cesium": ">=2.13.0"
  }
--- a/projects/common/package.json
+++ b/projects/common/package.json
@@ -6,9 +6,9 @@
  },
  "peerDependencies": {
    "@ng-bootstrap/ng-bootstrap": "^17.0.1",
-    "@angular/common": "18.2.3",
-    "@angular/core": "18.2.3",
-    "@angular/forms": "18.2.3",
+    "@angular/common": "^18.2.3",
+    "@angular/core": "^18.2.3",
+    "@angular/forms": "^18.2.3",
    "@ngrx/effects": "^18.0.2",
    "@ngrx/router-store": "^18.0.2",
    "@ngrx/store": "^18.0.2",
--- a/projects/common/src/fm/actions/app-common.actions.ts
+++ b/projects/common/src/fm/actions/app-common.actions.ts
@@ -71,8 +71,6 @@ export const TOGGLENOTIFICATIONMENU = '[AppCommon] ToggleNotificationMenu';

 export const TOGGLEHELPMENU = '[AppCommon] ToggleHelpMenu';

-export const TOGGLESETTINGMENU = '[AppCommon] ToggleSettingMenu';
-
 export const SETMENUVISIBLE = '[AppCommon] SetMenuVisible';

 export const ONLINE = '[AppCommon] Online';
@@ -83,11 +81,6 @@ export const SETPAGEMODE = '[AppCommon] SetPageMode';

 export const SETUNREADNOTIFICATIONS = '[AppCommon] SetUnreadNotifications';

-export const SWITCHLANGUAGE = '[AppCommon] SwitchLanguage';
-
-export const SETSETTINGMENUBACKGROUNDCOLOR = '[AppCommon] SetSettingMenuBackgroundColor';
-
-
 export class InitUser implements Action {
  readonly type = INITUSER;

@@ -339,12 +332,6 @@ export class ToggleHelpMenu implements Action {
  constructor() { }
 }

-export class ToggleSettingMenu implements Action {
-  readonly type = TOGGLESETTINGMENU;
-
-  constructor() { }
-}
-
 export class SetMenuVisible implements Action {
  readonly type = SETMENUVISIBLE;

@@ -376,17 +363,6 @@ export class SetUnreadNotifications implements Action {

 }
  
-export class SwitchLanguage implements Action {
-  readonly type = SWITCHLANGUAGE;
-
-  constructor(public locale:string) { }
-}
-
-export class SetSettingMenuBackgroundColor implements Action {
-  readonly type = SETSETTINGMENUBACKGROUNDCOLOR;
-
-  constructor(public color:string) { }
-}

 export type Actions = OpenModal
  | InitRoot
@@ -432,10 +408,7 @@ export type Actions = OpenModal
  | ToggleAppMenu
  | ToggleNotificationMenu
  | ToggleHelpMenu
-  | ToggleSettingMenu
  | NotificationEvent
-  | SetUnreadNotifications
-  | SwitchLanguage
-  | SetSettingMenuBackgroundColor;
+  | SetUnreadNotifications;


--- a/projects/common/src/fm/common-service.module.ts
+++ b/projects/common/src/fm/common-service.module.ts
@@ -13,7 +13,6 @@ import { SchemaService } from './services/schema.service';
 import { FolderService } from './services/folder.service';
 import { TimespanService } from './services/timespan.service';
 import { ItemService } from './services/item.service';
-import { TaskService } from './services/task.service';
 import { AdminService } from './services/admin.service';
 import { EventService } from './services/event.service';
 import { TypeaheadService } from './services/typeahead.service';
@@ -45,7 +44,6 @@ export {
  ItemTypeService,
  TimespanService,
  ItemService,
-  TaskService,
  AdminService,
  EventService,
  TypeaheadService,
--- a/projects/common/src/fm/common.module.ts
+++ b/projects/common/src/fm/common.module.ts
@@ -34,7 +34,6 @@ import { HasClaimDirective } from './components/has-claim/has-claim.directive';
 import { HasPackageDirective } from './components/has-package/has-package.directive';
 import { HasRoleDirective } from './components/has-role/has-role.directive';
 import { HelpMenuComponent } from './components/help-menu/help-menu.component';
-import { SettingMenuComponent } from './components/setting-menu/setting-menu.component';
 import { ItemLinkComponent } from './components/item-link/item-link.component';
 import { MenuBackgroundComponent } from './components/menu-background/menu-background.component';
 import { NotFoundComponent } from './components/not-found/not-found.component';
@@ -105,7 +104,6 @@ export {
        AppMenuComponent,
        NotificationMenuComponent,
        HelpMenuComponent,
-        SettingMenuComponent,
        BackButtonComponent,
        ThumbnailComponent,
        EditImageModalComponent,
--- a/projects/common/src/fm/components/app/app.component.html
+++ b/projects/common/src/fm/components/app/app.component.html
@@ -33,7 +33,6 @@
    <fm-resumable-file-upload></fm-resumable-file-upload>
  </ng-container>  
  <div class="user-menu apponly">
-    <fm-setting-menu [user]="user|async" [showMenu]="settingMenuVisible|async" [backgroundColor]="settingMenuBackgroundColor|async"></fm-setting-menu>
    <fm-help-menu [user]="user|async" [showMenu]="helpMenuVisible|async"></fm-help-menu>
    <fm-notification-menu [user]="user|async" [unread]="unreadNotifications|async" [showMenu]="notificationMenuVisible|async"></fm-notification-menu>
    <fm-app-menu [user]="user|async" [showMenu]="appMenuVisible|async"></fm-app-menu>
--- a/projects/common/src/fm/components/app/app.component.scss
+++ b/projects/common/src/fm/components/app/app.component.scss
@@ -119,7 +119,7 @@ body { background: #f1f1f1; line-height: 18px; user-select:none;font-family: Lat
  max-height:0em;
 }

-fm-help-menu,fm-app-menu,fm-user-menu,fm-notification-menu,fm-setting-menu {
+fm-help-menu,fm-app-menu,fm-user-menu,fm-notification-menu {
  display: inline-block;
  margin-left: 1rem;
 }
--- a/projects/common/src/fm/components/app/app.component.ts
+++ b/projects/common/src/fm/components/app/app.component.ts
@@ -45,12 +45,10 @@ export class AppComponent implements OnInit, OnDestroy {
  public accountMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetAccountMenuVisible);
  public appMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetAppMenuVisible);
  public notificationMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetNotificationMenuVisible);
-  public settingMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetSettingMenuVisible);
  public helpMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetHelpMenuVisible);
  public unreadNotifications: Observable<number> = this.store$.select(appReducers.SelectgetUnreadNotifications);
  public user: Observable<IUser> = this.store$.select(appReducers.SelectGetUser);
  public isPageMode: Observable<boolean> = this.store$.select(appReducers.SelectGetIsPageMode);
-  public settingMenuBackgroundColor: Observable<string> = this.store$.select(appReducers.SelectGetSettingMenuBackgroundColor);
  @Input() showUploadProgress = true;

  constructor(
--- a/projects/common/src/fm/components/back-button/back-button.component.ts
+++ b/projects/common/src/fm/components/back-button/back-button.component.ts
@@ -1,6 +1,6 @@
-import { Location } from "@angular/common";
-import { Component, EventEmitter, HostListener, Output } from '@angular/core';
-import { DeviceService } from '../../services/device.service';
+import {Component, HostListener} from '@angular/core';
+import {Location} from "@angular/common";
+import { DeviceService} from '../../services/device.service';

@Component({
  selector: 'fm-back-button',
@@ -8,18 +8,16 @@ import { DeviceService } from '../../services/device.service';
  styleUrls: ['./back-button.component.scss']
 })
 export class BackButtonComponent {
-  @Output() beforeLocationBack = new EventEmitter();

  @HostListener('click')
  onBackClicked() {
-    this.beforeLocationBack.emit();
    this.location.back();
  }

-  constructor(private location: Location,private deviceService:DeviceService) {    
-  }
+  constructor(private location: Location,private deviceService:DeviceService) { }

  public show() {
    return !this.deviceService.IsMobile();
  }
+
 }
--- a/projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.html
+++ b/projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.html
@@ -11,7 +11,7 @@
        <i class="fal fa-image"></i>
        <div i18n>No image selected</div>
      </div>
-      <image-cropper #imageCropper output="base64" 
+      <image-cropper #imageCropper
      [imageChangedEvent]="imageChangedEvent"
      [maintainAspectRatio]="true"
      [format]="imageType"
--- a/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss
+++ b/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss
@@ -4,7 +4,6 @@ div.resumable-file-upload {
  bottom: 0px;
  width: 300px;
  max-height: 250px;
-  z-index: 1;
  /*z-index:2000 !important;*/
 }

--- a/projects/common/src/fm/components/setting-menu/setting-menu.component.html
+++ b/projects/common/src/fm/components/setting-menu/setting-menu.component.html
@@ -1,8 +0,0 @@
-<div>
-    <div (click)="toggle($event)" class="rounded-circle menu-button hidden" [style.background-color]="backgroundColor" [ngClass]="{'hidden':!user || noContent}">
-        <span i18n-title title="Settings"><i class="fas fa-gear" aria-hidden="true"></i></span>
-        <div class="menu hidden" [ngClass]="{'hidden':!showMenu}">                                     
-            <router-outlet name="setting-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()"></router-outlet>            
-       </div>
-    </div>
-</div>
--- a/projects/common/src/fm/components/setting-menu/setting-menu.component.scss
+++ b/projects/common/src/fm/components/setting-menu/setting-menu.component.scss
@@ -1,80 +0,0 @@
-.menu-button {
-    background-color: gray;  
-    display: inline-block;
-    width: 2.5em;
-    height: 2.5em;
-    line-height: 2.5em;
-    text-align: center;
-    font-size: 1rem;
-    position: relative;
-}
-
-div.menu-button > span {
-    color:white;
-}
-
-.menu {
-    max-height: calc( 100vh - 4rem);
-    //transition: max-height 0.2s;
-    overflow: hidden;
-    box-shadow: 0 0 20px rgba(0,0,0,.3);
-    position: fixed;
-    top: 3.4rem;
-    right:0.5rem;
-    left:0.5rem;
-    background-color: #fff;
-    border-radius: 0.25rem;
-    padding: 0.5rem;
-    z-index: 3;
-}
-
-:host-context(.fullscreen)  .menu  {
-    top:4em;
-}
-
-.card {      
-    padding:0.5rem;
-    min-width: 10rem;          
-}
-
-.card-body {
-    text-align: left;
-}
-
-.hidden {
-    max-height: 0;   
-}
-
-.menu.hidden {
-    padding: 0;
-}
-
-.menu-button.hidden {
-    overflow: hidden;
-}
-
-
-@media screen and (min-width: 44rem)  {
-    .menu {
-        position: absolute;
-        top: 3rem;
-        right:0;
-        left: unset;
-        max-width: 30em;
-    }
-
-    :host-context(.fullscreen)  .menu  {
-        top: 3rem;
-    }
-}    
-
-.unread {
-    display: block;
-    position: absolute;
-    top:-0.5em;
-    right: -0.5em;
-}
-
-.unread.hidden {
-    display: none;
-}
--- a/projects/common/src/fm/components/setting-menu/setting-menu.component.ts
+++ b/projects/common/src/fm/components/setting-menu/setting-menu.component.ts
@@ -1,38 +0,0 @@
-import { Input } from '@angular/core';
-import { Component, OnInit } from '@angular/core';
-
-import { IUser } from '../../models/user';
-import {Store} from '@ngrx/store';
-import * as appReducers from '../../reducers/app-common.reducer';
-import * as appActions from '../../actions/app-common.actions';
-
-@Component({
-  selector: 'fm-setting-menu',
-  templateUrl: './setting-menu.component.html',
-  styleUrls: ['./setting-menu.component.scss']
-})
-export class SettingMenuComponent implements OnInit {
-  
-  @Input() user:IUser;
-  @Input() showMenu:boolean;
-  @Input() backgroundColor:string;
-  public noContent = true;
-
-  constructor(private store: Store<appReducers.State>) { }
-
-  ngOnInit(): void {
-  }
-
-  toggle(event:MouseEvent) {
-    event.stopPropagation();
-    this.store.dispatch(new appActions.ToggleSettingMenu());
-  } 
-
-  activateRoute() {
-    this.noContent=false;
-  }
-
-  deActivateRoute() {
-    this.noContent=true;
-  }
-}
--- a/projects/common/src/fm/effects/app-common.effects.ts
+++ b/projects/common/src/fm/effects/app-common.effects.ts
@@ -1,4 +1,4 @@
-import { Injectable, Inject, LOCALE_ID } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { OAuthService,UserInfo } from 'angular-oauth2-oidc';
 import { Store } from '@ngrx/store';
@@ -16,7 +16,6 @@ import {StateSerializerService} from '../services/state-serializer.service';

@Injectable()
 export class AppCommonEffects {
-  locale: string;

  login$ =  createEffect(() => this.actions$.pipe(
    ofType(appCommonActions.LOGIN),
@@ -48,27 +47,11 @@ export class AppCommonEffects {
    first(),
    switchMap((action) => {
        return zip(this.userService$.getCurrentUser(),from(this.oauthService$.loadUserProfile())).pipe(
-        switchMap(([user,userInfo]) => {
-          if (location.hostname === 'localhost' || user.language === undefined || user.language === this.locale) 
-          {
-            return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))
-          }
-          return of(new appCommonActions.SwitchLanguage(user.language))
-        }),
+        switchMap(([user,userInfo]) => {return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))} ),
        catchError(error => of(new appCommonActions.Fail(error))))
    }
  )));
-
-  switchLanguage$ = createEffect(() => this.actions$.pipe(
-    ofType(appCommonActions.SWITCHLANGUAGE),
-    switchMap((action) => {
-      const a = action as appCommonActions.SwitchLanguage;
-      if (location.href.includes(`/${this.locale}/`)) {
-        const newPath = location.href.replace(`/${this.locale}/`, `/${a.locale}/`);
-        location.replace(newPath);
-      }
-      return of(undefined);
-    })),{ dispatch:false});
+    

  initUserPackages$ =  createEffect(() => this.actions$.pipe(
    ofType(appCommonActions.INITUSERPACKAGES),
@@ -151,22 +134,15 @@ export class AppCommonEffects {
      withLatestFrom(this.store$.select(appCommonReducers.selectGetItemTypes)),
      switchMap(([action, itemtypes]) => {
        const a = action as appCommonActions.EditItem;
-        var editor = "property";
+        var editor =  "property";
        if(a.item.itemType) {
          const itemType = itemtypes[a.item.itemType];
          var editor = itemType && itemType.editor ? itemType.editor : editor;  
        }
-        if (editor == 'croppingscheme') { 
-          // Exeception: no 'item' in route
-          this.router$.navigate(['/editor', editor, a.item.code])
-        }
-        else {
-          this.router$.navigate(['/editor', editor, 'item', a.item.code])
-        }
-        return [];
-      }
-    )
-  ));
+      this.router$.navigate(['/editor',editor,'item', a.item.code])
+      return [];
+    }
+  )));

  viewItem$ =  createEffect(() => this.actions$.pipe(
    ofType(appCommonActions.VIEWITEM),
@@ -225,8 +201,7 @@ export class AppCommonEffects {



-  constructor(private actions$: Actions, private store$: Store<appCommonReducers.State>, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService, @Inject(LOCALE_ID) locale: string) {
-    this.locale = locale;
+  constructor(private actions$: Actions, private store$: Store<appCommonReducers.State>, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService) {
    store$.dispatch(new appCommonActions.LoadItemTypes());
  }
-}
+}
--- a/projects/common/src/fm/models/item.ts
+++ b/projects/common/src/fm/models/item.ts
@@ -26,7 +26,6 @@ export class Item implements IItem {
  public data?:any;
  public isEditable?:boolean;
  public owner?: string;
-  public fullPath?: string;

  constructor() {  
  }
--- a/projects/common/src/fm/models/itemTask.ts
+++ b/projects/common/src/fm/models/itemTask.ts
@@ -1,7 +1,6 @@

 export interface IItemTask  {
  code?: string;
-  workflowCode?: string;
  taskType?: string;
  attributes?: any;
  message?: string,
@@ -12,7 +11,6 @@ export interface IItemTask  {

 export class ItemTask implements IItemTask {
  public code?:string;
-  public workflowCode?: string;
  public taskType?: string;
  public attributes?: any;
  public message?: string;
@@ -20,6 +18,6 @@ export class ItemTask implements IItemTask {
  public started?: Date;
  public finished?: Date;

-  constructor() {
+  constructor() {  
  }
-}
+}
--- a/projects/common/src/fm/reducers/app-common.reducer.ts
+++ b/projects/common/src/fm/reducers/app-common.reducer.ts
@@ -26,11 +26,9 @@ export interface State {
  appMenuVisible: boolean,
  notificationMenuVisible: boolean,
  helpMenuVisible: boolean,
-  settingMenuVisible: boolean,
  unreadNotifications: number,
  isOnline: boolean,
-  isPageMode:boolean,
-  settingMenuBackgroundColor:string
+  isPageMode:boolean
 }

 export const initialState: State = {
@@ -49,11 +47,9 @@ export const initialState: State = {
  appMenuVisible: false,
  notificationMenuVisible: false,
  helpMenuVisible: false,
-  settingMenuVisible: false,
  unreadNotifications: 0,
  isOnline: true,
-  isPageMode: true,
-  settingMenuBackgroundColor:'rgb(128, 128, 128)'
+  isPageMode: true
 }

 export function reducer(state = initialState, action: appCommonActions.Actions ): State {
@@ -110,29 +106,26 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
      });
    }
    case appCommonActions.TOGGLEMENU: {
-      return tassign(state, { menuVisible: !state.menuVisible,accountMenuVisible:!state.menuVisible?false:state.accountMenuVisible,appMenuVisible:!state.menuVisible?false:state.appMenuVisible,notificationMenuVisible:!state.menuVisible?false:state.notificationMenuVisible,helpMenuVisible:!state.menuVisible?false:state.helpMenuVisible,settingMenuVisible:!state.menuVisible?false:state.settingMenuVisible });
+      return tassign(state, { menuVisible: !state.menuVisible,accountMenuVisible:!state.menuVisible?false:state.accountMenuVisible,appMenuVisible:!state.menuVisible?false:state.appMenuVisible,notificationMenuVisible:!state.menuVisible?false:state.notificationMenuVisible,helpMenuVisible:!state.menuVisible?false:state.helpMenuVisible });
    }
    case appCommonActions.TOGGLEACCOUNTMENU: {
-      return tassign(state, { accountMenuVisible: !state.accountMenuVisible,appMenuVisible:false,notificationMenuVisible:false,helpMenuVisible:false,settingMenuVisible:false });
+      return tassign(state, { accountMenuVisible: !state.accountMenuVisible,appMenuVisible:false,notificationMenuVisible:false,helpMenuVisible:false });
    }
    case appCommonActions.TOGGLEAPPMENU: {
-      return tassign(state, { appMenuVisible: !state.appMenuVisible,accountMenuVisible:false,notificationMenuVisible:false,helpMenuVisible:false,settingMenuVisible:false });
+      return tassign(state, { appMenuVisible: !state.appMenuVisible,accountMenuVisible:false,notificationMenuVisible:false,helpMenuVisible:false });
    }
    case appCommonActions.TOGGLENOTIFICATIONMENU: {
-      return tassign(state, { notificationMenuVisible : !state.notificationMenuVisible,accountMenuVisible:false,appMenuVisible:false,helpMenuVisible:false,settingMenuVisible:false });
+      return tassign(state, { notificationMenuVisible : !state.notificationMenuVisible,accountMenuVisible:false,appMenuVisible:false,helpMenuVisible:false });
    }
    case appCommonActions.TOGGLEHELPMENU: {
-      return tassign(state, { helpMenuVisible : !state.helpMenuVisible,accountMenuVisible:false,appMenuVisible:false,notificationMenuVisible:false,settingMenuVisible:false });
-    }
-    case appCommonActions.TOGGLESETTINGMENU: {
-      return tassign(state, { settingMenuVisible : !state.settingMenuVisible,accountMenuVisible:false,appMenuVisible:false,notificationMenuVisible:false,helpMenuVisible:false });
+      return tassign(state, { helpMenuVisible : !state.helpMenuVisible,accountMenuVisible:false,appMenuVisible:false,notificationMenuVisible:false });
    }
    case appCommonActions.ESCAPE: {
-      return tassign(state, { menuVisible: false,accountMenuVisible:false,appMenuVisible: false,notificationMenuVisible:false,helpMenuVisible:false,settingMenuVisible:false });
+      return tassign(state, { menuVisible: false,accountMenuVisible:false,appMenuVisible: false,notificationMenuVisible:false,helpMenuVisible:false });
    }
    case appCommonActions.SETMENUVISIBLE: {
      const a = action as appCommonActions.SetMenuVisible;
-      return tassign(state, { menuVisible: a.visible,accountMenuVisible:a.visible?false:state.accountMenuVisible,appMenuVisible:a.visible?false:state.appMenuVisible,notificationMenuVisible:a.visible?false:state.notificationMenuVisible,helpMenuVisible:a.visible?false:state.helpMenuVisible,settingMenuVisible:a.visible?false:state.settingMenuVisible });
+      return tassign(state, { menuVisible: a.visible,accountMenuVisible:a.visible?false:state.accountMenuVisible,appMenuVisible:a.visible?false:state.appMenuVisible,notificationMenuVisible:a.visible?false:state.notificationMenuVisible,helpMenuVisible:a.visible?false:state.helpMenuVisible });
    }
    case appCommonActions.INITUSERPACKAGESSUCCESS:{
      const a = action as appCommonActions.InitUserPackagesSuccess;
@@ -189,10 +182,6 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
      const a = action as appCommonActions.SetUnreadNotifications;
      return tassign(state,{unreadNotifications:a.unread});
    }
-    case appCommonActions.SETSETTINGMENUBACKGROUNDCOLOR: {
-      const a = action as appCommonActions.SetSettingMenuBackgroundColor;
-      return tassign(state,{settingMenuBackgroundColor:a.color});
-    }    
    default: {
      return state;
    }
@@ -214,11 +203,9 @@ export const getAccountMenuVisible = (state: State) => state.accountMenuVisible;
 export const getAppMenuVisible = (state: State) => state.appMenuVisible;
 export const getNotificationMenuVisible = (state: State) => state.notificationMenuVisible;
 export const getHelpMenuVisible = (state: State) => state.helpMenuVisible;
-export const getSettingMenuVisible = (state: State) => state.settingMenuVisible;
 export const getUnreadNotifications = (state: State) => state.unreadNotifications;
 export const getIsOnline = (state: State) => state.isOnline;
 export const getIsPageMode = (state: State) => state.isPageMode;
-export const getSettingMenuBackgroundColor = (state: State) => state.settingMenuBackgroundColor;

 export const selectAppCommonState = createFeatureSelector<State>(MODULE_NAME);

@@ -240,9 +227,9 @@ export const SelectGetAccountMenuVisible = createSelector(selectAppCommonState,g
 export const SelectGetAppMenuVisible = createSelector(selectAppCommonState,getAppMenuVisible);
 export const SelectGetNotificationMenuVisible = createSelector(selectAppCommonState,getNotificationMenuVisible);
 export const SelectGetHelpMenuVisible = createSelector(selectAppCommonState,getHelpMenuVisible);
-export const SelectGetSettingMenuVisible = createSelector(selectAppCommonState,getSettingMenuVisible);
 export const SelectgetUnreadNotifications = createSelector(selectAppCommonState,getUnreadNotifications);

 export const SelectGetIsOnline = createSelector(selectAppCommonState,getIsOnline);
 export const SelectGetIsPageMode = createSelector(selectAppCommonState,getIsPageMode);
-export const SelectGetSettingMenuBackgroundColor= createSelector(selectAppCommonState,getSettingMenuBackgroundColor);
+
+
--- a/projects/common/src/fm/services/admin.service.ts
+++ b/projects/common/src/fm/services/admin.service.ts
@@ -52,20 +52,4 @@ export class AdminService {
  postItemTask(item: IItem, task: IItemTask): Observable<IItemTask> {
    return this.httpClient.post<IItemTask>(`${this.ApiEndpoint()}/api/v1/admin/${item.code}/tasks`, task);
  }
-
-  getFileStorageOverview(): Observable<any> {
-    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/overview`);
-  }
-
-  getFileStorageInfo(user: string): Observable<any> {
-    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/${user}`);
-  }
-
-  getFileStorageLog(): Observable<any> {
-    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/log`);
-  }
-
-  validateEmail(user: IUser) {
-    return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/admin/user/${user.code}/validateemail`, user);
-  }
 }
--- a/projects/common/src/fm/services/item.service.ts
+++ b/projects/common/src/fm/services/item.service.ts
@@ -1,12 +1,14 @@
-import {Injectable} from '@angular/core';
-import {Observable} from 'rxjs';
-import {IItemType} from '../models/item.type';
-import {IItemLinkType} from '../models/itemlink.type';
-import {IItem} from '../models/item';
-import {IJsonline} from '../models/json-line';
-import {IItemTask} from '../models/itemTask';
-import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http';
-import {AppConfig} from '../shared/app.config';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { IItemType } from '../models/item.type';
+import { IItemLinkType } from '../models/itemlink.type';
+import { IUrlType } from '../models/url.type';
+import { IItem } from '../models/item';
+import { IJsonline } from '../models/json-line';
+import { IItemTask } from '../models/itemTask';
+import { HttpClient, HttpParams, HttpHeaders } from "@angular/common/http";
+import { AppConfig } from "../shared/app.config";
 import {ItemTypeService} from './itemtype.service';
 import {IListItem} from '../models/list.item';

@@ -79,8 +81,7 @@ export class ItemService {

  getItemList(itemType?: string, dataFilter?: any, level?: number, atItemLocationItemCode?: string,
    indexed?: boolean, validToday?: boolean,tags?:string,crs?:string, startDate?: Date, endDate?: Date,
-    skip?: number, take?: number, sourceTask?: string, exactMatchStartOrEndDate?: boolean, owner?:string,
-    includeFullpath?: boolean): Observable<IItem[]> {
+    skip?: number, take?: number, sourceTask?: string): Observable<IItem[]> {
    let params = new HttpParams();
    if(itemType)  params = params.append("it", itemType);
    if(dataFilter) params = params.append("df", JSON.stringify(dataFilter));
@@ -95,28 +96,20 @@ export class ItemService {
    if (sourceTask) params = params.append("sourceTask", sourceTask);
    if(skip) params = params.append("skip", skip);
    if(take) params = params.append("take", take);
-    if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate);
-    if(owner) params = params.append("owner", owner);
-    if(includeFullpath) params = params.append("includeFullpath",includeFullpath?"true":"false");
    return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/`, { params: params });
  }
-
-  getItemListCount(itemType: string, startDate?: Date, endDate?: Date, sourceTask?: string,
-    indexed?: boolean, exactMatchStartOrEndDate?: boolean, owner?:string): Observable<number> {
+  
+  getItemListCount(itemType: string, startDate?: Date, endDate?: Date, sourceTask?: string): Observable<number> {
    let params = new HttpParams();
    params = params.append("it", itemType);
    if (sourceTask) params = params.append("sourceTask", sourceTask);
    if (startDate) params = params.append("sDate", startDate.toISOString());
    if (endDate) params = params.append("eDate", endDate.toISOString());
-    if(indexed) params = params.append("ind",indexed?"true":"false");
-    if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate);
-    if(owner) params = params.append("owner", owner);
    return this.httpClient.get<number>(`${this.ApiEndpoint()}/api/v1/items/count`, { params: params });
  }

  getChildItemList(parentcode: string, itemType?: string, dataFilter?: any, level = 1, deep = true,
-                   startDate?: Date, endDate?: Date, skip?: number, take?: number,
-                   exactMatchStartOrEndDate?: boolean, owner?:string, indexed?: boolean): Observable<IItem[]> {
+                   startDate?: Date, endDate?: Date, skip?: number, take?: number): Observable<IItem[]> {
    let params = new HttpParams();
    if(itemType != null) {
      params = params.append("it", itemType);
@@ -128,18 +121,13 @@ export class ItemService {
    params = params.append("deep", deep.toString());
    if (startDate) params = params.append("sDate", startDate.toISOString());
    if (endDate) params = params.append("eDate", endDate.toISOString());
-    if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate);
-    if(owner) params = params.append("owner", owner);

    if(skip) params = params.append("skip", skip);
    if(take) params = params.append("take", take);
-    if(indexed) params = params.append("ind",indexed?"true":"false");
    return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params });
  }

-  getChildItemListCount(parentcode: string, itemType?: string,dataFilter?: any,
-                        startDate?: Date, endDate?: Date, exactMatchStartOrEndDate?: boolean, owner?:string,
-                        indexed?: boolean): Observable<number> {
+  getChildItemListCount(parentcode: string, itemType?: string,dataFilter?: any): Observable<number> {
    let params = new HttpParams();
    if(itemType != null) {
      params = params.append("it", itemType);
@@ -147,11 +135,6 @@ export class ItemService {
    if (dataFilter != null) {
      params = params.append("df", JSON.stringify(dataFilter));
    }
-    if (startDate) params = params.append("sDate", startDate.toISOString());
-    if (endDate) params = params.append("eDate", endDate.toISOString());
-    if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate);
-    if(owner) params = params.append("owner", owner);
-    if(indexed) params = params.append("ind",indexed?"true":"false");
    return this.httpClient.get<number>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children/count`, { params: params });
  }

--- a/projects/common/src/fm/services/itemtype.service.ts
+++ b/projects/common/src/fm/services/itemtype.service.ts
@@ -15,37 +15,37 @@ export class ItemTypeService {

     getIcon(itemType: string) {
       let icon = "fal fa-file";
-       if (this.itemTypes && this.itemTypes[itemType]) icon = this.itemTypes[itemType].icon;
+       if (this.itemTypes[itemType]) icon = this.itemTypes[itemType].icon;
       return icon;
     }

     getColor(itemType: string) {
       let color = "#000000";
-       if (this.itemTypes && this.itemTypes[itemType]) color = this.itemTypes[itemType].iconColor;
+       if (this.itemTypes[itemType]) color = this.itemTypes[itemType].iconColor;
       return color;
     }

     getExtraAttributes(itemType: string) {
      let extraAttributes = null;
-      if (this.itemTypes && this.itemTypes[itemType] && this.itemTypes[itemType]?.extraAttributes) extraAttributes = this.itemTypes[itemType]?.extraAttributes;
+      if (this.itemTypes[itemType] && this.itemTypes[itemType].extraAttributes) extraAttributes = this.itemTypes[itemType].extraAttributes;
      return extraAttributes;
    }

    getSchema(itemType: string): string {
      let schema = null;
-      if (this.itemTypes && this.itemTypes[itemType]) schema = this.itemTypes[itemType].schema;
+      if (this.itemTypes[itemType]) schema = this.itemTypes[itemType].schema;
      return schema;
    }

     hasViewer(item: IItem) {
        const itemType: string = item.itemType;
-        if (this.itemTypes && this.itemTypes[itemType]) return this.itemTypes[itemType].viewer !== undefined;
+        if (this.itemTypes[itemType]) return this.itemTypes[itemType].viewer !== undefined;
        return false;
      }

      hasEditor(item: IItem) {
        const itemType: string = item.itemType;
-        if (this.itemTypes && this.itemTypes[itemType]) return this.itemTypes[itemType].editor !== undefined;
+        if (this.itemTypes[itemType]) return this.itemTypes[itemType].editor !== undefined;
        return false;
      }

--- a/projects/common/src/fm/services/task.service.ts
+++ b/projects/common/src/fm/services/task.service.ts
@@ -1,40 +0,0 @@
-import {Injectable} from '@angular/core';
-import {HttpClient, HttpParams} from '@angular/common/http';
-import {AppConfig} from '../shared/app.config';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class TaskService {
-  constructor(public httpClient: HttpClient, public appConfig: AppConfig) {
-  }
-
-  ApiEndpoint() {
-    return this.appConfig.getConfig("apiEndPoint");
-  }
-
-  getTask(taskCode: string) {
-    return this.httpClient.get<any>(`${this.appConfig.getConfig('apiEndPoint')}/api/v1/tasks/${taskCode}`)
-  }
-
-  getTasks(workflowCode: string, itemCode: string = null, taskType: string = null, skip = 0, take = 25) {
-    let params = new HttpParams();
-
-    if (workflowCode) {
-      params = params.append('workflowCode', workflowCode);
-    }
-
-    if (itemCode) {
-      params = params.append('itemCode', itemCode);
-    }
-
-    if (taskType) {
-      params = params.append('taskType', taskType);
-    }
-
-    params = params.append('skip', skip.toString());
-    params = params.append('take', take.toString());
-    return this.httpClient.get<any>(`${this.appConfig.getConfig('apiEndPoint')}/api/v1/tasks`,
-      {params: params})
-  }
-}
--- a/projects/ng-openlayers/package.json
+++ b/projects/ng-openlayers/package.json
@@ -31,8 +31,8 @@
    "tslib": "^2.3.0"
  },
  "peerDependencies": {
-    "@angular/common": "18.2.3",
-    "@angular/core": "18.2.3",
+    "@angular/common": "^18.2.3",
+    "@angular/core": "^18.2.3",
    "ol": "^8.2.0"
  }
 }
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -20,7 +20,7 @@ const routes = [

  {
    path: '',
-    //canActivate: [NavBarGuard],
+    canActivate: [NavBarGuard],
    component: LandingpageComponent
  },
  {
@@ -43,11 +43,6 @@ const routes = [
    component: TestComponent,
    outlet: 'help-menu'
  },
-  {
-    path: '',
-    component: TestComponent,
-    outlet: 'setting-menu'
-  },
  {
    path: '',
    component: LogoComponent,
Author	SHA1	Message	Date
Willem Dantuma	f2c133e9bd	Merge branch 'develop' Some checks failed FarmMaps/FarmMapsLib/pipeline/head There was a failure building this commit Details	2024-09-24 20:10:52 +02:00
jenkins	1274d96f1d	[ci skip] Updated packages #63 Some checks reported errors FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details	2024-04-24 00:09:30 +00:00
Mark van der Wal	35ccb4f4c5	Merge branch 'develop' All checks were successful FarmMaps/FarmMapsLib/pipeline/head This commit looks good Details	2024-04-23 11:54:04 +02:00
jenkins	47fbc5eab9	[ci skip] Updated packages #62 Some checks reported errors FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details	2024-03-20 12:00:40 +00:00
Peter Bastiani	564d08b5b9	Fixed build All checks were successful FarmMaps/FarmMapsLib/pipeline/head This commit looks good Details	2024-03-20 11:59:14 +00:00
Peter Bastiani	7e17a49dc6	Merge branch 'develop' Some checks failed FarmMaps/FarmMapsLib/pipeline/head There was a failure building this commit Details # Conflicts: # package-lock.json # package.json	2024-03-19 16:04:26 +01:00
jenkins	3f286ee042	[ci skip] Updated packages #58 Some checks reported errors FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details	2024-02-29 13:56:31 +00:00
Peter Bastiani	747499d009	Merge branch 'develop' All checks were successful FarmMaps/FarmMapsLib/pipeline/head This commit looks good Details # Conflicts: # package-lock.json # package.json	2024-02-29 14:54:59 +01:00
jenkins	c4f4a4f61e	[ci skip] Changed by Jenkins: 57 Some checks reported errors FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details	2024-01-24 17:19:55 +00:00
Peter Bastiani	6b095b7f49	Trigger build All checks were successful FarmMaps/FarmMapsLib/pipeline/head This commit looks good Details	2024-01-24 17:18:09 +00:00
Peter Bastiani	b2791eb80b	Merge branch 'develop' Some checks reported errors FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details # Conflicts: # README.md # package-lock.json # package.json	2024-01-24 18:13:28 +01:00
jenkins	4c93a9f766	[ci skip] Changed by Jenkins: 56 Some checks reported errors FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details	2023-11-16 17:02:44 +00:00
Peter Bastiani	93554bc7c4	Update README.md All checks were successful FarmMaps/FarmMapsLib/pipeline/head This commit looks good Details	2023-11-16 16:40:14 +00:00
Peter Bastiani	d074cd81cf	Merge branch 'develop' Some checks reported errors FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details	2023-11-16 17:37:13 +01:00
Peter Bastiani	87547aafcc	Update Jenkinsfile Some checks failed FarmMaps/FarmMapsLib/pipeline/head There was a failure building this commit Details	2023-10-20 12:20:24 +00:00
Peter Bastiani	6ab5ba8a56	Update Jenkinsfile.develop	2023-10-20 12:20:13 +00:00