[ci skip] Updated packages #2576

This reverts commit df14427d60.

package-lock.json

@@ -1,22 +1,22 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "4.12.0",
+  "version": "4.18.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "farmmaps-lib-app",
-      "version": "4.12.0",
+      "version": "4.18.0",
       "dependencies": {
         "@angular-eslint/eslint-plugin": "^18.2.0",
-        "@angular/animations": "^18.2.3",
-        "@angular/common": "^18.2.3",
-        "@angular/compiler": "^18.2.3",
-        "@angular/core": "^18.2.3",
-        "@angular/forms": "^18.2.3",
-        "@angular/platform-browser": "^18.2.3",
-        "@angular/platform-browser-dynamic": "^18.2.3",
-        "@angular/router": "^18.2.3",
+        "@angular/animations": "18.2.3",
+        "@angular/common": "18.2.3",
+        "@angular/compiler": "18.2.3",
+        "@angular/core": "18.2.3",
+        "@angular/forms": "18.2.3",
+        "@angular/platform-browser": "18.2.3",
+        "@angular/platform-browser-dynamic": "18.2.3",
+        "@angular/router": "18.2.3",
         "@farmmaps/common": "file:dist/common",
         "@farmmaps/common-map": "file:dist/common-map",
         "@farmmaps/common-map3d": "file:dist/common-map3d",
@@ -55,11 +55,11 @@
       },
       "devDependencies": {
         "@angular-builders/custom-webpack": "^18.0.0",
-        "@angular-devkit/build-angular": "^18.2.3",
-        "@angular/cli": "^18.2.3",
-        "@angular/compiler-cli": "^18.2.3",
-        "@angular/language-service": "^18.2.3",
-        "@angular/localize": "^18.2.3",
+        "@angular-devkit/build-angular": "18.2.3",
+        "@angular/cli": "18.2.3",
+        "@angular/compiler-cli": "18.2.3",
+        "@angular/language-service": "18.2.3",
+        "@angular/localize": "18.2.3",
         "@types/arcgis-rest-api": "^10.4.5",
         "@types/jasmine": "~2.8.8",
         "@types/jasminewd2": "^2.0.9",
@@ -90,14 +90,14 @@
     },
     "dist/common": {
       "name": "@farmmaps/common",
-      "version": "4.12.0-prerelease.2526",
+      "version": "4.18.0-prerelease.2575",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/common": "^18.2.3",
-        "@angular/core": "^18.2.3",
-        "@angular/forms": "^18.2.3",
+        "@angular/common": "18.2.3",
+        "@angular/core": "18.2.3",
+        "@angular/forms": "18.2.3",
         "@microsoft/signalr": "^3.1.16",
         "@ng-bootstrap/ng-bootstrap": "^17.0.1",
         "@ngrx/effects": "^18.0.2",
@@ -115,12 +115,12 @@
     },
     "dist/common-map": {
       "name": "@farmmaps/common-map",
-      "version": "4.12.0-prerelease.2526",
+      "version": "4.18.0-prerelease.2575",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "^18.2.3",
+        "@angular/core": "18.2.3",
         "@ngrx/effects": "^18.0.2",
         "@ngrx/router-store": "^18.0.2",
         "@ngrx/store": "^18.0.2",
@@ -130,27 +130,27 @@
     },
     "dist/common-map3d": {
       "name": "@farmmaps/common-map3d",
-      "version": "4.12.0-prerelease.2526",
+      "version": "4.18.0-prerelease.2575",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "^18.2.3",
-        "@angular/core": "^18.2.3",
+        "@angular/common": "18.2.3",
+        "@angular/core": "18.2.3",
         "cesium": "^1.97.0",
         "ol-cesium": ">=2.13.0"
       }
     },
     "dist/ng-openlayers": {
       "name": "@farmmaps/ng-openlayers",
-      "version": "4.12.0-prerelease.2526",
+      "version": "4.18.0-prerelease.2575",
       "license": "MPL-2.0",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/common": "^18.2.3",
-        "@angular/core": "^18.2.3",
+        "@angular/common": "18.2.3",
+        "@angular/core": "18.2.3",
         "ol": "^8.2.0"
       }
     },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "4.12.0",
