Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "4.14.3",
+  "version": "4.17.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "farmmaps-lib-app",
-      "version": "4.14.3",
+      "version": "4.17.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.14.2",
+      "version": "4.17.0-prerelease.2559",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -115,7 +115,7 @@
     },
     "dist/common-map": {
       "name": "@farmmaps/common-map",
-      "version": "4.14.2",
+      "version": "4.17.0-prerelease.2559",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -130,7 +130,7 @@
     },
     "dist/common-map3d": {
       "name": "@farmmaps/common-map3d",
-      "version": "4.14.2",
+      "version": "4.17.0-prerelease.2559",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -143,7 +143,7 @@
     },
     "dist/ng-openlayers": {
       "name": "@farmmaps/ng-openlayers",
-      "version": "4.14.2",
+      "version": "4.17.0-prerelease.2559",
       "license": "MPL-2.0",
       "dependencies": {
         "tslib": "^2.3.0"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "4.14.3",
+  "version": "4.17.0",
   "scripts":   {
     "ng": "ng",
     "start": "ng serve",

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]="baseLayers|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
+            <fm-map-layer-list [baseLayers]="true" [itemLayers]="baseMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
           </div>
         </li>
         <li class="nav-item py-0">
@@ -19,6 +19,12 @@
             <fm-map-layer-list [itemLayers]="overlayLayers|async" [selectedLayer]="selectedOverlayLayer|async" (onDelete)="handleOnDelete($event)" (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>
         <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>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">

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 { Observable } from 'rxjs';
+import { filter, map, Observable } from 'rxjs';
 
 @Component({
   selector: 'fm-map-layer-switcher',
@@ -17,7 +17,8 @@ export class LayerSwitcher  implements OnInit,OnChanges{
   public overlayLayers: Observable<Array<IItemLayer>>;
   public selectedOverlayLayer: Observable<IItemLayer>;
   public selectedItemLayer$: Observable<IItemLayer>;
-  public baseLayers: Observable<Array<IItemLayer>>;
+  public baseMaps: Observable<Array<IItemLayer>>;
+  public aerialMaps: Observable<Array<IItemLayer>>;
   public selectedBaseLayer: Observable<IItemLayer>;
 
   constructor( private store: Store<mapReducers.State>) {
@@ -26,7 +27,8 @@ export class LayerSwitcher  implements OnInit,OnChanges{
   ngOnInit() { 
     this.overlayLayers = this.store.select(mapReducers.selectGetOverlayLayers);
     this.selectedOverlayLayer = this.store.select(mapReducers.selectGetSelectedOverlayLayer);
-    this.baseLayers = this.store.select(mapReducers.selectGetBaseLayers);
+    this.baseMaps = this.store.select(mapReducers.selectGetBaseMaps);
+    this.aerialMaps = this.store.select(mapReducers.selectGetArealMaps);
     this.selectedBaseLayer = this.store.select(mapReducers.selectGetSelectedBaseLayer);
     this.selectedItemLayer$ = this.store.select(mapReducers.selectGetSelectedItemLayer)
     this.showLayerSwitcher = this.store.select(mapReducers.selectGetShowLayerSwitcher);
@@ -83,3 +85,4 @@ export class LayerSwitcher  implements OnInit,OnChanges{
     event.preventDefault();
   }
 }
+ 

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 { Observable, Subject, Subscription, from,of ,EMPTY } from 'rxjs';
-import { withLatestFrom, switchMap, skip } from 'rxjs/operators';
+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 { IMapState} from '../../models/map.state';
-import { IClickedFeature } from '../../models/clicked.feature';
+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 {commonReducers} from '@farmmaps/common';
-import { commonActions } from '@farmmaps/common';
+import {commonActions} from '@farmmaps/common';
 
-import { Feature } from 'ol';
+import {Feature} from 'ol';
-import { Geometry, Point, Circle } from 'ol/geom';
+import {Geometry,Point,Circle} from 'ol/geom';
-import { Extent, createEmpty, extend } from 'ol/extent';
+import {Extent,createEmpty,extend } from 'ol/extent';
-import { transform } from 'ol/proj';
+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 }>;
@@ -63,16 +63,16 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
   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);
@@ -85,15 +85,13 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
   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;
@@ -112,21 +110,20 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
     private geolocationService: GeolocationService,
     private geolocaterService: GeolocatorService,
     private zone: NgZone,
-    private deviceorientationService: DeviceOrientationService,
+    private deviceorientationService:DeviceOrientationService,
-    public devicesService: DeviceService) {
+    public devicesService:DeviceService) {
-    if (route && route.snapshot && route.snapshot.data && route.snapshot.data["fm-map-map"]) {
+      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]) => {
+      this.querySub = this.query$.pipe(skip(1), withLatestFrom(this.mapState$)).subscribe(([query,mapState]) =>{
-      if (query && query.querystate) {
+        if(query && query.querystate) {
           let newQueryState = tassign(mapReducers.initialQueryState);
           //console.debug(`Do Query`);
-        const urlparts = [];
+          const urlparts=[];
           if (query.querystate.itemCode && query.querystate.itemCode != "") {
-          if (query.querystate.itemType && query.querystate.itemType != "") {
+            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');
@@ -136,12 +133,12 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
               }
             }
           } else {
-          newQueryState = query.querystate;
+            newQueryState= query.querystate;
           }
-        if (urlparts.length == 0) {
+          if(urlparts.length==0 ) {
             newQueryState.itemCode = query.querystate.itemCode;
             this.zone.run(() => {
-            this.replaceUrl(mapState, newQueryState, query.replace);
+              this.replaceUrl(mapState,newQueryState,query.replace);             
             })
           } else {
             this.router.navigate(urlparts);
@@ -164,19 +161,19 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
     }
   }
 
-  handlePanelResize(resizeTop: number) {
+  handlePanelResize(resizeTop:number) {
-    if (resizeTop == 100 || !this.devicesService.IsMobile()) {
+    if(resizeTop==100 || !this.devicesService.IsMobile() ) {
-      this.visibleAreaBottom = 0;
+      this.visibleAreaBottom=0;
     } else {
-      this.visibleAreaBottom = 100 - resizeTop;
+      this.visibleAreaBottom=100-resizeTop;
-      if (this.visibleAreaBottom > 60) {
+      if(this.visibleAreaBottom>60) {
-        this.visibleAreaBottom = 60;
+        this.visibleAreaBottom=60;
       }
     }      
   }
 
-  bottom(panelVisible: boolean) {
+  bottom(panelVisible:boolean) {
-    if (panelVisible) {
+    if(panelVisible) {
       return this.visibleAreaBottom + '%';     
     } else {
       return "0%";
@@ -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) {
+  handleSidepaneloutletActivate(component:any) {
-    if (component && component.hasOwnProperty('clickedFeature')) {
+   if(component && component.hasOwnProperty('clickedFeature')) {
      (component as IClickedFeature).clickedFeature = this.clickedFeature;
    }
-    if (component && component.hasOwnProperty('extrawide')) {
+   if(component && component.hasOwnProperty('extrawide')) {
     this.store.dispatch(new mapActions.SetPanelExtraWide(true));
   }
  }
 
-  handleSidepaneloutletDeactivate(component: any) {
+  handleSidepaneloutletDeactivate(component:any) {
-    if (component && component.hasOwnProperty('clickedFeature')) {
+    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) {
+  handlePrerender(event:any) {
-    if (!this.dataLayerSlideEnabled) return;
+    if(!this.dataLayerSlideEnabled) return;
     const ctx = event.context;
     const mapSize = this.map.instance.getSize();
     const width = mapSize[0] * (this.dataLayerSlideValue / 100);
@@ -246,7 +243,7 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
     ctx.clip();
   }
 
-  handleSlideChange(event: any) {
+  handleSlideChange(event:any) {
      this.dataLayerSlideValue = event.target.value;
      this.map.instance.render();
   }
@@ -255,65 +252,63 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
     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 baseLayer = params.get("baseLayer")?params.get("baseLayer"):"";
-      const newMapState = { zoom: zoom, rotation: rotation, xCenter: xCenter, yCenter: yCenter, baseLayerCode: baseLayer };
+      const newMapState = {zoom: zoom, rotation: rotation, xCenter: xCenter, yCenter: yCenter, baseLayerCode: baseLayer };
       return newMapState;
     } else {
       return null;
     }
   }
 
-  normalizeMapState(mapState: IMapState): IMapState {
+  normalizeMapState(mapState:IMapState):IMapState {
-    if (!mapState) return null;
+    if(!mapState) return null;
-    return {
+    return {zoom: this.round(mapState.zoom,0),
-      zoom: this.round(mapState.zoom, 0),
+      rotation: this.round(mapState.rotation,2),
-      rotation: this.round(mapState.rotation, 2),
+      xCenter: this.round(mapState.xCenter,5),
-      xCenter: this.round(mapState.xCenter, 5),
+      yCenter: this.round(mapState.yCenter,5),
-      yCenter: this.round(mapState.yCenter, 5),
+      baseLayerCode: mapState.baseLayerCode };
-      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,10 +323,10 @@ 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") {
+      if(entry.outlet=="primary") {
-        this.noContent = false;
+        this.noContent=false;
       }
     });
       
@@ -341,25 +336,25 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
 
       const urlMapState = this.getMapStateFromUrl(this.route.snapshot.paramMap);
       const urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap);
-    if (urlQueryState && urlMapState && this.noContent) {
+      if(urlQueryState && urlMapState && this.noContent) {
-      this.store.dispatch(new mapActions.SetState(urlMapState, urlQueryState));
+        this.store.dispatch(new mapActions.SetState(urlMapState,urlQueryState));
-      window.localStorage.setItem("FarmMapsCommonMap_mapState", this.serializeMapState(urlMapState));
+        window.localStorage.setItem("FarmMapsCommonMap_mapState",this.serializeMapState(urlMapState));
-    } else if (urlQueryState && this.noContent) {
+      } 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]) => {
+      this.paramSub = this.route.paramMap.pipe(withLatestFrom(this.state$),switchMap(([params,state]) => {
-      if (this.initialized && this.noContent) {
+         if(this.initialized && this.noContent) {
           const urlQueryState = this.getQueryStateFromUrl(params);
-        if (this.serializeService.serialize(state.queryState) != this.serializeService.serialize(urlQueryState)) {
+          if( this.serializeService.serialize(state.queryState) != this.serializeService.serialize(urlQueryState)) {
-          return of(new mapActions.SetState(state.mapState, urlQueryState));
+            return of(new mapActions.SetState(state.mapState,urlQueryState));
           }          
          } 
          return EMPTY;        
       })).subscribe((action) => {
-      if (action) {
+        if(action) {
           this.zone.run(() => {
             //console.debug("Url to state");
             this.store.dispatch(action);
@@ -371,22 +366,22 @@ export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
 
     this.stateSub = this.state$.pipe(switchMap((state) => {
       const newUrl = this.serializeMapState(state.mapState) + "_" + this.serializeService.serialize(state.queryState);
-      if (this.lastUrl != newUrl) {
+      if(this.lastUrl!=newUrl) {
-        this.lastUrl = newUrl;
+        this.lastUrl=newUrl;
         return of(state);
       }
       else {
         return of(null);
       }
     })).subscribe((newUrlState: any) => {
-      if (newUrlState) {
+        if(newUrlState) {
           //console.debug(`State to url`);
-        this.replaceUrl(newUrlState.mapState, newUrlState.queryState, newUrlState.replaceUrl);
+          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) {
+      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);
+        const currentQueryState = urlQueryState==null?"":this.serializeService.serialize(urlQueryState);
-      if (mapState.baseLayerCode != "" && ((newMapState != currentMapState) || (newQueryState != currentQueryState))) {
+        if(mapState.baseLayerCode!="" && ((newMapState!= currentMapState)  || (newQueryState!=currentQueryState))) {
-        const parts = ["."];
+          const parts =["."];
           parts.push(mapState.xCenter.toFixed(5));
           parts.push(mapState.yCenter.toFixed(5));
-        parts.push(mapState.zoom.toFixed(0));
+          parts.push( mapState.zoom.toFixed(0));
-        parts.push(mapState.rotation.toFixed(2));
+          parts.push( mapState.rotation.toFixed(2));        
           parts.push(mapState.baseLayerCode);
-        parts.push(this.serializeService.serialize(queryState));
+          parts.push( this.serializeService.serialize(queryState));
           
           //console.debug("Replace url",parts);
-        this.router.navigate(parts, { replaceUrl: replace, relativeTo: this.route.parent });
+          this.router.navigate(parts, { replaceUrl: replace,relativeTo:this.route.parent });
         }  
       }     
   }
 
   handleOnMoveEnd(event) {    
-    if (this.initialized && this.viewEnabled) {
+    if(this.initialized && this.viewEnabled) {
-      this.zone.run(() => {
+      this.zone.run(() =>{
         //console.debug("Move end");
         const map = event.map;
         const view = map.getView();
@@ -471,19 +466,17 @@ 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.zone.run(() =>{
       this.store.dispatch(new mapActions.ToggleLayerValuesEnabled());
     });
   }
-  }
 
   handleOnDownload(event) {
 
@@ -498,10 +491,10 @@ 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));
   }
 
@@ -521,16 +514,16 @@ 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) {
+      if( locations.length > 0) {
-        const point = new Point([locations[0].coordinates.lon, locations[0].coordinates.lat]);
+        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))

projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.html

@@ -7,7 +7,8 @@
         <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
         <h1>{{item.name}}</h1>
       </div>
-      <div class="legend-container" *ngIf="item?.data.layers;let layers">
+      <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)">
@@ -26,9 +27,11 @@
               <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>
         <fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
+      </ng-container>
     </div>
   </div>
 </div>

projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts

@@ -1,12 +1,13 @@
-import { Component, Injectable } from '@angular/core';
 import { Location } from '@angular/common';
-import { Store } from '@ngrx/store';
+import { Component, Injectable, OnDestroy } from '@angular/core';
-import * as mapReducers from '../../reducers/map.reducer';
-import { commonReducers, ItemTypeService, ItemService, FolderService } from '@farmmaps/common';
 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 { 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")
@@ -16,12 +17,17 @@ import * as mapActions from '../../actions/map.actions';
   templateUrl: './selected-item-geotiff.component.html',
   styleUrls: ['./selected-item-geotiff.component.scss']
 })
-export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent {
+export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent implements OnDestroy {
+  sub: Subscription;
 
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
+  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,location,router);
   }
 
+  ngOnDestroy(): void {
+    if (this.sub) this.sub.unsubscribe();
+  }
+
   onLayerChanged(layerIndex: number) {
     this.store.dispatch(new mapActions.SetLayerIndex(layerIndex));
   }
@@ -29,4 +35,13 @@ 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;     
+    })
+  }
 }

projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.html

@@ -7,7 +7,8 @@
         <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
         <h1>{{item.name}}</h1>
       </div>
-      <div class="legend-container" *ngIf="item?.data.layers;let layers">
+      <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)">
@@ -24,8 +25,10 @@
               <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>
+      </ng-container>
       <fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
     </div>
   </div>

projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts

@@ -1,14 +1,13 @@
-import { Component, Input, Injectable, OnInit } from '@angular/core';
 import { Location } from '@angular/common';
-import { Feature } from 'ol';
+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 * 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 * as mapReducers from '../../reducers/map.reducer';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
-import { Observable } from 'rxjs';
+import { Subscription } from 'rxjs';
 
 
 @ForItemType("vnd.farmmaps.itemtype.shape.processed")
@@ -18,12 +17,17 @@ import { Observable } from 'rxjs';
   templateUrl: './selected-item-shape.component.html',
   styleUrls: ['./selected-item-shape.component.scss']
 })
-export class SelectedItemShapeComponent extends AbstractSelectedItemComponent {
+export class SelectedItemShapeComponent extends AbstractSelectedItemComponent implements OnDestroy {
+  public selectedLayer = 0;
+  sub: Subscription;
 
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
+  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,location,router);
   }
-  public selectedLayer = 0;
+
+  ngOnDestroy(): void {
+    if (this.sub) this.sub.unsubscribe();
+  }
 
   onLayerChanged(layerIndex: number) {
     this.store.dispatch(new mapActions.SetLayerIndex(layerIndex));
@@ -32,4 +36,13 @@ export class SelectedItemShapeComponent 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;     
+    })
+  }
 }

projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html

@@ -7,7 +7,8 @@
         <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
         <h1>{{item.name}}</h1>
       </div>
-      <div class="legend-container" *ngIf="item?.data.layers;let layers">
+      <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">
@@ -42,9 +43,10 @@
               <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>
+            <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>
+      </ng-container>
     </div>
   </div>
 </div>

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 { Store } from '@ngrx/store';
+import { Component, Injectable, OnDestroy } from '@angular/core';
-import * as mapReducers from '../../reducers/map.reducer';
-import { commonReducers, ItemTypeService, IItem, ItemService, IItemLinkType, IUrlType } from '@farmmaps/common';
 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 { 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,12 +18,17 @@ import {TemporalService} from '../../services/temporal.service';
   templateUrl: './selected-item-temporal.component.html',
   styleUrls: ['./selected-item-temporal.component.scss']
 })
-export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent {
+export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent implements OnDestroy {
+  sub: Subscription;
 
   constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
     super(store, itemTypeService,location,router);
   }
   
+  ngOnDestroy(): void {
+    if (this.sub) this.sub.unsubscribe();
+  }
+
   onLayerChanged(layerIndex: number) {
     this.store.dispatch(new mapActions.SetLayerIndex(layerIndex));
   }
@@ -32,8 +37,6 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
     return  (this.itemLayer as ITemporalItemLayer)?.selectedItemLayer
   }
 
-  
-
   handleNextTemporal(event:MouseEvent) {
     this.store.dispatch(new mapActions.NextTemporal());
     event.preventDefault();    
@@ -61,14 +64,12 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
     return false;
   }
   
-  download(item:IItem,event:MouseEvent) {
+  download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) {
     event.stopPropagation();
     event.preventDefault();
-    const itemLink : IItemLinkType = {itemcode:item.code,pathsuffix:"download", validminutes:10}
+    const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10}
-    console.log('download1', itemLink)
+    this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {  
-    const foo = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {  
+       window.location.href = itemLinkUrl.url;       
-      console.log('download2', itemLinkUrl)
-       window.location.href =itemLinkUrl.url        
     })
   }
 }

projects/common-map/src/fm-map/reducers/map.reducer.ts

@@ -637,6 +637,8 @@ 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);

projects/common/src/fm/models/item.ts

@@ -26,6 +26,7 @@ export class Item implements IItem {
   public data?:any;
   public isEditable?:boolean;
   public owner?: string;
+  public fullPath?: string;
 
   constructor() {  
   }

projects/common/src/fm/services/admin.service.ts

@@ -53,15 +53,19 @@ export class AdminService {
     return this.httpClient.post<IItemTask>(`${this.ApiEndpoint()}/api/v1/admin/${item.code}/tasks`, task);
   }
 
-  getAnalyseFolderOverview(): Observable<any> {
+  getFileStorageOverview(): Observable<any> {
-    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/overview`);
+    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/overview`);
   }
 
-  getAnalyseFolderInfo(user: string): Observable<any> {
+  getFileStorageInfo(user: string): Observable<any> {
-    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/${user}`);
+    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/${user}`);
   }
 
-  getAnalyseFolderLog(): Observable<any> {
+  getFileStorageLog(): Observable<any> {
-    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/analysefolder/folderinfo/log`);
+    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);
   }
 }

projects/common/src/fm/services/item.service.ts

@@ -79,7 +79,8 @@ 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): Observable<IItem[]> {
+    skip?: number, take?: number, sourceTask?: string, exactMatchStartOrEndDate?: boolean, owner?:string,
+    includeFullpath?: boolean): Observable<IItem[]> {
     let params = new HttpParams();
     if(itemType)  params = params.append("it", itemType);
     if(dataFilter) params = params.append("df", JSON.stringify(dataFilter));
@@ -96,6 +97,7 @@ 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 });
   }