Update packages

This reverts commit 7f62a74877.

.gitignore

@@ -33,6 +33,7 @@ speed-measure-plugin.json
 .history/*
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

angular.json

@@ -148,18 +148,6 @@
               "src/assets"
             ]
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "src/tsconfig.app.json",
-              "src/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -179,15 +167,6 @@
               "devServerTarget": "farmmaps-lib-app:serve:production"
             }
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": "e2e/tsconfig.e2e.json",
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -216,18 +195,6 @@
             "tsConfig": "projects/common/tsconfig.spec.json",
             "karmaConfig": "projects/common/karma.conf.js"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "projects/common/tsconfig.lib.json",
-              "projects/common/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -256,18 +223,6 @@
             "tsConfig": "projects/common-map/tsconfig.spec.json",
             "karmaConfig": "projects/common-map/karma.conf.js"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "projects/common-map/tsconfig.lib.json",
-              "projects/common-map/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     },
@@ -296,21 +251,11 @@
             "tsConfig": "projects/common-map3d/tsconfig.spec.json",
             "karmaConfig": "projects/common-map3d/karma.conf.js"
           }
-        },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "projects/common-map3d/tsconfig.lib.json",
-              "projects/common-map3d/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
         }
       }
     }
   },
-  "defaultProject": "farmmaps-lib-app"
+  "cli": {
+    "analytics": false
+  }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "2.0.3",
+  "version": "3.0.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -11,64 +11,65 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~12.2.8",
+    "@angular/animations": "^14.1.3",
-    "@angular/common": "~12.2.8",
+    "@angular/common": "^14.1.3",
-    "@angular/compiler": "~12.2.8",
+    "@angular/compiler": "^14.1.3",
-    "@angular/core": "~12.2.8",
+    "@angular/core": "^14.1.3",
-    "@angular/forms": "~12.2.8",
+    "@angular/forms": "^14.1.3",
-    "@angular/platform-browser": "~12.2.8",
+    "@angular/platform-browser": "^14.1.3",
-    "@angular/platform-browser-dynamic": "~12.2.8",
+    "@angular/platform-browser-dynamic": "^14.1.3",
-    "@angular/router": "~12.2.8",
+    "@angular/router": "^14.1.3",
     "@farmmaps/common": "file:dist/common",
     "@farmmaps/common-map": "file:dist/common-map",
     "@farmmaps/common-map3d": "file:dist/common-map3d",
     "@microsoft/signalr": "^3.1.16",
-    "@ng-bootstrap/ng-bootstrap": "^9.0",
+    "@ng-bootstrap/ng-bootstrap": "^13.0.0",
-    "@ngrx/effects": "^12.0",
+    "@ngrx/effects": "^14",
-    "@ngrx/router-store": "^12.0",
+    "@ngrx/router-store": "^14",
-    "@ngrx/store": "^12.0",
+    "@ngrx/store": "^14",
-    "angular-oauth2-oidc": "^12.0",
+    "@popperjs/core": "^2.11.6",
+    "angular-oauth2-oidc": "^13",
     "bootstrap": "^4.6.0",
     "cesium": "^1.82.1",
     "core-js": "^2.6.12",
-    "moment": "^2.29.1",
+    "moment": "^2.29.4",
-    "ngrx-store-localstorage": "^12.0",
+    "ngrx-store-localstorage": "^14",
     "ngx-avatar": "^4.1.0",
     "ngx-clipboard": "^14.0.1",
     "ngx-image-cropper": "^3.3.5",
     "ngx-openlayers": "1.0.0-next.19",
-    "ngx-uploadx": "^3.5.1",
+    "ngx-uploadx": "^5.2.0",
     "ol": "6.8.1",
     "ol-cesium": "^2.13.0",
     "resumablejs": "^1.1.0",
     "rxjs": "^6.6.7",
     "tassign": "^1.0.0",
-    "tslib": "^2.2.0",
+    "tslib": "^2.4.0",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "^12.1.3",
+    "@angular-builders/custom-webpack": "^14",
-    "@angular-devkit/build-angular": "^12.2.8",
+    "@angular-devkit/build-angular": "^14.1.3",
-    "@angular/cli": "^12.2.8",
+    "@angular/cli": "^14.1.3",
-    "@angular/compiler-cli": "~12.2.8",
+    "@angular/compiler-cli": "^14.1.3",
-    "@angular/language-service": "~12.2.8",
+    "@angular/language-service": "^14.1.3",
-    "@angular/localize": "^12.2.8",
+    "@angular/localize": "^14.1.3",
     "@types/arcgis-rest-api": "^10.4.5",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "^2.0.9",
     "@types/node": "^12.20.15",
-    "codelyzer": "^5.1.2",
+    "codelyzer": "^0.0.28",
-    "jasmine-core": "~3.5.0",
+    "jasmine-core": "^4.3.0",
-    "jasmine-spec-reporter": "~5.0.0",
+    "jasmine-spec-reporter": "^7.0.0",
-    "karma": "~6.3.3",
+    "karma": "^6.3.20",
     "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma-coverage-istanbul-reporter": "^3.0.3",
-    "karma-jasmine": "~4.0.0",
+    "karma-jasmine": "^5.1.0",
-    "karma-jasmine-html-reporter": "^1.6.0",
+    "karma-jasmine-html-reporter": "^2.0.0",
-    "ng-packagr": "^12.2.2",
+    "ng-packagr": "^14.1.0",
     "protractor": "~7.0.0",
     "ts-node": "^8.8.1",
     "tslint": "~6.1.0",
-    "typescript": "~4.3.5"
+    "typescript": "~4.6.4"
   }
 }

projects/common-map/package.json

@@ -8,14 +8,14 @@
     "tslib": "^2.0.0"
   },
   "peerDependencies": {
-    "@angular/core": "~12.2.8",
+    "@angular/core": ">=14.0.0",
-    "ngrx-store-localstorage": "^12.0",
+    "ngrx-store-localstorage": ">=14.0.0",
-    "@ngrx/effects": "^12.0",
+    "@ngrx/effects": ">=14.0.0",
-    "@ngrx/router-store":"^12.0",
+    "@ngrx/router-store":">=14.0.0",
-    "@ngrx/store":"^12.0",
+    "@ngrx/store":">=14.0.0",
-    "tassign": "^1.0.0",
+    "tassign": ">=1.0.0",
-    "@farmmaps/common": "~2.0",
+    "@farmmaps/common": ">=2.0.0",
-    "ngx-openlayers": "1.0.0-next.19",
+    "ngx-openlayers": ">=1.0.0-next.19",
-    "ol": "6.8.1"
+    "ol": ">=6.8.1"
   }
 }

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

@@ -54,6 +54,8 @@ export const SETLAYERVALUESLOCATION = '[Map] SetLayerValuesLocation'
 export const TOGGLELAYERVALUESENABLED = '[Map] ToggleLayerValuesEnabled'
 export const GETLAYERVALUE = '[Map] GetLayerValue'
 export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess'
+export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
+
 
 export class Clear implements Action {
   readonly type = CLEAR;
@@ -316,6 +318,11 @@ export class GetLayerValueSuccess implements Action {
   constructor(public layervalue:ILayervalue) { }
 }
 
+export class ToggleShowDataLayerSlide implements Action {
+  readonly type = TOGGLESHOWDATALAYERSLIDE;
+  constructor() {}
+}
+
 export type Actions = SetMapState
   | Init
   | Clear
@@ -359,5 +366,6 @@ export type Actions = SetMapState
   | ToggleLayerValuesEnabled
   | GetLayerValueSuccess
   | GetLayerValue
-  | SetPeriod;
+  | SetPeriod
+  | ToggleShowDataLayerSlide;
 

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

@@ -170,133 +170,118 @@ export {
 }
 
 @NgModule({
-  imports: [
+    imports: [
-    CommonModule,
+        CommonModule,
-    AngularOpenlayersModule,
+        AngularOpenlayersModule,
-    MapRoutingModule,
+        MapRoutingModule,
-    StoreModule.forFeature(MODULE_NAME, mapReducers.reducer,{metaReducers:metaReducers}),
+        StoreModule.forFeature(MODULE_NAME, mapReducers.reducer, { metaReducers: metaReducers }),
-    EffectsModule.forFeature([mapEffects.MapEffects]),
+        EffectsModule.forFeature([mapEffects.MapEffects]),
-    NgbModule,
+        NgbModule,
-    FormsModule,
+        FormsModule,
-    ReactiveFormsModule,
+        ReactiveFormsModule,
-    AppCommonModule
+        AppCommonModule
-  ],
+    ],
-  declarations: [
+    declarations: [
-    ZoomToExtentComponent,
+        ZoomToExtentComponent,
-    ItemVectorSourceComponent,
+        ItemVectorSourceComponent,
-    ItemLayersComponent,
+        ItemLayersComponent,
-    FileDropTargetComponent,
+        FileDropTargetComponent,
-    MapComponent,
+        MapComponent,
-    MetaDataModalComponent,
+        MetaDataModalComponent,
-    RotationResetComponent,
+        RotationResetComponent,
-    MapSearchComponent,
+        MapSearchComponent,
-    SelectPeriodModalComponent,
+        SelectPeriodModalComponent,
-    LayerListComponent,
+        LayerListComponent,
-    LegendComponent,
+        LegendComponent,
-    LayerVectorImageComponent,
+        LayerVectorImageComponent,
-    FeatureListComponent,
+        FeatureListComponent,
-    WidgetHostDirective,
+        WidgetHostDirective,
-    FeatureListContainerComponent,
+        FeatureListContainerComponent,
-    FeatureListCroppingschemeComponent,
+        FeatureListCroppingschemeComponent,
-    FeatureListCropfieldComponent,
+        FeatureListCropfieldComponent,
-    FeatureListFeatureContainerComponent,
+        FeatureListFeatureContainerComponent,
-    FeatureListFeatureComponent,
+        FeatureListFeatureComponent,
-    FeatureListFeatureCroppingschemeComponent,
+        FeatureListFeatureCroppingschemeComponent,
-    FeatureListFeatureCropfieldComponent,
+        FeatureListFeatureCropfieldComponent,
-    SelectedItemContainerComponent,
+        SelectedItemContainerComponent,
-    SelectedItemComponent,
+        SelectedItemComponent,
-    SelectedItemCropfieldComponent,
+        SelectedItemCropfieldComponent,
-    SelectedItemGeotiffComponent,
+        SelectedItemGeotiffComponent,
-    SelectedItemTemporalComponent,
+        SelectedItemTemporalComponent,
-    SelectedItemShapeComponent,
+        SelectedItemShapeComponent,
-    ItemListItemComponent,
+        ItemListItemComponent,
-    ItemListItemContainerComponent,
+        ItemListItemContainerComponent,
-    ItemListComponent,
+        ItemListComponent,
-    ItemWidgetListComponent,
+        ItemWidgetListComponent,
-    WidgetStatusComponent,
+        WidgetStatusComponent,
-    GpsLocation,
+        GpsLocation,
-    PanToLocation,
+        PanToLocation,
-    LayerSwitcher,
+        LayerSwitcher,
-    HistogramDetailsComponent,
+        HistogramDetailsComponent,
-    StatisticsDetailsComponent,
+        StatisticsDetailsComponent,
-    ifZoomToShowDirective,
+        ifZoomToShowDirective,
-    ZoomToShowAlert,
+        ZoomToShowAlert,
-    LayerValuesComponent,
+        LayerValuesComponent,
-    GeometryThumbnailComponent
+        GeometryThumbnailComponent
-  ],
+    ],
-  entryComponents: [
+    exports: [
-    FeatureListComponent,
+        ItemVectorSourceComponent,
-    FeatureListCroppingschemeComponent,
+        ItemLayersComponent,
-    FeatureListCropfieldComponent,
+        FileDropTargetComponent,
-    FeatureListFeatureComponent,
+        MetaDataModalComponent,
-    FeatureListFeatureCroppingschemeComponent,
+        MapComponent,
-    FeatureListFeatureCropfieldComponent,
+        GpsLocation,
-    SelectedItemComponent,
+        PanToLocation,
-    SelectedItemCropfieldComponent,
+        LayerSwitcher,
-    SelectedItemGeotiffComponent,
+        FeatureListFeatureComponent,
-    SelectedItemTemporalComponent,
+        FeatureListFeatureCropfieldComponent,
-    SelectedItemShapeComponent,
+        FeatureListFeatureCroppingschemeComponent,
-    ItemListComponent,
+        SelectedItemContainerComponent,
-    ItemListItemComponent,
+        SelectedItemComponent,
-  ],
+        SelectedItemCropfieldComponent,
-  exports: [
+        SelectedItemGeotiffComponent,
-       ItemVectorSourceComponent,
+        SelectedItemTemporalComponent,
-       ItemLayersComponent,
+        SelectedItemShapeComponent,
-       FileDropTargetComponent,
+        ItemListItemComponent,
-       MetaDataModalComponent,
+        ItemListItemContainerComponent,
-       MapComponent,
+        ItemListComponent,
-       GpsLocation,
+        ItemWidgetListComponent,
-       PanToLocation,
+        WidgetStatusComponent,
-       LayerSwitcher,
+        RotationResetComponent,
-       FeatureListFeatureComponent,
+        MapSearchComponent,
-       FeatureListFeatureCropfieldComponent,
+        SelectPeriodModalComponent,
-       FeatureListFeatureCroppingschemeComponent,
+        LayerListComponent,
-       SelectedItemContainerComponent,
+        LegendComponent,
-       SelectedItemComponent,
+        LayerVectorImageComponent,
-       SelectedItemCropfieldComponent,
+        FeatureListComponent,
-       SelectedItemGeotiffComponent,
+        WidgetHostDirective,
-       SelectedItemTemporalComponent,
+        FeatureListContainerComponent,
-       SelectedItemShapeComponent,
+        FeatureListCroppingschemeComponent,
-       ItemListItemComponent,
+        FeatureListCropfieldComponent,
-       ItemListItemContainerComponent,
+        FeatureListFeatureContainerComponent,
-       ItemListComponent,
+        ZoomToExtentComponent,
-       ItemWidgetListComponent,
+        ifZoomToShowDirective,
-       WidgetStatusComponent,
+        ZoomToShowAlert,
-       RotationResetComponent,
+        GeometryThumbnailComponent
-       MapSearchComponent,
+    ],
-       SelectPeriodModalComponent,
+    providers: [
-       LayerListComponent,
+        FeatureIconService,
-       LegendComponent,
+        GeolocationService,
-       LayerVectorImageComponent,
+        DeviceOrientationService,
-       FeatureListComponent,
+        TemporalService,
-       WidgetHostDirective,
+        { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
-       FeatureListContainerComponent,
+        { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
-       FeatureListCroppingschemeComponent,
+        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
-       FeatureListCropfieldComponent,
+        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
-       FeatureListFeatureContainerComponent,
+        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
-       ZoomToExtentComponent,
+        { provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
-       ifZoomToShowDirective,
+        { provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
-       ZoomToShowAlert,
+        { provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
-       GeometryThumbnailComponent
+        { provide: AbstractSelectedItemComponent, useClass: SelectedItemTemporalComponent, multi: true },
-  ],
+        { provide: AbstractSelectedItemComponent, useClass: SelectedItemShapeComponent, multi: true },
-  providers: [
+        { provide: AbstractItemListItemComponent, useClass: ItemListItemComponent, multi: true },
-    FeatureIconService,
+        { provide: AbstractItemListComponent, useClass: ItemListComponent, multi: true }
-    GeolocationService,
+    ]
-    DeviceOrientationService,
-    TemporalService,
-    { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
-    { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
-    { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
-    { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
-    { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
-    { provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
-    { provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
-    { provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
-    { provide: AbstractSelectedItemComponent, useClass: SelectedItemTemporalComponent, multi: true },
-    { provide: AbstractSelectedItemComponent, useClass: SelectedItemShapeComponent, multi: true },
-    { provide: AbstractItemListItemComponent, useClass: ItemListItemComponent, multi: true },
-    { provide: AbstractItemListComponent, useClass: ItemListComponent, multi: true }
-  ]
 })
 
 

projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts

@@ -17,7 +17,7 @@ import VectorTileSource from 'ol/source/VectorTile';
 import VectorTileLayer from 'ol/layer/VectorTile';
 import {GeoJSON,MVT} from 'ol/format';
 import { Geometry } from 'ol/geom';
-import TileSource from 'ol/source/Tile';
+import BaseLayer from 'ol/layer/Base';
 
 @Component({
   selector: 'fm-map-item-layers',
@@ -32,9 +32,11 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
   @Input() itemLayer: IItemLayer;
   @Output() onFeatureSelected: EventEmitter<any> = new EventEmitter<any>();
   @Output() onFeatureHover: EventEmitter<any> = new EventEmitter<any>();
+  @Output() onPrerender: EventEmitter<any> = new EventEmitter<any>();
   private _apiEndPoint: string;
   private initialized:boolean = false;
   private mapEventHandlerInstalled = false;
+  private topLayerPrerenderEventhandlerInstalled = false;
   private selectedFeatures = {};
   private selectionLayer:Layer<Source> = null;
   
@@ -362,6 +364,30 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     }
   }
 
+  installTopLayerPrerenderEventhandler(olLayer : Layer<Source>) {
+    if(!this.topLayerPrerenderEventhandlerInstalled  && this.onPrerender.observers.length > 0  && olLayer) {
+      if(this.instance.getVisible()) {
+        olLayer.on('prerender',this.topLayerPrerenderEventhandler);
+        olLayer.on('postrender',this.topLayerPostrenderEventhandler);
+        this.topLayerPrerenderEventhandlerInstalled = true;
+      }
+    }
+  }
+
+  unInstallTopLayerPrerenderEventhandler() {
+    if(this.topLayerPrerenderEventhandlerInstalled && this.onPrerender.observers.length > 0 )
+    {
+      if(this.instance.getVisible()) {
+        var olLayers = this.instance.getLayers().getArray().forEach((l:any) => {
+          l.un('prerender',this.topLayerPrerenderEventhandler);
+          l.un('postrender',this.topLayerPostrenderEventhandler);
+        });
+        this.topLayerPrerenderEventhandlerInstalled = false;
+      }
+    }
+  }
+
+
   addOrUpdateOlLayer(itemLayer:IItemLayer,index:number):Layer<Source> {
     if(!itemLayer) return null;
     var olLayers = this.instance.getLayers();
@@ -386,10 +412,19 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     return layer;
   }
 
-  updateLayers(itemLayers: IItemLayer[]) {
+  updateLayers(itemLayers: IItemLayer[] | IItemLayer) {
+    this.unInstallTopLayerPrerenderEventhandler();
+    let dataLayer = false;
+    var ils:IItemLayer[] = [];
+    if(Array.isArray(itemLayers)) {
+       ils = itemLayers;
+    } else {
+      dataLayer=true;
+       ils=[itemLayers];
+    }
     let newLayers: Layer<Source>[] = [];
-    if (itemLayers) {
+    if (ils) {
-      itemLayers.forEach((itemLayer, index) => {
+      ils.forEach((itemLayer, index) => {
         if(itemLayer.item.itemType ==  'vnd.farmmaps.itemtype.temporal') {
           let il = itemLayer as ITemporalItemLayer;
           let previousLayer = this.addOrUpdateOlLayer(il.previousItemLayer,newLayers.length);          
@@ -398,9 +433,11 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
           if(selectedLayer) newLayers.push(selectedLayer);
           let nextLayer = this.addOrUpdateOlLayer(il.nextItemLayer,newLayers.length);
           if(nextLayer) newLayers.push(nextLayer);
+          this.installTopLayerPrerenderEventhandler(selectedLayer);
         } else {
           let layer = this.addOrUpdateOlLayer(itemLayer,newLayers.length);
           if(layer) newLayers.push(layer);    
+          this.installTopLayerPrerenderEventhandler(layer);       
         }
       });
       // Remove the layers that have disapeared from childrenLayers
@@ -409,13 +446,23 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
         olLayers.removeAt(newLayers.length);
       }
       this.selectionLayer=null;
-      if(this.mapEventHandlerInstalled && itemLayers.length==1 && this.getItemlayer(itemLayers[0]).item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
+      if(this.mapEventHandlerInstalled && ils.length==1 && this.getItemlayer(itemLayers[0]).item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
         this.selectionLayer = this.createSelectionLayer(this.getItemlayer(itemLayers[0]));
         if(this.selectionLayer) olLayers.push(this.selectionLayer)
       }
     }
   }
 
+  topLayerPrerenderEventhandler = (event) => {
+     this.onPrerender.emit(event);
+  }
+
+  topLayerPostrenderEventhandler = (event) => {
+    const ctx = event.context;
+    ctx.restore();
+  }
+
+
   mapEventHandler = (event) => {
     // select only when having observers
     if(event.type === 'click' && !this.onFeatureSelected.observers.length) return;

projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.html

@@ -20,7 +20,7 @@
           </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>
+          <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Data</span><span class="slideButton"><a href="#" title="Compare" class="btn btn-light btn-sm" (click)="handleToggleShowDatalayerSlide($event)"><i class="fal fa-sliders-h-square"></i></a></span></span>
           <div class="mb-4">
             <fm-map-layer-list [dataLayers]="true" [itemLayers]="[selectedItemLayer]" [selectedLayer]="selectedItemLayer" (onToggleVisibility)="handleOnToggleVisibility($event)" (onSetOpacity)="handleOnSetOpacity($event)" (onZoomToExtent)="handleZoomToExtent($event)" (onSelectLayer)="handleSelectOverlayLayer($event)"></fm-map-layer-list>
           </div>

projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.scss

@@ -19,6 +19,10 @@
   font-weight: bold;
 }
 
+.slideButton {
+  margin-left: 1em;
+}
+
 .layers {
   color:$secondary;
   position: absolute;

projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.ts

@@ -76,4 +76,10 @@ export class LayerSwitcher  implements OnInit,OnChanges{
   handleSelectBaseLayer(itemLayer: IItemLayer) {
     this.store.dispatch(new mapActions.SelectBaseLayer(itemLayer));
   }
+
+  handleToggleShowDatalayerSlide(event:Event) {
+    this.store.dispatch(new mapActions.ShowLayerSwitcher(false));    
+    this.store.dispatch(new mapActions.ToggleShowDataLayerSlide());
+    event.preventDefault();
+  }
 }

projects/common-map/src/fm-map/components/map/map.component.html

@@ -20,9 +20,10 @@
   compassHeading:compassHeading$|async,
   styles:styles$|async,
   selectedFeature:selectedFeature$|async,
-  fullscreen:fullscreen$|async
+  fullscreen:fullscreen$|async,
+  showDataLayerSlide:showDataLayerSlide$|async
 } as state">
-  <aol-map #map (moveEnd)="handleOnMoveEnd($event)" (click)="handleOnMouseDown($event)" (dblClick)="handleShowLayerValues($event)" [ngClass]="{'panel-visible':state.panelVisible,'fullscreen':state.fullscreen}" class="map">
+  <aol-map #map (moveEnd)="handleOnMoveEnd($event)" (click)="handleOnMouseDown($event)" (dblClick)="handleShowLayerValues($event)" [ngClass]="{'panel-visible':state.panelVisible,'fullscreen':state.fullscreen }" class="map">
     <div>
 
     </div>
@@ -34,18 +35,25 @@
     <aol-interaction-dragrotateandzoom></aol-interaction-dragrotateandzoom>
     <fm-map-item-layers [itemLayers]="state.baseLayers"></fm-map-item-layers>
     <fm-map-item-layers *ngIf="!overrideOverlayLayers" [itemLayers]="state.overlayLayers"></fm-map-item-layers>
-    <fm-map-item-layers *ngIf="!overrideSelectedItemLayer" [itemLayer]="state.selectedItemLayer"></fm-map-item-layers>
+    <fm-map-item-layers *ngIf="!overrideSelectedItemLayer" [itemLayer]="state.selectedItemLayer" (onPrerender)="handlePrerender($event)"></fm-map-item-layers>
     <aol-layer-vector>
       <fm-map-item-source-vector [styles]="state.styles" [features]="state.features" (onFeatureSelected)="handleFeatureClick($event)" (onFeatureHover)="handleFeatureHover($event)" [selectedFeature]="state.selectedFeature" [selectedItem]="state.selectedItem"></fm-map-item-source-vector>
     </aol-layer-vector>
     <router-outlet name="map-layers"></router-outlet>
     <fm-map-gps-location [position]="state.position" [headingTolerance]="20" [showHeading]="devicesService.IsMobile()" [showTolerance]="devicesService.IsMobile()" [heading]="state.compassHeading"></fm-map-gps-location>
     <fm-map-layer-values></fm-map-layer-values>
-    <div class="control-container" >
+    <div class="viewport-container" [ngStyle]="{'bottom': bottom(state.panelVisible)}">
-      <router-outlet name="map-controls"></router-outlet>
+      <div class="control-container">
-      <fm-map-layer-switcher></fm-map-layer-switcher>
+        <router-outlet name="map-controls"></router-outlet>
-      <fm-map-pan-to-location [position]="state.position" [mapState]="state.mapState" [animate]="true"></fm-map-pan-to-location>
+        <fm-map-layer-switcher></fm-map-layer-switcher>
-      <fm-map-rotation-reset></fm-map-rotation-reset>
+        <fm-map-pan-to-location [position]="state.position" [mapState]="state.mapState" [animate]="true"></fm-map-pan-to-location>
+        <fm-map-rotation-reset></fm-map-rotation-reset>
+      </div>  
+      <div class="slide-container"  [ngClass]="{'showDataLayerSlide':state.showDataLayerSlide}">
+        <form>
+          <input class="dataLayerSlide" (input)="handleSlideChange($event)" type="range" style="width: 100%" value="{{dataLayerSlideValue}}"/>
+        </form>
+      </div>
     </div>
     <fm-map-file-drop-target [parentCode]="state.parentCode" (onFileDropped)="handleFileDropped($event)"></fm-map-file-drop-target>
 
@@ -53,7 +61,8 @@
       <fm-map-map-search #mapSearch [openedModalName]="state.openedModalName" (onOpenModal)="handleOpenModal($event)" (onCloseModal)="handleCloseModal()" [ngClass]="{'menuVisible':state.menuVisible}" (onToggleMenu)="handleToggleMenu($event)" (onSearchCollapse)="handleSearchCollapse($event)" (onSearchExpand)="handleSearchExpand($event)" [collapsed]="state.searchCollapsed" [searchMinified]="state.searchMinified" (onSearch)="handleSearch($event)" (onClear)="handleClearSearch($event)" [filterOptions]="state.queryState" [clearEnabled]="state.clearEnabled" [period]="state.period" (onPeriodChange)="handlePeriodChange($event)" (onCitySearch)="handleCitySearch($event)"></fm-map-map-search>
     </div>
     <div class="side-panel-container">
-      <fm-side-panel [resizeable]="true" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false">
+      
+      <fm-side-panel [resizeable]="true" (onResize)="handlePanelResize($event)" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false">
         <div class="panel-wrapper" *ngIf="noContent">
           <div class="panel-top bg-secondary" *ngIf="!(state.searchMinified)">
           </div>

projects/common-map/src/fm-map/components/map/map.component.scss

@@ -1,6 +1,6 @@
 @import "~bootstrap/scss/bootstrap.scss";
 
-aol-map { position:absolute;width:100%;height:calc(100vh + 4rem);}
+aol-map { position:absolute;width:100%;height:calc( 100vh );}
 
 .arrow {
   top: 3rem;
@@ -45,29 +45,39 @@ aol-map { position:absolute;width:100%;height:calc(100vh + 4rem);}
   text-overflow:ellipsis;
 }
 
-
+.viewport-container {
-.control-container {
   position: absolute;
-  right: 1em;
+  left:0;
-  bottom: 8.1em;
+  right:0;
+  bottom:0;
+  margin-bottom:4em;
+  pointer-events: none;
 }
 
-.fullscreen .control-container {
+
-  bottom: 5em;
+.control-container {
+  float:right;
+  margin-right: 1em;
+  pointer-events: all;
+}
+
+.fullscreen .viewport-container {
+  margin-bottom: 1em;
 }
 
 .side-panel-container {
   position: absolute;
   top:0em;
-  bottom: 7.1em;
+  bottom: 3em;
   width: 100%;
   pointer-events: none;
 }
 
 .fullscreen .side-panel-container {
-  bottom: 4em;
+  bottom:0;
 }
 
+
 switch2d3d {
   position: absolute;
   right: 1em;
@@ -115,6 +125,21 @@ div.header button {
   max-height: 2.5em;
 }
 
+.slide-container {
+  display: none;
+  pointer-events: all;
+  width: 100%;
+  overflow: hidden;
+}
+
+.dataLayerSlide {
+  width:100%
+}
+
+.slide-container.showDataLayerSlide {
+  display: block;
+}
+
 timespan {
   position: absolute;
   transition: left 0.5s;

projects/common-map/src/fm-map/components/map/map.component.ts

@@ -5,7 +5,7 @@ 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 { proj,Map } from 'openlayers';
+import {getRenderPixel} from 'ol/render';
 
 // Map
 import * as mapReducers from '../../reducers/map.reducer';
@@ -76,6 +76,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   public clearEnabled$: Observable<boolean> = this.store.select(mapReducers.selectGetClearEnabled);
   public searchCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetSearchCollapsed);
   public searchMinified$: Observable<boolean> = this.store.select(mapReducers.selectGetSearchMinified);
+  public showDataLayerSlide$: Observable<boolean> = this.store.select(mapReducers.selectGetShowdataLayerSlide);
   public menuVisible$: Observable<boolean>;
   public query$: Observable<IQuery> =  this.store.select(mapReducers.selectGetQuery);
   public position$: Observable<GeolocationPosition> = this.geolocationService.getCurrentPosition();
@@ -90,6 +91,9 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   public noContent: boolean = false;
   public overrideSelectedItemLayer: boolean = false;
   public overrideOverlayLayers: boolean = false;
+  public dataLayerSlideValue:number = 50;
+  public dataLayerSlideEnabled = false;
+  private visibleAreaBottom = 0;
   
   @ViewChild('map') map;
   @ViewChild('contentDiv') contentDiv: ElementRef;
@@ -155,6 +159,25 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     }
   }
 
+  handlePanelResize(resizeTop:number) {
+    if(resizeTop==100 || !this.devicesService.IsMobile() ) {
+      this.visibleAreaBottom=0;
+    } else {
+      this.visibleAreaBottom=100-resizeTop;
+      if(this.visibleAreaBottom>60) {
+        this.visibleAreaBottom=60;
+      }
+    }      
+  }
+
+  bottom(panelVisible:boolean) {
+    if(panelVisible) {
+      return this.visibleAreaBottom + '%';     
+    } else {
+      return "0%";
+    }
+  }
+
   handleOpenModal(modalName: string) {
     this.store.dispatch(new  commonActions.OpenModal(modalName));
   }
@@ -191,6 +214,31 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     }
   }
 
+  handlePrerender(event:any) {
+    if(!this.dataLayerSlideEnabled) return;
+    const ctx = event.context;
+    const mapSize = this.map.instance.getSize();
+    const width = mapSize[0] * (this.dataLayerSlideValue / 100);
+    const tl = getRenderPixel(event, [width, 0]);
+    const tr = getRenderPixel(event, [mapSize[0], 0]);
+    const bl = getRenderPixel(event, [width, mapSize[1]]);
+    const br = getRenderPixel(event, mapSize);
+
+    ctx.save();
+    ctx.beginPath();
+    ctx.moveTo(tl[0], tl[1]);
+    ctx.lineTo(bl[0], bl[1]);
+    ctx.lineTo(br[0], br[1]);
+    ctx.lineTo(tr[0], tr[1]);
+    ctx.closePath();
+    ctx.clip();
+  }
+
+  handleSlideChange(event:any) {
+     this.dataLayerSlideValue = event.target.value;
+     this.map.instance.render();
+  }
+
   ngOnInit() {    
     this.initialized = false;
     console.debug("Init");
@@ -323,6 +371,10 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
         }
       });
     this.initialized = true;   
+    this.showDataLayerSlide$.subscribe((v) => {
+      this.dataLayerSlideEnabled=v;
+      this.map.instance.render();
+    });
   }
 
   handleSearchCollapse(event) {

projects/common-map/src/fm-map/components/meta-data-modal/meta-data-modal.component.ts

@@ -1,5 +1,5 @@
 import { Component, Output, ViewChild, EventEmitter, Input, ElementRef, HostListener } from '@angular/core';
-import { FormGroup,FormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup,UntypedFormBuilder, Validators } from '@angular/forms';
 import { IListItem } from '@farmmaps/common';
 import { IDroppedFile } from '../aol/file-drop-target/file-drop-target.component';
 import {NgbModal, NgbModalRef} from "@ng-bootstrap/ng-bootstrap";
@@ -33,9 +33,9 @@ export class MetaDataModalComponent {
   @Output() onCloseModal = new EventEmitter<any>();
   @Output() onAddFilesWithMetaData = new EventEmitter<IMetaData>();
 
-  constructor(private modalService: NgbModal, public fb: FormBuilder) { }
+  constructor(private modalService: NgbModal, public fb: UntypedFormBuilder) { }
 
-  public metaDataForm: FormGroup;
+  public metaDataForm: UntypedFormGroup;
 
   handleMetaDataEntered(event) {
     if (this.metaDataForm.valid) {

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

@@ -69,8 +69,9 @@ export interface State {
   replaceUrl:boolean,
   layerValuesX:number,
   layerValuesY:number,
-  layerValuesEnabled:boolean;
+  layerValuesEnabled:boolean,
-  layerValues: Array<ILayervalue>;
+  layerValues: Array<ILayervalue>
+  showDataLayerSlide:boolean,
 }
 
 export const initialState: State = {
@@ -113,7 +114,8 @@ export const initialState: State = {
   layerValuesX:0,
   layerValuesY:0,
   layerValuesEnabled:false,
-  layerValues:[]
+  layerValues:[],
+  showDataLayerSlide:false
 }
 
 export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State {
@@ -172,6 +174,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       return tassign(state, {
         selectedItem: null,
         selectedItemLayer: null,
+        showDataLayerSlide: false,
         features:[],
         inSearch:inSearch
       });
@@ -501,7 +504,8 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
         features: [],
         query:initialState.query,
         showLayerSwitcher: false,
-        extent: null
+        extent: null,
+        showDataLayerSlide: false
       });
     }
     case mapActions.SETSTYLE:{
@@ -514,6 +518,9 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       let a = action as mapActions.ShowLayerSwitcher;
       return tassign(state,{showLayerSwitcher:a.show});
     }
+    case mapActions.TOGGLESHOWDATALAYERSLIDE:{
+      return tassign(state,{showDataLayerSlide:!state.showDataLayerSlide});
+    }
     case mapActions.SETREPLACEURL: {
       let a= action as mapActions.SetReplaceUrl;
       return tassign(state,{replaceUrl:a.replaceUrl});
@@ -537,6 +544,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
          return tassign(state,{  
           selectedItem: null,
           selectedItemLayer: null,
+          showDataLayerSlide: false,
           features:[]
          });
       }
@@ -584,6 +592,7 @@ export const getSelectedItemLayer = (state: State) => state.selectedItemLayer;
 export const getPeriod = (state:State) => state.period;
 export const getStyles = (state:State) => state.styles;
 export const getShowLayerSwitcher = (state:State) => state.showLayerSwitcher;
+export const getShowDataLayerSlide = (state:State) => state.showDataLayerSlide;
 export const getInSearch = (state:State) => state.inSearch;
 export const getState = (state:State) => {return {mapState:state.mapState,queryState:state.queryState,replaceUrl:state.replaceUrl};}
 export const getLayerValuesEnabled = (state:State) => state.layerValuesEnabled;
@@ -616,6 +625,7 @@ export const selectGetSelectedItemLayer = createSelector(selectMapState, getSele
 export const selectGetPeriod = createSelector(selectMapState, getPeriod);
 export const selectGetStyles = createSelector(selectMapState, getStyles);
 export const selectGetShowLayerSwitcher = createSelector(selectMapState,getShowLayerSwitcher);
+export const selectGetShowdataLayerSlide = createSelector(selectMapState,getShowDataLayerSlide);
 export const selectGetInSearch = createSelector(selectMapState,getInSearch);
 export const selectGetState = createSelector(selectMapState,getState);
 export const selectGetLayerValuesEnabled = createSelector(selectMapState,getLayerValuesEnabled);

projects/common-map/src/test.ts

@@ -14,7 +14,9 @@ declare const require: any;
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(), {
+    teardown: { destroyAfterEach: false }
+}
 );
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);

projects/common-map/tsconfig.lib.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2015",
+    "target": "es2020",
     "module": "es2015",
     "moduleResolution": "node",
     "declaration": true,

projects/common-map/tsconfig.lib.prod.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2015",
+    "target": "es2020",
     "module": "es2015",
     "moduleResolution": "node",
     "declaration": true,

projects/common-map3d/package.json

@@ -5,11 +5,11 @@
     "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
   },
   "peerDependencies": {
-    "@angular/common":  "~12.2.8",
+    "@angular/common":  ">=14.0.0",
-    "@angular/core":  "~12.2.8",
+    "@angular/core":  ">=14.0.0",
     "ngx-openlayers": "1.0.0-next.19",
-    "cesium": "^1.82.1",
+    "cesium": ">=1.82.1",
-    "ol-cesium": "^2.13.0"
+    "ol-cesium": ">=2.13.0"
   },
   "dependencies": {
     "tslib": "^2.0.0"

projects/common-map3d/src/test.ts

@@ -18,7 +18,9 @@ declare const require: {
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(), {
+    teardown: { destroyAfterEach: false }
+}
 );
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);

projects/common/ng-package.json

@@ -2,10 +2,7 @@
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../dist/common",
   "lib": {
-    "entryFile": "src/public-api.ts",
+    "entryFile": "src/public-api.ts"
-    "umdModuleIds": {
-      "my-data": "my-data"
-    }
   },
   "allowedNonPeerDependencies": [
     "."

projects/common/package-lock.json

@@ -1,27 +1,30 @@
 {
   "name": "@farmmaps/common",
-  "version": "0.0.1",
+  "version": "2.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
-  "dependencies": {
+  "packages": {
-    "is-retina": {
+    "": {
-      "version": "1.0.3",
+      "name": "@farmmaps/common",
-      "resolved": "https://registry.npmjs.org/is-retina/-/is-retina-1.0.3.tgz",
+      "version": "2.0.0",
-      "integrity": "sha1-10AbKGvqKuN/Ykd1iN5QTQuGR+M="
+      "peerDependencies": {
-    },
+        "@angular/common": "^14.0.0",
-    "ngx-avatar": {
+        "@angular/core": "^14.0.0",
-      "version": "4.0.0",
+        "@angular/forms": "^14",
-      "resolved": "https://registry.npmjs.org/ngx-avatar/-/ngx-avatar-4.0.0.tgz",
+        "@microsoft/signalr": "^3.1.3",
-      "integrity": "sha512-Uk40UXl26RvDy1ori9NDsGFB+f84AaxMnsIwZA6JPJK0pLcbo3F4vZTmzLZeOusOw1Qtgk5IzF630jo06keXwQ==",
+        "@ng-bootstrap/ng-bootstrap": ">=10.0.0",
-      "requires": {
+        "@ngrx/effects": "^14.0.0",
-        "is-retina": "^1.0.3",
+        "@ngrx/router-store": "^14.0.0",
-        "ts-md5": "^1.2.4"
+        "@ngrx/store": "^14.0.0",
+        "angular-oauth2-oidc": "^13",
+        "bootstrap": "^4.4.1",
+        "moment": "^2.27.0",
+        "ngx-avatar": "^4.1.0",
+        "ngx-clipboard": "^14.0.1",
+        "ngx-image-cropper": "^3.3.5",
+        "ngx-uploadx": "^5.2.0",
+        "tassign": "^1.0.0"
       }
-    },
-    "ts-md5": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.7.tgz",
-      "integrity": "sha512-emODogvKGWi1KO1l9c6YxLMBn6CEH3VrH5mVPIyOtxBG52BvV4jP3GWz6bOZCz61nLgBc3ffQYE4+EHfCD+V7w=="
     }
   }
 }

projects/common/package.json

@@ -5,21 +5,21 @@
     "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
   },
   "peerDependencies": {
-    "@ng-bootstrap/ng-bootstrap": "^7.0",
+    "@ng-bootstrap/ng-bootstrap": ">=10.0.0",
-    "@angular/common": "~12.2.8",
+    "@angular/common": ">=14.0.0",
-    "@angular/core": "~12.2.8",
+    "@angular/core": ">=14.0.0",
-    "@angular/forms": "~12.2.8",
+    "@angular/forms": ">=14.0.0",
-    "@ngrx/effects": "^12.0",
+    "@ngrx/effects": ">=14.0.0",
-    "@ngrx/router-store": "^12.0",
+    "@ngrx/router-store": ">=14.0.0",
-    "@ngrx/store": "^12.0",
+    "@ngrx/store": ">=14.0.0",
-    "tassign": "^1.0.0",
+    "tassign": ">=1.0.0",
-    "bootstrap": "^4.4.1",
+    "bootstrap": ">=4.4.1",
-    "@microsoft/signalr": "^3.1.3",
+    "@microsoft/signalr": ">=3.1.3",
-    "ngx-uploadx": "^3.3.4",
+    "ngx-uploadx": ">=5.1.0",
-    "angular-oauth2-oidc": "^12.0",
+    "angular-oauth2-oidc": ">=13.0.0",
-    "moment": "^2.27.0",
+    "moment": ">=2.27.0",
-    "ngx-avatar": "^4.0.0",
+    "ngx-avatar": ">=4.1.0",
-    "ngx-image-cropper": "^3.3.5",
+    "ngx-image-cropper": ">=3.3.5",
-    "ngx-clipboard": "^14.0.1"
+    "ngx-clipboard": ">=14.0.1"
   }
 }

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

@@ -12,6 +12,9 @@ export const INITUSERSUCCESS = '[AppCommon] InitUserSuccess';
 export const INITUSERPACKAGES = '[AppCommon] InitUserPackages';
 export const INITUSERPACKAGESSUCCESS = '[AppCommon] InitUserPackagesSuccess';
 
+export const INITPACKAGES = '[AppCommon] InitPackages';
+export const INITPACKAGESSUCCESS = '[AppCommon] InitPackagesSuccess';
+
 export const INITUSERSETTINGSROOT = '[AppCommon] InitUserSettingsRoot';
 export const INITUSERSETTINGSROOTSUCCESS = '[AppCommon] InitUserSettingsRootSuccess';
 
@@ -102,6 +105,18 @@ export class InitUserPackagesSuccess implements Action {
   constructor(public items:IItem[] ) { }
 }
 
+export class InitPackages implements Action {
+  readonly type = INITPACKAGES;
+
+  constructor() {}
+}
+
+export class InitPackagesSuccess implements Action {
+  readonly type = INITPACKAGESSUCCESS;
+
+  constructor(public items:IItem[] ) { }
+}
+
 export class InitUserSettingsRoot implements Action {
   readonly type = INITUSERSETTINGSROOT;
 
@@ -381,6 +396,8 @@ export type Actions = OpenModal
   | SetMenuVisible
   | InitUserPackages
   | InitUserPackagesSuccess
+  | InitPackages
+  | InitPackagesSuccess
   | InitUserSettingsRoot
   | InitUserSettingsRootSuccess
   | ToggleAccountMenu

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

@@ -35,6 +35,7 @@ import { PackageService } from './services/package.service';
 import { PackagePreloadStrategy } from './services/package-preload-strategy.service';
 import { SenmlService } from './services/senml-service';
 import { DeviceService } from './services/device.service';
+import { GradientService} from './services/gradient.service';
 
 export {
   FolderService,
@@ -61,7 +62,8 @@ export {
   PackageService,
   SenmlService,
   PackagePreloadStrategy,
-  DeviceService
+  DeviceService,
+  GradientService
 };
 
 @NgModule({

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

@@ -32,6 +32,7 @@ import { TimespanComponent } from './components/timespan/timespan.component';
 import { TagInputComponent } from './components/tag-input/tag-input.component';
 import { MenuBackgroundComponent } from './components/menu-background/menu-background.component';
 import { HasPackageDirective} from './components/has-package/has-package.directive';
+import { PackageExistsDirective} from './components/package-exists/package-exists.directive';
 import { HasClaimDirective} from './components/has-claim/has-claim.directive';
 import { UserMenuComponent} from './components/user-menu/user-menu.component';
 import { ThumbnailComponent } from './components/thumbnail/thumbnail.component';
@@ -82,6 +83,7 @@ export {
   UserMenuComponent,
   ThumbnailComponent,
   HasPackageDirective,
+  PackageExistsDirective,
   HasClaimDirective,
   Alert,
   IEventMessage,
@@ -144,6 +146,7 @@ export {
     SessionClearedComponent,
     MenuBackgroundComponent,
     HasPackageDirective,
+    PackageExistsDirective,
     HasClaimDirective,
     UserMenuComponent,
     GradientComponent,
@@ -174,6 +177,7 @@ export {
     SessionClearedComponent,
     MenuBackgroundComponent,
     HasPackageDirective,
+    PackageExistsDirective,
     HasClaimDirective,
     UserMenuComponent,
     GradientComponent,

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

@@ -1,6 +1,7 @@
 import { Component, Input, OnInit ,OnChanges, SimpleChanges,ChangeDetectorRef} from '@angular/core';
 import { IItem} from '../../models/item'
 import { IGradientstop } from '../../models/gradient';
+import { GradientService } from '../../common-service.module';
 
 
 
@@ -14,23 +15,12 @@ export class GradientComponent implements OnInit,OnChanges {
   @Input() gradientItem:IItem;
   public gradientStyle:any = {};
 
-  constructor(private ref: ChangeDetectorRef) { }
+  constructor(private ref: ChangeDetectorRef,private gradientService:GradientService) { }
 
   getGradientStyle(item:IItem):any {
     if(item.data && item.data.gradient) {
       let gradient = item.data.gradient as IGradientstop[];
-      let gd = '{ "background": "linear-gradient(to right,';
+      return this.gradientService.getGradientStyle(gradient);
-      for(var i=0;i<gradient.length;i++) {
-        let gs = gradient[i];
-        if(i>0) gd+=",";
-        gd += `rgba(${gs.color.red},${gs.color.green},${gs.color.blue},${gs.color.alpha/255})`;          
-        gd +=` ${gs.relativestop*100}%`
-      }
-      gradient.forEach((gs) => {
-      });
-      gd+=')"}';
-      
-      return JSON.parse(gd);
     }
   }
 
@@ -49,5 +39,4 @@ export class GradientComponent implements OnInit,OnChanges {
       }      
     }
   }
-
 }

projects/common/src/fm/components/package-exists/package-exists.directive.ts

@@ -0,0 +1,61 @@
+import {AfterViewInit, Directive, Input, OnDestroy, TemplateRef, ViewContainerRef} from '@angular/core';
+import {Subscription} from 'rxjs';
+import {PackageService} from '../../services/package.service';
+import * as appCommonReducer from '../../reducers/app-common.reducer';
+import {Store} from '@ngrx/store';
+
+@Directive({
+  selector: '[fmPackageExists]',
+})
+export class PackageExistsDirective implements OnDestroy, AfterViewInit {
+
+  @Input()
+  set fmPackageExists(packageIdentifier: string) {
+    this.packageIdentifier = packageIdentifier;
+    this.updateView();
+  }
+
+  @Input()
+  set fmPackageExistsThen(thenTemplate: TemplateRef<any>) {
+    this.thenTemplate = thenTemplate;
+    this.updateView();
+  }
+
+  @Input()
+  set fmPackageExistsElse(thenTemplate: TemplateRef<any>) {
+    this.elseTemplate = thenTemplate;
+    this.updateView();
+  }
+
+  private packageIdentifier: string;
+  private thenTemplate: TemplateRef<any>;
+  private elseTemplate: TemplateRef<any>;
+  private packSub: Subscription;
+
+  constructor(private hostTemplateRef: TemplateRef<any>, private viewContainerRef: ViewContainerRef,
+              private store: Store<appCommonReducer.State>, private packageService: PackageService) {
+    this.thenTemplate = hostTemplateRef;
+    this.packSub = this.store.select(appCommonReducer.SelectGetPackages).subscribe((_) => {
+      this.updateView();
+    });
+  }
+
+  ngAfterViewInit() {
+    this.updateView();
+  }
+
+  updateView() {
+    this.viewContainerRef.clear();
+    if (this.packageService.packageExists(this.packageIdentifier)) {
+      this.viewContainerRef.createEmbeddedView(this.thenTemplate);
+    } else if (this.elseTemplate) {
+      this.viewContainerRef.createEmbeddedView(this.elseTemplate);
+    }
+  }
+
+  ngOnDestroy() {
+    if (this.packSub) {
+      this.packSub.unsubscribe();
+    }
+  }
+}

projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.service.ts

@@ -89,7 +89,7 @@ export class ResumableFileUploadService implements OnDestroy{
   addFiles = (files: any[], event: any, metadata:any) => {
     for (let f of files) {
       var options:UploadxOptions = {metadata:metadata};
-      this.uploadService.handleFile(f,options);
+      this.uploadService.handleFiles(f,options);
     }
   }
   

projects/common/src/fm/components/side-panel/side-panel.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input,ViewChild,ElementRef,OnChanges,SimpleChanges,HostListener,ChangeDetectorRef  } from '@angular/core';
+import { Component, Input,Output,ViewChild,EventEmitter, ElementRef,OnChanges,SimpleChanges,HostListener,ChangeDetectorRef  } from '@angular/core';
 
 @Component({
   selector: 'fm-side-panel',
@@ -13,6 +13,7 @@ export class SidePanelComponent  implements OnChanges {
   @Input() public collapsable: boolean;
   @Input() public resizeable: boolean = false;
   @Input() public left: boolean = false;  
+  @Output() onResize: EventEmitter<number> = new EventEmitter<number>();
   @ViewChild("resizeGrip") elementView: ElementRef;
   public mobile:boolean = true;
   private parentHeight:number = 0;
@@ -35,6 +36,7 @@ export class SidePanelComponent  implements OnChanges {
   setTop() {
     this.mobile = this.left?false: this.checkMobile();
     this.resizeTop = this.mobile?50:0;
+    this.onResize.emit(this.resizeTop);
     this.top =  (this.visible?this.resizeTop: (this.mobile? 100:0)) + "%";
   }
 
@@ -71,6 +73,7 @@ export class SidePanelComponent  implements OnChanges {
       clientY=(event as DragEvent).clientY;
     }
     this.resizeTop =  Math.min(98, Math.max(0, clientY / (this.parentHeight  / 100)));
+    this.onResize.emit(this.resizeTop);
     this.top =  (this.visible? this.resizeTop:(this.mobile? 100:0)) + "%";
   }
 
@@ -81,7 +84,7 @@ export class SidePanelComponent  implements OnChanges {
   }
 
   @HostListener('window:resize', ['$event'])
-  onResize(event) {
+  handleResize(event) {
     this.setTop();
   }
 }

projects/common/src/fm/components/tag-input/tag-input.component.html

@@ -1,3 +1,11 @@
 <div class="tags">
-  <span class="tag rounded bg-primary text-white" *ngFor="let tag of tags;"><span>{{tag}}</span> <i (click)="handleDeleteTag(tag)" class="fal fa-times" aria-hidden="true"></i></span><input type="text" #taginput (blur)="handleAddTag($event)" (keyup)="handleCheckAddTag($event)" [(ngModel)]="tag" [ngbTypeahead]="findTag" (selectItem)="handleSelect($event)" placeholder="New tag"/>
+  <span class="tag rounded bg-primary text-white" *ngFor="let tag of tags;"><span>{{tag}}</span> <i
+    (click)="handleDeleteTag(tag)" class="fal fa-times" aria-hidden="true"></i></span><input
+  type="text" #tagInputElement
+  (blur)="handleBlur($event, false)"
+  (keyup)="handleKeyUp($event)"
+  [(ngModel)]="tag"
+  [ngbTypeahead]="findTag"
+  (selectItem)="handleSelect($event)"
+  placeholder="New tag"/>
 </div>

projects/common/src/fm/components/tag-input/tag-input.component.ts

@@ -1,8 +1,9 @@
-import { Component, Input, forwardRef,ElementRef,ViewChild } from '@angular/core';
+import {Component, ElementRef, forwardRef, Input, ViewChild} from '@angular/core';
-import { ControlValueAccessor, NG_VALUE_ACCESSOR,NgModel } from '@angular/forms';
+import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
-import { Observable,of } from 'rxjs';
+import {Observable, of} from 'rxjs';
-import { tap,catchError,debounceTime,distinctUntilChanged,switchMap } from 'rxjs/operators'
+import {catchError, debounceTime, distinctUntilChanged, switchMap, tap} from 'rxjs/operators';
-import { TypeaheadService } from '../../services/typeahead.service';
+import {TypeaheadService} from '../../services/typeahead.service';
+import {NgbTypeahead} from '@ng-bootstrap/ng-bootstrap';
 
 @Component({
   selector: 'fm-tag-input',
@@ -17,9 +18,11 @@ import { TypeaheadService } from '../../services/typeahead.service';
   ]
 })
 
-export class TagInputComponent implements ControlValueAccessor  {
+export class TagInputComponent implements ControlValueAccessor {
-  @Input() tags: string[]
+  @Input() tags: string[] = [];
-  @ViewChild('taginput', { static: true }) tagInputElement: ElementRef;
+  @ViewChild('tagInputElement', {static: true}) tagInputElement: ElementRef;
+  @ViewChild(NgbTypeahead, {static: true}) typeahead: NgbTypeahead;
+
   public tag: string;
   searching = false;
   searchFailed = false;
@@ -28,39 +31,52 @@ export class TagInputComponent implements ControlValueAccessor  {
   }
 
   tagExists(tag) {
-    if (tag.length == 0) return true;
+    if (tag.length === 0) {
-    for (let t of this.tags) {
+      return true;
-      if (t.toLowerCase() == tag.toLowerCase()) return true;
+    }
+    for (const t of this.tags) {
+      if (t.toLowerCase() === tag.toLowerCase()) {
+        return true;
+      }
     }
     return false;
   }
 
+  addTag(tag, keepFocus = true) {
+    if (!this.tagExists(tag)) {
+      this.tags.push(tag);
+      this.propagateChange(this.tags);
+    }
+    this.tag = '';
+
+    if (keepFocus) {
+      this.tagInputElement.nativeElement.focus();
+    }
+  }
+
   handleDeleteTag(tag) {
-    let tags = [];
+    const tags = [];
-    for (let t of this.tags) {
+    for (const t of this.tags) {
-      if (t != tag) tags.push(t);
+      if (t !== tag) {
+        tags.push(t);
+      }
     }
     this.tags = tags;
     this.propagateChange(tags);
   }
 
-  handleAddTag(event) {
+  handleBlur(event, keepFocus = true) {
-    if (!this.tagExists(this.tag)) {
+    if (!this.typeahead.isPopupOpen()) {
-      this.tags.push(this.tag);
+      this.addTag(this.tag, keepFocus);
-      this.propagateChange(this.tags);
+    } else {
+      this.tag = '';
     }
-    this.tag = "";
-    this.tagInputElement.nativeElement.focus();
   }
 
-  handleCheckAddTag(event: KeyboardEvent) {
+  handleKeyUp(event: KeyboardEvent) {
-    if (event.keyCode == 188) {
+    if (event.keyCode === 188) {
-      let tag = this.tag.substr(0, this.tag.length - 1); // strip ,
+      const tag = this.tag.substr(0, this.tag.length - 1); // strip ,
-      if (!this.tagExists(tag)) {
+      this.addTag(tag);
-        this.tags.push(tag);
-        this.propagateChange(this.tags);
-      }
-      this.tag = "";
     }
   }
 
@@ -70,35 +86,37 @@ export class TagInputComponent implements ControlValueAccessor  {
       this.propagateChange(this.tags);
     }
     event.preventDefault();
-    this.tag = "";
+    this.tag = '';
   }
 
-  propagateChange = (_: any) => { };
+  propagateChange = (_: any) => {
+  };
 
   registerOnChange(fn) {
     this.propagateChange = fn;
   }
 
   findTag = (text$: Observable<string>) =>
-  text$.pipe(
+    text$.pipe(
-        debounceTime(200),
+      distinctUntilChanged(),
-        distinctUntilChanged(), 
+      debounceTime(200),
-        tap(() => this.searching = true),
+      tap(() => this.searching = true),
-        switchMap(term => term.length < 1 ? of([]) :
+      switchMap(term => term.length < 1 ? of([]) :
-           this.typeaheadService.getTagTypeaheadItems(term).pipe(
+        this.typeaheadService.getTagTypeaheadItems(term).pipe(
-            tap(() => this.searchFailed = false),
+          tap(() => this.searchFailed = false),
-            catchError(() => {
+          catchError(() => {
-                this.searchFailed = true;
+            this.searchFailed = true;
-                return of([]);
+            return of([]);
-            }))
+          }))
-         ),
+      ),
-         tap(() => this.searching = false)
+      tap(() => this.searching = false)
-  );
+    );
 
   writeValue(value: any) {
     this.tags = value;
-    this.tag = "";
+    this.tag = '';
   }
 
-  registerOnTouched() { }
+  registerOnTouched() {
+  }
 }

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

@@ -62,6 +62,15 @@ export class AppCommonEffects {
       )
     })
   ));
+  initPackages$ =  createEffect(() => this.actions$.pipe(
+    ofType(appCommonActions.INITPACKAGES),
+    switchMap(() => {
+      return this.itemService$.getItemList('vnd.farmmaps.itemtype.package.template').pipe(
+        switchMap((items) => of(new appCommonActions.InitPackagesSuccess(items))),
+        catchError(error =>  of(new appCommonActions.Fail(error)))
+      )
+    })
+  ));
 
   userPackagesChanged$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.ITEMCHANGEDEVENT),
@@ -99,7 +108,7 @@ export class AppCommonEffects {
   initUserSuccess$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.INITUSERSUCCESS),
     switchMap(() => {
-      return [new appCommonActions.InitRoot(),new appCommonActions.InitUserPackages(),new appCommonActions.InitUserSettingsRoot()];
+      return [new appCommonActions.InitRoot(),new appCommonActions.InitUserPackages(),new appCommonActions.InitPackages(),new appCommonActions.InitUserSettingsRoot()];
     }
     )));
 

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

@@ -9,3 +9,8 @@ export interface IPackage {
 export interface IPackages {
     [id: string]: IPackage[];
 }
+
+export interface IPackageMap {
+    [id: string]: IPackage;
+}
+

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

@@ -2,7 +2,7 @@ import { tassign } from 'tassign';
 import { IItemTypes} from '../models/item.types';
 import { IListItem } from '../models/list.item';
 import { IUser } from '../models/user';
-import { IPackage,IPackages} from '../models/package';
+import { IPackage,IPackageMap,IPackages} from '../models/package';
 import * as appCommonActions from '../actions/app-common.actions';
 import { createSelector, createFeatureSelector, ActionReducerMap } from '@ngrx/store';
 
@@ -20,6 +20,7 @@ export interface State {
   routeLoading:boolean,
   menuVisible: boolean,
   userPackages: IPackages,
+  packages: IPackageMap,
   userSettingsRoot: IItem,
   accountMenuVisible: boolean,
   appMenuVisible: boolean,
@@ -40,6 +41,7 @@ export const initialState: State = {
   routeLoading: false,
   menuVisible: false,
   userPackages: {},
+  packages: {},
   userSettingsRoot: null,
   accountMenuVisible: false,
   appMenuVisible: false,
@@ -140,6 +142,15 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
 
       return tassign(state,{userPackages:packages});
     }
+    case appCommonActions.INITPACKAGESSUCCESS:{
+      let a = action as appCommonActions.InitPackagesSuccess;
+      let packages = {}
+      a.items.forEach((item) => {
+        packages[item.data.id] = item.data;
+      });
+
+      return tassign(state,{packages:packages});
+    }
     case appCommonActions.INITUSERSETTINGSROOTSUCCESS:{
       let a = action as appCommonActions.InitUserSettingsRootSuccess;
       return tassign(state, { userSettingsRoot : a.item });
@@ -187,6 +198,7 @@ export const getRouteLoading = (state: State) => state.routeLoading;
 export const getMenuVisible = (state: State) => state.menuVisible;
 export const getUser = (state: State) => state.user;
 export const getUserPackages = (state: State) => state.userPackages;
+export const getPackages = (state: State) => state.packages;
 export const getUserSettingsRoot = (state: State) => state.userSettingsRoot;
 export const getAccountMenuVisible = (state: State) => state.accountMenuVisible;
 export const getAppMenuVisible = (state: State) => state.appMenuVisible;
@@ -207,6 +219,7 @@ export const selectGetRouteLoading = createSelector(selectAppCommonState, getRou
 export const SelectGetMenuVisible = createSelector(selectAppCommonState,getMenuVisible);
 export const SelectGetUser = createSelector(selectAppCommonState,getUser);
 export const SelectGetUserPackages = createSelector(selectAppCommonState,getUserPackages);
+export const SelectGetPackages = createSelector(selectAppCommonState,getPackages);
 export const SelectGetValidUserPackages = createSelector(SelectGetUserPackages, (packageMap) => {
   return getValidPackages(packageMap);
 });

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

@@ -0,0 +1,25 @@
+import { Injectable } from '@angular/core';
+import {IGradientstop } from '../models/gradient'
+
+@Injectable({
+  providedIn: 'root',
+})
+export class GradientService {
+  constructor() {
+  }
+
+  getGradientStyle(gradient:IGradientstop[],portrait:boolean = false ):any {
+      let gd = '{ "background": "linear-gradient(to ' + (portrait?'bottom':'right') +',';
+      for(var i=0;i<gradient.length;i++) {
+        let gs = gradient[i];
+        if(i>0) gd+=",";
+        gd += `rgba(${gs.color.red},${gs.color.green},${gs.color.blue},${gs.color.alpha/255})`;          
+        gd +=` ${gs.relativestop*100}%`
+      }
+      gradient.forEach((gs) => {
+      });
+      gd+=')"}';
+      
+      return JSON.parse(gd);
+    }  
+}

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

@@ -83,7 +83,8 @@ export class ItemService {
     return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/`, { params: params });
   }
 
-  getChildItemList(parentcode: string, itemType: string, dataFilter?: any, level: number = 1, deep: boolean = true): Observable<IItem[]> {
+  getChildItemList(parentcode: string, itemType: string, dataFilter?: any, level: number = 1, deep: boolean = true,
+                   startDate?: Date, endDate?: Date): Observable<IItem[]> {
     var params = new HttpParams();
     if(itemType != null) {
       params = params.append("it", itemType);
@@ -93,6 +94,8 @@ export class ItemService {
     }
     params = params.append("lvl", level.toString());
     params = params.append("deep", deep.toString());
+    if (startDate) params = params.append("sDate", startDate.toISOString());
+    if (endDate) params = params.append("eDate", endDate.toISOString());
     return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params });
   }
 

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

@@ -7,17 +7,23 @@ import {IItem} from '../models/item';
 import {IItemTask} from '../models/itemTask';
 import {HttpClient} from '@angular/common/http';
 import {AppConfig} from '../shared/app.config';
-import {Observable} from 'rxjs';
+import {Observable,iif,of} from 'rxjs';
+import {switchMap} from 'rxjs/operators';
 
 @Injectable({
   providedIn: 'root',
 })
 
 export class PackageService {
+  private userPackages: { [key: string]: IPackage } = {};
   private packages: { [key: string]: IPackage } = {};
+  private packagesObservable = this.store$.select(appCommonReducer.SelectGetPackages);
 
   constructor(private store$: Store<appCommonReducer.State>, public httpClient: HttpClient, public appConfig: AppConfig) {
     store$.select(appCommonReducer.SelectGetValidUserPackages).subscribe((packages) => {
+      this.userPackages = packages;
+    });
+    this.packagesObservable.subscribe((packages) => {
       this.packages = packages;
     });
   }
@@ -27,12 +33,24 @@ export class PackageService {
   }
 
   hasPackage(id: string): boolean {
+    return id in this.userPackages;
+  }
+
+  packageExists(id: string): boolean {
     return id in this.packages;
   }
 
   postItemPackageTask(item: IItem, task: IItemTask): Observable<IItemTask> {
     return this.httpClient.post<IItemTask>(`${this.ApiEndpoint()}/api/v1/items/${item.code}/packagetasks`, task);
   }
+
+  ifPackageListExists<Type>(packageList: Array<string>, ifTrue:Observable<Type>,ifFalse:Observable<Type>):Observable<Type> {
+    return this.packagesObservable.pipe(switchMap(packages => 
+        iif(( )=> Object.keys(packages).some(id => packageList.includes(id)),
+            ifTrue,
+            ifFalse) 
+    )); 
+  }
 }
 
 export function getValidPackages(packageMap: IPackages): {[key: string]: IPackage} {

projects/common/src/test.ts

@@ -14,7 +14,9 @@ declare const require: any;
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(), {
+    teardown: { destroyAfterEach: false }
+}
 );
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);

projects/common/tsconfig.lib.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2015",
+    "target": "es2020",
     "module": "es2015",
     "moduleResolution": "node",
     "declaration": true,

projects/common/tsconfig.lib.prod.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2015",
+    "target": "es2020",
     "module": "es2015",
     "moduleResolution": "node",
     "declaration": true,

src/app/app-routing.module.ts

@@ -63,7 +63,7 @@ const routes = [
     canActivate: [NavBarGuard],
     component: NotImplementedComponent
   },
-  { path: 'map', loadChildren: () => import('../../projects/common-map/src/public-api').then(m => m.AppCommonMapModule), canActivateChild: [AuthGuard], canActivate: [FullScreenGuard] },
+  { path: 'map', loadChildren: () => import('../../projects/common-map/src/public-api').then(m => m.AppCommonMapModule), canActivateChild: [AuthGuard],canActivate: [NavBarGuard], },
   { path: 'map3d', loadChildren: () => import('./map3d/map3d.module').then(m => m.Map3DModule), canActivateChild: [AuthGuard], canActivate: [FullScreenGuard] },
   {
     path: 'registerdevice/:deviceToken',

src/app/test/test.component.html

@@ -2,7 +2,7 @@
     <div class="row">
         <fm-gradient-select [gradientItems]="gradientItems|async" [showLabel]="false" [showAdd]="true"></fm-gradient-select>
     </div>
-    <div class="row mt-3">
+    <div class="row mt-3" *fmPackageExists="'vnd.farmmaps.itemtype.package.dacom'">
         <button class="btn btn-primary" (click)="onTest($event)">Test</button>
     </div>
 </div>

src/configuration.json

@@ -1,9 +1,9 @@
 {
-    "issuer": "http://localhost:8094",
+    "issuer": "https://accounts.test.farmmaps.eu",
     "clientId": "farmmapsdev",
-    "audience": "http://localhost:8082",
+    "audience": "https://test.farmmaps.eu",
     "requireHttps": false,
-    "apiEndPoint": "http://localhost:8082",
+    "apiEndPoint": "https://test.farmmaps.eu",
     "grantType":"code"
 }
   

src/polyfills.ts

@@ -18,16 +18,6 @@
  * BROWSER POLYFILLS
  */
 
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
-// import 'classlist.js';  // Run `npm install --save classlist.js`.
-
-/**
- * Web Animations `@angular/platform-browser/animations`
- * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
- * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- */
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
 /**
  * By default, zone.js will patch all possible macroTask and DomEvents
  * user can disable parts of macroTask/DomEvents patch by setting following flags

src/test.ts

@@ -12,7 +12,9 @@ declare const require: any;
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(), {
+    teardown: { destroyAfterEach: false }
+}
 );
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);

tsconfig.json

@@ -13,7 +13,7 @@
     "allowSyntheticDefaultImports": true,
     "importHelpers": true,
     "skipLibCheck": true,
-    "target": "es2015",
+    "target": "es2020",
     "typeRoots": [
       "node_modules/@types"
     ],