+  "version": "4.18.0",
   "scripts":   {
     "ng": "ng",
     "start": "ng serve",
@@ -12,14 +12,14 @@
   "private": true,
   "dependencies":   {
     "@angular-eslint/eslint-plugin": "^18.2.0",
-    "@angular/animations": "^18.2.3",
-    "@angular/common": "^18.2.3",
-    "@angular/compiler": "^18.2.3",
-    "@angular/core": "^18.2.3",
-    "@angular/forms": "^18.2.3",
-    "@angular/platform-browser": "^18.2.3",
-    "@angular/platform-browser-dynamic": "^18.2.3",
-    "@angular/router": "^18.2.3",
+    "@angular/animations": "18.2.3",
+    "@angular/common": "18.2.3",
+    "@angular/compiler": "18.2.3",
+    "@angular/core": "18.2.3",
+    "@angular/forms": "18.2.3",
+    "@angular/platform-browser": "18.2.3",
+    "@angular/platform-browser-dynamic": "18.2.3",
+    "@angular/router": "18.2.3",
     "@farmmaps/common": "file:dist/common",
     "@farmmaps/common-map": "file:dist/common-map",
     "@farmmaps/common-map3d": "file:dist/common-map3d",
@@ -62,11 +62,11 @@
   },
   "devDependencies":   {
     "@angular-builders/custom-webpack": "^18.0.0",
-    "@angular-devkit/build-angular": "^18.2.3",
-    "@angular/cli": "^18.2.3",
-    "@angular/compiler-cli": "^18.2.3",
-    "@angular/language-service": "^18.2.3",
-    "@angular/localize": "^18.2.3",
+    "@angular-devkit/build-angular": "18.2.3",
+    "@angular/cli": "18.2.3",
+    "@angular/compiler-cli": "18.2.3",
+    "@angular/language-service": "18.2.3",
+    "@angular/localize": "18.2.3",
     "@types/arcgis-rest-api": "^10.4.5",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "^2.0.9",

projects/common-map/package.json

@@ -8,7 +8,7 @@
     "tslib": "^2.0.0"
   },
   "peerDependencies": {
-    "@angular/core": "^18.2.3",
+    "@angular/core": "18.2.3",
     "ngrx-store-localstorage": "^18.0.0",
     "@ngrx/effects": "^18.0.2",
     "@ngrx/router-store": "^18.0.2",

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">
@@ -20,12 +20,17 @@
           </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>
+          <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>
           <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>

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.scss

@@ -52,11 +52,20 @@ aol-map { position:absolute;width:100%;height:calc( 100vh );}
   pointer-events: none;
 }
 
-
-.control-container {
-  float:right;
+@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;
+  }
 }
 
 .fullscreen .viewport-container {

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 }>;
@@ -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,13 +85,15 @@ 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;
@@ -110,20 +112,21 @@ 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"]) {
+    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) {
+    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=[];
+        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');
@@ -133,12 +136,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);
@@ -161,19 +164,19 @@ 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) {
+  bottom(panelVisible: boolean) {
+    if (panelVisible) {
       return this.visibleAreaBottom + '%';
     } else {
       return "0%";
@@ -189,7 +192,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>) {
@@ -205,26 +208,26 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     this.store.dispatch(new mapActions.DoQuery(queryState));
   }
 
-  handleSidepaneloutletActivate(component:any) {
-   if(component && component.hasOwnProperty('clickedFeature')) {
+  handleSidepaneloutletActivate(component: any) {
+    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) {
-    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);
@@ -243,7 +246,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();
   }
@@ -252,63 +255,65 @@ 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 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);
@@ -323,10 +328,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") {
-        this.noContent=false;
+      if (entry.outlet == "primary") {
+        this.noContent = false;
       }
     });
 
