Merge branch 'develop'

[ci skip] Updated packages #66
2024.12 from develop to master
2025-04-05 08:30:19 +02:00 · 2024-12-10 07:49:03 +00:00 · 2024-12-09 13:40:33 +01:00 · 2024-10-22 14:16:00 +00:00 · 2024-10-22 16:12:25 +02:00 · 2024-09-24 20:10:52 +02:00
24 changed files with 338 additions and 518 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
@@ -1,12 +1,12 @@
 {
  "name": "farmmaps-lib-app",
-  "version": "4.19.0",
+  "version": "4.14.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "farmmaps-lib-app",
-      "version": "4.19.0",
+      "version": "4.14.0",
      "dependencies": {
        "@angular-eslint/eslint-plugin": "^18.2.0",
        "@angular/animations": "18.2.3",
@@ -90,7 +90,7 @@
    },
    "dist/common": {
      "name": "@farmmaps/common",
-      "version": "4.19.0-prerelease.2582",
+      "version": "4.14.0-prerelease.2544",
      "dependencies": {
        "tslib": "^2.3.0"
      },
@@ -115,7 +115,7 @@
    },
    "dist/common-map": {
      "name": "@farmmaps/common-map",
-      "version": "4.19.0-prerelease.2582",
+      "version": "4.14.0-prerelease.2544",
      "dependencies": {
        "tslib": "^2.0.0"
      },
@@ -130,7 +130,7 @@
    },
    "dist/common-map3d": {
      "name": "@farmmaps/common-map3d",
-      "version": "4.19.0-prerelease.2582",
+      "version": "4.14.0-prerelease.2544",
      "dependencies": {
        "tslib": "^2.0.0"
      },
@@ -143,7 +143,7 @@
    },
    "dist/ng-openlayers": {
      "name": "@farmmaps/ng-openlayers",
-      "version": "4.19.0-prerelease.2582",
+      "version": "4.14.0-prerelease.2544",
      "license": "MPL-2.0",
      "dependencies": {
        "tslib": "^2.3.0"
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "farmmaps-lib-app",
-  "version": "4.19.0",
+  "version": "4.14.0",
  "scripts":   {
    "ng": "ng",
    "start": "ng serve",
--- a/projects/common-map/src/fm-map/actions/map.actions.ts
+++ b/projects/common-map/src/fm-map/actions/map.actions.ts
@@ -59,8 +59,6 @@ export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
 export const SETVIEWSTATE = '[Map] SetViewState'
 export const CLEARFEATURES = '[Map] ClearFeatures';
 export const SETPANELEXTRAWIDE = '[Map] SetPanelExtraWide';
-export const BACKUPFEATURES = '[Map] BackupFeatures';
-export const RESTOREFEATURES = '[Map] RestoreFeatures';

 export class Clear implements Action {
  readonly type = CLEAR;
@@ -349,16 +347,6 @@ export class SetPanelExtraWide implements Action {
  constructor(public panelExtraWide:boolean) {}
 }

-export class BackupFeatures implements Action {
-  readonly type = BACKUPFEATURES;
-  constructor() {}
-}
-
-export class RestoreFeatures implements Action {
-  readonly type = RESTOREFEATURES;
-  constructor() {}
-}
-
 export type Actions = SetMapState
  | Init
  | Clear
@@ -407,7 +395,5 @@ export type Actions = SetMapState
  | ToggleShowDataLayerSlide
  | SetViewState
  | ClearFeatures
-  | SetPanelExtraWide
-  | BackupFeatures
-  | RestoreFeatures;
+  | SetPanelExtraWide;

--- a/projects/common-map/src/fm-map/common-map.module.ts
+++ b/projects/common-map/src/fm-map/common-map.module.ts
@@ -36,7 +36,6 @@ 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';
@@ -106,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, 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,
@@ -143,7 +142,6 @@ export {
        FeatureListContainerComponent,
        FeatureListCroppingschemeComponent,
        FeatureListCropfieldComponent,
-        FeatureListObservationComponent,
        FeatureListFeatureContainerComponent,
        FeatureListFeatureComponent,
        FeatureListFeatureCroppingschemeComponent,
@@ -203,7 +201,6 @@ export {
        FeatureListContainerComponent,
        FeatureListCroppingschemeComponent,
        FeatureListCropfieldComponent,
-        FeatureListObservationComponent,
        FeatureListFeatureContainerComponent,
        ZoomToExtentComponent,
        ifZoomToShowDirective,
@@ -217,10 +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: FeatureListFeatureCropfieldComponent, 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-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,44 @@
        <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>
+          <li><a href="#" (click)="download(item,$event)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</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,15 @@
+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, ItemService, IItemLinkType, IUrlType } 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 +18,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();
+    super(store, itemTypeService,location,router);
  }

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

+  
+
  handleNextTemporal(event:MouseEvent) {
    this.store.dispatch(new mapActions.NextTemporal());
    event.preventDefault();    
@@ -64,12 +61,14 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
    return false;
  }
  
-  download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) {
+  download(item:IItem,event:MouseEvent) {
    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;       
+    const itemLink : IItemLinkType = {itemcode:item.code,pathsuffix:"download", validminutes:10}
+    console.log('download1', itemLink)
+    const foo = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {  
+      console.log('download2', itemLinkUrl)
+       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
@@ -9,7 +9,6 @@ import { ILayervalue } from '../models/layer.value';
 import * as mapActions from '../actions/map.actions';
 import {commonActions} from '@farmmaps/common';
 import { createSelector, createFeatureSelector } from '@ngrx/store';
-import * as _ from 'lodash';

 import {Feature} from 'ol';
 import {Geometry} from 'ol/geom';
@@ -48,7 +47,6 @@ export interface State {
  query:IQuery,
  parentCode: string,
  features: Array<Feature<Geometry>>,
-  featuresBackup: Array<Feature<Geometry>>,
  panelVisible: boolean,
  panelCollapsed: boolean,
  panelExtraWide: boolean,
@@ -95,7 +93,6 @@ export const initialState: State = {
  query: null,
  parentCode: null,
  features: [],
-  featuresBackup: [],
  panelVisible: false,
  panelCollapsed: false,
  panelExtraWide: false,
@@ -159,15 +156,13 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
      const a = action as mapActions.StartSearchSuccess;
      return tassign(state, {
        features: a.features,
-        featuresBackup: [],
        inSearch:false
      });
    }
    case mapActions.SETFEATURES: {
      const a = action as mapActions.SetFeatures;
      return tassign(state, {
-        features: a.features,
-        featuresBackup: []
+        features: a.features
      });
    }
    case mapActions.SELECTFEATURE: {
@@ -185,7 +180,6 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
        selectedItemLayer: null,
        showDataLayerSlide: false,
        features:[],
-        featuresBackup: [],
        inSearch:inSearch
      });
    }
@@ -302,7 +296,6 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
      return tassign(state, {
        selectedItem: null,
        features:[],
-        featuresBackup: [],
        selectedItemLayer:null,
        searchCollapsed: !panelVisible,
        panelVisible: panelVisible,
@@ -339,8 +332,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
        extent: a.feature.getGeometry().getExtent(),
        searchCollapsed: false,
        clearEnabled:true,
-        features:features,
-        featuresBackup:[]
+        features:features
      });
    }
    case mapActions.UPDATEFEATURESUCCESS: {
@@ -354,7 +346,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
          features.push(state.features[i]);
        }
      }
-      return tassign(state, { features: features, featuresBackup: [] });
+      return tassign(state, { features: features });
    }
    case mapActions.EXPANDSEARCH: {
      return tassign(state, { searchCollapsed: false });
@@ -399,7 +391,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
      return tassign(state, {overlayLayers: [], selectedOverlayLayer: null});
    }
    case mapActions.CLEARFEATURES: {
-      return tassign(state, {features: [], featuresBackup: [], selectedFeature: null});
+      return tassign(state, {features: [], selectedFeature: null});
    }
    case mapActions.SETVISIBILITY: {
      const a = action as mapActions.SetVisibility;
@@ -517,7 +509,6 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
        searchCollapsed: true,
        searchMinified: false,
        features: [],
-        featuresBackup: [],
        query:initialState.query,
        showLayerSwitcher: false,
        extent: null,
@@ -565,8 +556,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
          selectedItem: null,
          selectedItemLayer: null,
          showDataLayerSlide: false,
-          features:[],
-          featuresBackup:[]
+          features:[]
         });
      }
      if(state.features.length>0)  {
@@ -579,7 +569,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
        if(index>=0) {
          const newFeatures = state.features.slice(0);
          newFeatures.splice(index,1);
-          return tassign(state,{features:newFeatures, featuresBackup:[]});
+          return tassign(state,{features:newFeatures});
        }
      }
      return state;
@@ -588,17 +578,6 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
      const a= action as mapActions.SetPanelExtraWide;
      return tassign(state,{panelExtraWide:a.panelExtraWide});
    }