@@ -336,25 +341,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) {
-        this.store.dispatch(new mapActions.SetState(urlMapState,urlQueryState));
-        window.localStorage.setItem("FarmMapsCommonMap_mapState",this.serializeMapState(urlMapState));
-      } else if(urlQueryState && this.noContent) {
+    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) {
+    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));
+        if (this.serializeService.serialize(state.queryState) != this.serializeService.serialize(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);
@@ -366,22 +371,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) {
-        this.lastUrl=newUrl;
+      if (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) => {
@@ -401,7 +406,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();
   }
@@ -418,30 +423,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);
-        if(mapState.baseLayerCode!="" && ((newMapState!= currentMapState)  || (newQueryState!=currentQueryState))) {
-          const parts =["."];
+      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.zoom.toFixed(0));
+        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) {
-      this.zone.run(() =>{
+    if (this.initialized && this.viewEnabled) {
+      this.zone.run(() => {
         //console.debug("Move end");
         const map = event.map;
         const view = map.getView();
@@ -466,17 +471,19 @@ 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) {
 
@@ -491,10 +498,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));
   }
 
@@ -514,16 +521,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) {
-        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))

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,location,router);
+    super(store, itemTypeService, itemService$, location,router);
   }
 
   areaInHa(item:IItem):number {

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 * as mapReducers from '../../reducers/map.reducer';
-import { commonReducers, ItemTypeService, ItemService, FolderService } from '@farmmaps/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 { 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,10 +17,15 @@ 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) {
-    super(store, itemTypeService,location,router);
+  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) {
@@ -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 {
-
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
-    super(store, itemTypeService,location,router);
-  }
+export class SelectedItemShapeComponent extends AbstractSelectedItemComponent implements OnDestroy {
   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));
@@ -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,8 +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($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,16 +1,15 @@
-import { Component, Injectable } from '@angular/core';
 import { Location } from '@angular/common';
-import { Store } from '@ngrx/store';
-import * as mapReducers from '../../reducers/map.reducer';
-import { commonReducers, ItemTypeService, IItem } from '@farmmaps/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 { 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()
@@ -19,10 +18,15 @@ 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>, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
-    super(store, itemTypeService,location,router);
+  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();
   }
 
   onLayerChanged(layerIndex: number) {
@@ -33,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,4 +63,13 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
     this.router.navigate(['/viewer', 'temporal', 'item', item.parentCode, new Date(Date.parse(item.dataDate)).getUTCFullYear()]);
     return false;
   }
+  
+  download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) {
+    event.stopPropagation();
+    event.preventDefault();
+    const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10}
+    this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {  
+       window.location.href = itemLinkUrl.url;       
+    })
+  }
 }

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, ItemTypeService} from '@farmmaps/common';
+import {AppConfig, commonReducers, IItem, ItemService, 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, private location: Location, public router: Router) {
+  constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, public itemService: ItemService, private location: Location, public router: Router) {
   }
 
   handleOnView(item: IItem) {
@@ -37,6 +37,11 @@ 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;
@@ -76,8 +81,8 @@ export abstract class AbstractSelectedItemComponent {
 })
 export class SelectedItemComponent extends AbstractSelectedItemComponent {
 
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, public config:AppConfig) {
-    super(store, itemTypeService,location,router);
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, itemService: ItemService, location: Location, router: Router, public config:AppConfig) {
+    super(store, itemTypeService,itemService,location,router);
   }
 
   getThumbnailUrl(item:IItem):string {

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-map3d/package.json

@@ -8,8 +8,8 @@
     "tslib": "^2.0.0"
   },
   "peerDependencies": {
-    "@angular/common": "^18.2.3",
-    "@angular/core":  "^18.2.3",
+    "@angular/common": "18.2.3",
+    "@angular/core":  "18.2.3",
     "cesium": "^1.97.0",
     "ol-cesium": ">=2.13.0"
   }

projects/common/package.json

@@ -6,9 +6,9 @@
   },
   "peerDependencies": {
     "@ng-bootstrap/ng-bootstrap": "^17.0.1",
-    "@angular/common": "^18.2.3",
-    "@angular/core": "^18.2.3",
-    "@angular/forms": "^18.2.3",
+    "@angular/common": "18.2.3",
+    "@angular/core": "18.2.3",
+    "@angular/forms": "18.2.3",
     "@ngrx/effects": "^18.0.2",
     "@ngrx/router-store": "^18.0.2",
     "@ngrx/store": "^18.0.2",

projects/common/src/fm/actions/app-common.actions.ts

@@ -83,6 +83,11 @@ export const SETPAGEMODE = '[AppCommon] SetPageMode';
 
 export const SETUNREADNOTIFICATIONS = '[AppCommon] SetUnreadNotifications';
 
+export const SWITCHLANGUAGE = '[AppCommon] SwitchLanguage';
+
+export const SETSETTINGMENUBACKGROUNDCOLOR = '[AppCommon] SetSettingMenuBackgroundColor';
+
+
 export class InitUser implements Action {
   readonly type = INITUSER;
 
@@ -371,6 +376,17 @@ export class SetUnreadNotifications implements Action {
 
 }
   
+export class SwitchLanguage implements Action {
+  readonly type = SWITCHLANGUAGE;
+
+  constructor(public locale:string) { }
+}
+
+export class SetSettingMenuBackgroundColor implements Action {
+  readonly type = SETSETTINGMENUBACKGROUNDCOLOR;
+
+  constructor(public color:string) { }
+}
 
 export type Actions = OpenModal
   | InitRoot
@@ -418,6 +434,8 @@ export type Actions = OpenModal
   | ToggleHelpMenu
   | ToggleSettingMenu
   | NotificationEvent
-  | SetUnreadNotifications;
+  | SetUnreadNotifications
+  | SwitchLanguage
+  | SetSettingMenuBackgroundColor;
 
 

projects/common/src/fm/common-service.module.ts

@@ -13,6 +13,7 @@ import { SchemaService } from './services/schema.service';
 import { FolderService } from './services/folder.service';
 import { TimespanService } from './services/timespan.service';
 import { ItemService } from './services/item.service';
+import { TaskService } from './services/task.service';
 import { AdminService } from './services/admin.service';
 import { EventService } from './services/event.service';
 import { TypeaheadService } from './services/typeahead.service';
@@ -44,6 +45,7 @@ export {
   ItemTypeService,
   TimespanService,
   ItemService,
+  TaskService,
   AdminService,
   EventService,
   TypeaheadService,

projects/common/src/fm/components/app/app.component.html

@@ -33,7 +33,7 @@
     <fm-resumable-file-upload></fm-resumable-file-upload>
   </ng-container>  
   <div class="user-menu apponly">
-    <fm-setting-menu [user]="user|async" [showMenu]="settingMenuVisible|async"></fm-setting-menu>
+    <fm-setting-menu [user]="user|async" [showMenu]="settingMenuVisible|async" [backgroundColor]="settingMenuBackgroundColor|async"></fm-setting-menu>
     <fm-help-menu [user]="user|async" [showMenu]="helpMenuVisible|async"></fm-help-menu>
     <fm-notification-menu [user]="user|async" [unread]="unreadNotifications|async" [showMenu]="notificationMenuVisible|async"></fm-notification-menu>
     <fm-app-menu [user]="user|async" [showMenu]="appMenuVisible|async"></fm-app-menu>

projects/common/src/fm/components/app/app.component.ts

@@ -50,6 +50,7 @@ export class AppComponent implements OnInit, OnDestroy {
   public unreadNotifications: Observable<number> = this.store$.select(appReducers.SelectgetUnreadNotifications);
   public user: Observable<IUser> = this.store$.select(appReducers.SelectGetUser);
   public isPageMode: Observable<boolean> = this.store$.select(appReducers.SelectGetIsPageMode);
+  public settingMenuBackgroundColor: Observable<string> = this.store$.select(appReducers.SelectGetSettingMenuBackgroundColor);
   @Input() showUploadProgress = true;
 
   constructor(

projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.html

@@ -11,7 +11,7 @@
         <i class="fal fa-image"></i>
         <div i18n>No image selected</div>
       </div>
-      <image-cropper #imageCropper
+      <image-cropper #imageCropper output="base64" 
       [imageChangedEvent]="imageChangedEvent"
       [maintainAspectRatio]="true"
       [format]="imageType"

projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss

@@ -4,6 +4,7 @@ div.resumable-file-upload {
   bottom: 0px;
   width: 300px;
   max-height: 250px;
+  z-index: 1;
   /*z-index:2000 !important;*/
 }
 

projects/common/src/fm/components/setting-menu/setting-menu.component.html

@@ -1,5 +1,5 @@
 <div>
-    <div (click)="toggle($event)" class="rounded-circle menu-button hidden"  [ngClass]="{'hidden':!user || noContent}">
+    <div (click)="toggle($event)" class="rounded-circle menu-button hidden" [style.background-color]="backgroundColor" [ngClass]="{'hidden':!user || noContent}">
         <span i18n-title title="Settings"><i class="fas fa-gear" aria-hidden="true"></i></span>
         <div class="menu hidden" [ngClass]="{'hidden':!showMenu}">                                     
             <router-outlet name="setting-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()"></router-outlet>            

projects/common/src/fm/components/setting-menu/setting-menu.component.ts

@@ -15,6 +15,7 @@ export class SettingMenuComponent implements OnInit {
   
   @Input() user:IUser;
   @Input() showMenu:boolean;
+  @Input() backgroundColor:string;
   public noContent = true;
 
   constructor(private store: Store<appReducers.State>) { }

projects/common/src/fm/effects/app-common.effects.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, Inject, LOCALE_ID } from '@angular/core';
 import { Router } from '@angular/router';
 import { OAuthService,UserInfo } from 'angular-oauth2-oidc';
 import { Store } from '@ngrx/store';
@@ -16,6 +16,7 @@ import {StateSerializerService} from '../services/state-serializer.service';
 
 @Injectable()
 export class AppCommonEffects {
+  locale: string;
 
   login$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.LOGIN),
@@ -47,11 +48,27 @@ export class AppCommonEffects {
     first(),
     switchMap((action) => {
         return zip(this.userService$.getCurrentUser(),from(this.oauthService$.loadUserProfile())).pipe(
-        switchMap(([user,userInfo]) => {return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))} ),
+        switchMap(([user,userInfo]) => {
+          if (location.hostname === 'localhost' || user.language === undefined || user.language === this.locale) 
+          {
+            return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))
+          }
+          return of(new appCommonActions.SwitchLanguage(user.language))
+        }),
         catchError(error => of(new appCommonActions.Fail(error))))
     }
   )));
 