-    case mapActions.BACKUPFEATURES: {
-      return tassign(state, {
-        featuresBackup: _.cloneDeep(state.features)
-      });
-    }
-    case mapActions.RESTOREFEATURES: {
-      return tassign(state, {
-        features: _.cloneDeep(state.featuresBackup),
-        featuresBackup: []
-      });
-    }
    default: {
      return state;
    }
@@ -658,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/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/services/admin.service.ts
+++ b/projects/common/src/fm/services/admin.service.ts
@@ -53,19 +53,15 @@ export class AdminService {
    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`);
+  getAnalyseFolderOverview(): Observable<any> {
+    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/overview`);
  }

-  getFileStorageInfo(user: string): Observable<any> {
-    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/${user}`);
+  getAnalyseFolderInfo(user: string): Observable<any> {
+    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/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);
+  getAnalyseFolderLog(): Observable<any> {
+    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/log`);
  }
 }
--- a/projects/common/src/fm/services/item.service.ts
+++ b/projects/common/src/fm/services/item.service.ts
@@ -79,8 +79,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, exactMatchStartOrEndDate?: boolean, owner?:string): Observable<IItem[]> {
    let params = new HttpParams();
    if(itemType)  params = params.append("it", itemType);
    if(dataFilter) params = params.append("df", JSON.stringify(dataFilter));
@@ -97,7 +96,6 @@ export class ItemService {
    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 });
  }