+  switchLanguage$ = createEffect(() => this.actions$.pipe(
+    ofType(appCommonActions.SWITCHLANGUAGE),
+    switchMap((action) => {
+      const a = action as appCommonActions.SwitchLanguage;
+      if (location.href.includes(`/${this.locale}/`)) {
+        const newPath = location.href.replace(`/${this.locale}/`, `/${a.locale}/`);
+        location.replace(newPath);
+      }
+      return of(undefined);
+    })),{ dispatch:false});
 
   initUserPackages$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.INITUSERPACKAGES),
@@ -208,7 +225,8 @@ export class AppCommonEffects {
 
 
 
-  constructor(private actions$: Actions, private store$: Store<appCommonReducers.State>, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService) {
+  constructor(private actions$: Actions, private store$: Store<appCommonReducers.State>, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService, @Inject(LOCALE_ID) locale: string) {
+    this.locale = locale;
     store$.dispatch(new appCommonActions.LoadItemTypes());
   }
 }

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/models/itemTask.ts

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

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

@@ -29,7 +29,8 @@ export interface State {
   settingMenuVisible: boolean,
   unreadNotifications: number,
   isOnline: boolean,
-  isPageMode:boolean
+  isPageMode:boolean,
+  settingMenuBackgroundColor:string
 }
 
 export const initialState: State = {
@@ -51,7 +52,8 @@ export const initialState: State = {
   settingMenuVisible: false,
   unreadNotifications: 0,
   isOnline: true,
-  isPageMode: true
+  isPageMode: true,
+  settingMenuBackgroundColor:'rgb(128, 128, 128)'
 }
 
 export function reducer(state = initialState, action: appCommonActions.Actions ): State {
@@ -187,6 +189,10 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
       const a = action as appCommonActions.SetUnreadNotifications;
       return tassign(state,{unreadNotifications:a.unread});
     }
+    case appCommonActions.SETSETTINGMENUBACKGROUNDCOLOR: {
+      const a = action as appCommonActions.SetSettingMenuBackgroundColor;
+      return tassign(state,{settingMenuBackgroundColor:a.color});
+    }    
     default: {
       return state;
     }
@@ -212,6 +218,7 @@ export const getSettingMenuVisible = (state: State) => state.settingMenuVisible;
 export const getUnreadNotifications = (state: State) => state.unreadNotifications;
 export const getIsOnline = (state: State) => state.isOnline;
 export const getIsPageMode = (state: State) => state.isPageMode;
+export const getSettingMenuBackgroundColor = (state: State) => state.settingMenuBackgroundColor;
 
 export const selectAppCommonState = createFeatureSelector<State>(MODULE_NAME);
 
@@ -238,5 +245,4 @@ export const SelectgetUnreadNotifications = createSelector(selectAppCommonState,
 
 export const SelectGetIsOnline = createSelector(selectAppCommonState,getIsOnline);
 export const SelectGetIsPageMode = createSelector(selectAppCommonState,getIsPageMode);
-
-
+export const SelectGetSettingMenuBackgroundColor= createSelector(selectAppCommonState,getSettingMenuBackgroundColor);

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

@@ -52,4 +52,20 @@ export class AdminService {
   postItemTask(item: IItem, task: IItemTask): Observable<IItemTask> {
     return this.httpClient.post<IItemTask>(`${this.ApiEndpoint()}/api/v1/admin/${item.code}/tasks`, task);
   }
+
+  getFileStorageOverview(): Observable<any> {
+    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/overview`);
+  }
+
+  getFileStorageInfo(user: string): Observable<any> {
+    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/${user}`);
+  }
+
+  getFileStorageLog(): Observable<any> {
+    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/log`);
+  }
+
+  validateEmail(user: IUser) {
+    return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/admin/user/${user.code}/validateemail`, user);
+  }
 }

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

@@ -1,14 +1,12 @@
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { IItemType } from '../models/item.type';
-import { IItemLinkType } from '../models/itemlink.type';
-import { IUrlType } from '../models/url.type';
-import { IItem } from '../models/item';
-import { IJsonline } from '../models/json-line';
-import { IItemTask } from '../models/itemTask';
-import { HttpClient, HttpParams, HttpHeaders } from "@angular/common/http";
-import { AppConfig } from "../shared/app.config";
+import {Injectable} from '@angular/core';
+import {Observable} from 'rxjs';
+import {IItemType} from '../models/item.type';
+import {IItemLinkType} from '../models/itemlink.type';
+import {IItem} from '../models/item';
+import {IJsonline} from '../models/json-line';
+import {IItemTask} from '../models/itemTask';
+import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http';
+import {AppConfig} from '../shared/app.config';
 import {ItemTypeService} from './itemtype.service';
 import {IListItem} from '../models/list.item';
 
@@ -81,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));
@@ -98,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 });
   }
 
@@ -116,7 +116,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): Observable<IItem[]> {
+                   exactMatchStartOrEndDate?: boolean, owner?:string, indexed?: boolean): Observable<IItem[]> {
     let params = new HttpParams();
     if(itemType != null) {
       params = params.append("it", itemType);
@@ -133,11 +133,13 @@ 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");
     return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params });
   }
 
   getChildItemListCount(parentcode: string, itemType?: string,dataFilter?: any,
-                        startDate?: Date, endDate?: Date, exactMatchStartOrEndDate?: boolean, owner?:string): Observable<number> {
+                        startDate?: Date, endDate?: Date, exactMatchStartOrEndDate?: boolean, owner?:string,
+                        indexed?: boolean): Observable<number> {
     let params = new HttpParams();
     if(itemType != null) {
       params = params.append("it", itemType);
@@ -149,6 +151,7 @@ export class ItemService {
     if (endDate) params = params.append("eDate", endDate.toISOString());
     if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate);
     if(owner) params = params.append("owner", owner);
+    if(indexed) params = params.append("ind",indexed?"true":"false");
     return this.httpClient.get<number>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children/count`, { params: params });
   }
 

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

@@ -0,0 +1,40 @@
+import {Injectable} from '@angular/core';
+import {HttpClient, HttpParams} from '@angular/common/http';
+import {AppConfig} from '../shared/app.config';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class TaskService {
+  constructor(public httpClient: HttpClient, public appConfig: AppConfig) {
+  }
+
+  ApiEndpoint() {
+    return this.appConfig.getConfig("apiEndPoint");
+  }
+
+  getTask(taskCode: string) {
+    return this.httpClient.get<any>(`${this.appConfig.getConfig('apiEndPoint')}/api/v1/tasks/${taskCode}`)
+  }
+
+  getTasks(workflowCode: string, itemCode: string = null, taskType: string = null, skip = 0, take = 25) {
+    let params = new HttpParams();
+
+    if (workflowCode) {
+      params = params.append('workflowCode', workflowCode);
+    }
+
+    if (itemCode) {
+      params = params.append('itemCode', itemCode);
+    }
+
+    if (taskType) {
+      params = params.append('taskType', taskType);
+    }
+
+    params = params.append('skip', skip.toString());
+    params = params.append('take', take.toString());
+    return this.httpClient.get<any>(`${this.appConfig.getConfig('apiEndPoint')}/api/v1/tasks`,
+      {params: params})
+  }
+}

projects/ng-openlayers/package.json

@@ -31,8 +31,8 @@
     "tslib": "^2.3.0"
   },
   "peerDependencies": {
-    "@angular/common": "^18.2.3",
-    "@angular/core": "^18.2.3",
+    "@angular/common": "18.2.3",
+    "@angular/core": "18.2.3",
     "ol": "^8.2.0"
   }
 }