@@ -116,8 +114,7 @@ export class ItemService {

  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,
-                  atItemLocationItemCode?: string): Observable<IItem[]> {
+                   exactMatchStartOrEndDate?: boolean, owner?:string, indexed?: boolean): Observable<IItem[]> {
    let params = new HttpParams();
    if(itemType != null) {
      params = params.append("it", itemType);
@@ -135,7 +132,6 @@ export class ItemService {
    if(skip) params = params.append("skip", skip);
    if(take) params = params.append("take", take);
    if(indexed) params = params.append("ind",indexed?"true":"false");
-    if(atItemLocationItemCode) params = params.append("ail",atItemLocationItemCode);
    return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params });
  }
Author	SHA1	Message	Date
Willem Dantuma	80ef4ed6fe	Merge branch 'develop' All checks were successful FarmMaps/FarmMapsLib/pipeline/head This commit looks good Details	2025-04-05 08:30:19 +02:00
jenkins	d21f304081	[ci skip] Updated packages #66 Some checks reported errors FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details	2024-12-10 07:49:03 +00:00
Francisco Salas	2bad3274fd	2024.12 from develop to master All checks were successful FarmMaps/FarmMapsLib/pipeline/head This commit looks good Details Merge branch 'develop' # Conflicts: # package-lock.json # package.json	2024-12-09 13:40:33 +01:00
jenkins	31d3e58062	[ci skip] Updated packages #65 Some checks reported errors FarmMaps/FarmMapsLib/pipeline/head Something is wrong with the build of this commit Details	2024-10-22 14:16:00 +00:00
Mark	0231421cef	Merge branch 'develop' All checks were successful FarmMaps/FarmMapsLib/pipeline/head This commit looks good Details # Conflicts: # package-lock.json	2024-10-22 16:12:25 +02:00
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