Fix colors

This reverts commit 7f62a74877.

.gitignore

@@ -33,6 +33,7 @@ speed-measure-plugin.json
 .history/*
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage
@@ -47,3 +48,4 @@ testem.log
 Thumbs.db
 projects/common/node_modules/
 projects/common-map/node_modules/
+.angular/*

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
+  }
 }

custom-webpack.config.js

@@ -4,9 +4,13 @@ module.exports = {
       // Resolve node module use of fs
       fs: "empty",
       Buffer: false,
-      http: "empty",
+      http: require.resolve("stream-http"),
-      https: "empty",
+      https: require.resolve("https-browserify"),
-      zlib: "empty"
+      url: require.resolve("url/"),
+      zlib: require.resolve('browserify-zlib'),
+      assert: require.resolve("assert/"),
+      util: require.resolve("util/"),
+      buffer: require.resolve("buffer/")
     }
   }
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "2.1.1",
+  "version": "3.0.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -11,64 +11,73 @@
   },
   "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",
-    "bootstrap": "^4.6.0",
+    "angular-oauth2-oidc": "^13",
-    "cesium": "^1.82.1",
+    "assert": "^2.0.0",
+    "bootstrap": "^5.2.0",
+    "browserify-zlib": "^0.2.0",
+    "buffer": "^6.0.3",
+    "cesium": "^1.97.0",
     "core-js": "^2.6.12",
-    "moment": "^2.29.1",
+    "https-browserify": "^1.0.0",
-    "ngrx-store-localstorage": "^12.0",
+    "moment": "^2.29.4",
+    "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": "6.14.1",
-    "ol-cesium": "^2.13.0",
+    "olcs": "^2.13.1",
     "resumablejs": "^1.1.0",
     "rxjs": "^6.6.7",
+    "stream": "^0.0.2",
+    "stream-http": "^3.2.0",
     "tassign": "^1.0.0",
-    "tslib": "^2.2.0",
+    "tslib": "^2.4.0",
+    "url": "^0.11.0",
+    "util": "^0.12.4",
     "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,9 @@ 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 const SETVIEWSTATE = '[Map] SetViewState'
+
 
 export class Clear implements Action {
   readonly type = CLEAR;
@@ -316,6 +319,16 @@ export class GetLayerValueSuccess implements Action {
   constructor(public layervalue:ILayervalue) { }
 }
 
+export class ToggleShowDataLayerSlide implements Action {
+  readonly type = TOGGLESHOWDATALAYERSLIDE;
+  constructor() {}
+}
+
+export class SetViewState implements Action {
+  readonly type = SETVIEWSTATE;
+  constructor(public enabled:boolean) {}
+}
+
 export type Actions = SetMapState
   | Init
   | Clear
@@ -359,5 +372,7 @@ export type Actions = SetMapState
   | ToggleLayerValuesEnabled
   | GetLayerValueSuccess
   | GetLayerValue
-  | SetPeriod;
+  | SetPeriod
+  | ToggleShowDataLayerSlide
+  | SetViewState;
 

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

@@ -13,11 +13,12 @@ import {Tile,Layer,Image} from 'ol/layer';
 import {XYZ,ImageStatic,OSM,BingMaps,TileWMS,TileArcGISRest,TileJSON,Source} from 'ol/source';
 import {Vector as VectorSource} from 'ol/source';
 import { Vector as VectorLayer } from 'ol/layer';
+import { VectorImage as VectorImageLayer } from 'ol/layer';
 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 +33,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;
   
@@ -191,7 +194,8 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
           });
         }
       });
-      layer = new VectorLayer({
+      layer = new VectorImageLayer({
+        declutter: true,
         source: source,
         style: (feature) => {
           var key =feature.get("code") + "_" + feature.get("color");
@@ -362,6 +366,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 +414,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 +435,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 +448,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/aol/layer-list/layer-list.component.html

@@ -13,7 +13,7 @@
             </span>
             <a href="#" title="Zoom to extent" class="btn btn-light btn-sm" (click)="handleZoomToExtent($event,itemLayer)"><i class="far fa-search-plus" aria-hidden="true"></i></a>
             <span *ngIf="firstLayer(itemLayer)"><a href="#" title="Toggle legend" class="btn btn-light btn-sm" (click)="itemLayer.legendVisible=toggleLegend($event,itemLayer.legendVisible)"><i class="far fa-chart-bar" aria-hidden="true"></i></a></span>
-            <span *ngIf="!dataLayers" class="float-right"><a href="#" title="Remove overlay" class="btn btn-light btn-sm" (click)="handleDelete($event,itemLayer)"><i class="fas fa-layer-minus" aria-hidden="true"></i></a></span>
+            <span *ngIf="!dataLayers" class="float-end"><a href="#" title="Remove overlay" class="btn btn-light btn-sm" (click)="handleDelete($event,itemLayer)"><i class="fas fa-layer-minus" aria-hidden="true"></i></a></span>
           </div>
           <div *ngIf="itemLayer.legendVisible">
             <div class="card legend">

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

@@ -2,12 +2,12 @@
    <div class="cross"  *ngIf="enabled$ | async">
        <div class="pointer"></div>
        <div class="values-container border border-dark rounded p-2" *ngIf="(layerValues$ | async ) as layers">
-           <div class="lonlat pb-2 "><span class="font-weight-bold">{{lonlat$}}</span><i class="ml-2 fal fa-copy" (click)="copyToClipboard()"></i> </div>
+           <div class="lonlat pb-2 "><span class="font-weight-bold">{{lonlat$}}</span><i class="ms-2 fal fa-copy" (click)="copyToClipboard()"></i> </div>
            <ul class="value-list p-0 mb-0" *ngIf="layers.length>0 ;else no_data">
                <li class="border-top pt-1 pb-1 value" *ngFor="let layerValue of layers">
                    <div>{{layerValue.layerName}}</div>
                    <div>{{layerValue.date|date}}</div>
-                   <div><span *ngIf="layerValue.quantity"><span class="mr-1">{{layerValue.quantity}}</span> </span><span class="mr-1 font-weight-bold">{{layerValue.value}}</span><span>{{layerValue.unit}}</span></div>
+                   <div><span *ngIf="layerValue.quantity"><span class="me-1">{{layerValue.quantity}}</span> </span><span class="me-1 font-weight-bold">{{layerValue.value}}</span><span>{{layerValue.unit}}</span></div>
                </li>
            </ul>
            <ng-template #no_data>

projects/common-map/src/fm-map/components/aol/pan-to-location/pan-to-location.component.scss

@@ -29,7 +29,7 @@ div.gps-location:hover .pan-to {
 }
 
 div.gps-location:hover .pan-to-centered {
-  fill: theme-color-level($color-name: "primary", $level: -10) 
+  fill: theme-color-level(primary, -10) 
 }
 
 .pan-to.pan-to-disabled {

projects/common-map/src/fm-map/components/feature-list-cropfield/feature-list-cropfield.component.html

@@ -5,7 +5,7 @@
     <h3>{{schemeItem.name}}</h3>
     <div *ngIf="features;let features">
         <div class="cropfields">
-          <div class="row m-0 pl-3 pr-3" *ngFor="let feature of features" [ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
+          <div class="row m-0 ps-3 pe-3" *ngFor="let feature of features" [ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
           <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
         </div>
       </div>

projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.html

@@ -4,7 +4,7 @@
       <h3><i class="far fa-farm"></i>&nbsp;<span i18n>Farms</span></h3>
       <div *ngIf="features;let features">
       <div class="farms">
-        <div class="row m-0 pl-3 pr-3" *ngFor="let feature of features"[ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
+        <div class="row m-0 ps-3 pe-3" *ngFor="let feature of features"[ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
           <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
         </div>
       </div>      

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

@@ -1,6 +1,6 @@
 <div *ngIf="features;let features">
   <fm-back-button></fm-back-button>
-  <div class="row m-0 pl-3 pr-3" *ngFor="let feature of features" [ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
+  <div class="row m-0 ps-3 pe-3" *ngFor="let feature of features" [ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
     <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
   </div>
 </div>

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

@@ -4,7 +4,7 @@
     <div class="card layers-card m-1">
       <div class="card-header">
         <span i18n>Layers</span>
-        <i class="float-right fas fa-times" (click)="close($event)"></i>
+        <i class="float-end fas fa-times" (click)="close($event)"></i>
       </div>
       <ul class="navbar-nav">
         <li class="nav-item py-0">
@@ -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/legend/histogram-details/histogram-details.component.html

@@ -1,4 +1,4 @@
-<div class="row pl-3">
+<div class="row ps-3">
   <div class="col-8 nopadding"><span i18n>Average</span>:</div>
   <div class="col-4 pull-left nopadding">{{histogram.mean| number:'1.0-2'}}</div>
   <div class="col-8 nopadding"><span i18n>Standard deviation</span>:</div>

projects/common-map/src/fm-map/components/legend/statistics-details/statistics-details.component.html

@@ -1,4 +1,4 @@
-<div class="row pl-3">
+<div class="row ps-3">
   <div class="col-8 nopadding"><span i18n>Data points</span>:</div>
   <div class="col-4 pull-left nopadding">{{statistics.populationCount}}</div>
   <div class="col-8 nopadding"><span i18n>Min</span>:</div>

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

@@ -7,14 +7,10 @@
   <div class="card p-2">
     <form class="form" (ngSubmit)="handleSearch($event)">
       <div class="input-group">
-        <div class="input-group-prepend">
+        <button type="button" class="btn btn-outline-secondary" (click)="handleToggleMenu($event)"><i class="fal fa-bars" aria-hidden="true"></i></button>
-          <button type="button" class="btn btn-outline-secondary" (click)="handleToggleMenu($event)"><i class="fal fa-bars" aria-hidden="true"></i></button>
-        </div>
         <input #searchText class="form-control" type="text" (focus)="handleFocus($event)" [ngModel]="searchTextLocal" name="searchTextLocal" (ngModelChange)="handleChange($event)" [ngbTypeahead]="search" [resultTemplate]="rt" [inputFormatter]="formatter" (selectItem)="handleSelect($event)" placeholder="Search" i18n-placeholder />
-        <div class="input-group-append">
+        <button type="submit" class="btn btn-outline-secondary" [disabled]="disabled"><i class="fal fa-search"></i></button>
-          <button type="submit" class="btn btn-outline-secondary" [disabled]="disabled"><i class="fal fa-search"></i></button>
+        <button type="button" class="clear btn btn-outline-secondary" [disabled]="!clearEnabled" (click)="handleClearClick($event)"><i class="fas fa-times"></i></button>
-          <button type="button" class="clear btn btn-outline-secondary" [disabled]="!clearEnabled" (click)="handleClearClick($event)"><i class="fas fa-times"></i></button>
-        </div>
       </div>
       <div class="options">
         <div class="form-check">

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

@@ -20,32 +20,42 @@
   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>
-    <aol-view [zoom]="state.mapState.zoom" [rotation]="state.mapState.rotation">
+   
-       <aol-coordinate [x]="state.mapState.xCenter" [y]="state.mapState.yCenter" [srid]="'EPSG:4326'"></aol-coordinate>
+      <aol-view [zoom]="state.mapState.zoom" [rotation]="state.mapState.rotation">
-       <fm-map-zoom-to-extent [extent]="state.extent" [animate]="true"></fm-map-zoom-to-extent>
+        <aol-coordinate [x]="state.mapState.xCenter" [y]="state.mapState.yCenter" [srid]="'EPSG:4326'"></aol-coordinate>
-    </aol-view>
+        <fm-map-zoom-to-extent [extent]="state.extent" [animate]="true"></fm-map-zoom-to-extent>
+     </aol-view> 
+
     <aol-interaction-default></aol-interaction-default>
     <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 +63,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;
@@ -170,7 +195,7 @@ timespan.menuVisible {
   width: 4rem;
   overflow: hidden;
   text-overflow: ellipsis;
-  color: theme-color();
+  color: $primary;
 }
 
 .shortcut-icon > .farm-icon {

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,10 @@ 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;
+  private viewEnabled: boolean = true;
   
   @ViewChild('map') map;
   @ViewChild('contentDiv') contentDiv: ElementRef;
@@ -155,6 +160,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 +215,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 +372,13 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
         }
       });
     this.initialized = true;   
+    this.showDataLayerSlide$.subscribe((v) => {
+      this.dataLayerSlideEnabled=v;
+      this.map.instance.render();
+    });
+    this.store.select(mapReducers.selectGetViewEnabled).subscribe((v) => {
+      this.viewEnabled = v;
+    });
   }
 
   handleSearchCollapse(event) {
@@ -376,7 +432,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   }
 
   handleOnMoveEnd(event) {    
-    if(this.initialized) {
+    if(this.initialized && this.viewEnabled) {
       this.zone.run(() =>{
         console.debug("Move end");
         var map = event.map;

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/components/selected-item-geotiff/selected-item-geotiff.component.html

@@ -20,7 +20,7 @@
       </div>
       <div class="card menu-card">
         <ul class="p-0 mt-2">
-          <li *ngIf="item.isEditable"><a href="#" class="mt-1 mr-1" (click)="handleOnEdit(item)"><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
+          <li *ngIf="item.isEditable"><a href="#" class="ms-1 me-1" (click)="handleOnEdit(item)"><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
           <ng-container *ngIf="itemTypeService.isLayer(item)">
             <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-plus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
             <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>

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

@@ -19,7 +19,7 @@
       </div>
       <div class="card menu-card">
         <ul class="p-0 mt-2">
-          <li *ngIf="item.isEditable"><a href="#" class="mt-1 mr-1" (click)="handleOnEdit(item)" ><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
+          <li *ngIf="item.isEditable"><a href="#" class="mt-1 me-1" (click)="handleOnEdit(item)" ><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
           <ng-container *ngIf="itemTypeService.isLayer(item)">
             <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-olus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
             <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>

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

@@ -36,7 +36,7 @@
       </div>
       <div class="card menu-card">
         <ul class="p-0 mt-2">
-          <li *ngIf="item.isEditable"><a href="#" class="mt-1 mr-1" (click)="handleOnEdit(item)"><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
+          <li *ngIf="item.isEditable"><a href="#" class="mt-1 me-1" (click)="handleOnEdit(item)"><i class="fal fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
           <ng-container *ngIf="itemTypeService.isLayer(item)">
             <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-plus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
             <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>

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

@@ -126,7 +126,7 @@ export class MapEffects {
       var endDate = a.queryState.endDate;
       var newAction:Observable<Action>;
       if (a.queryState.itemCode || a.queryState.parentCode || a.queryState.itemType || a.queryState.query || a.queryState.tags) {
-        newAction= this.itemService$.getFeatures(a.queryState.bbox, "EPSG:3857", a.queryState.query, a.queryState.tags, startDate, endDate, a.queryState.itemType, a.queryState.parentCode, null, a.queryState.level).pipe(
+        newAction= this.itemService$.getFeatures(a.queryState.bbox, "EPSG:3857", a.queryState.query, a.queryState.tags, startDate, endDate, a.queryState.itemType, a.queryState.parentCode, a.queryState.dataFilter, a.queryState.level).pipe(
           switchMap((features: any) => {
             for (let f of features.features) {
               if (f.properties && f.properties["code"]) {

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

@@ -69,8 +69,10 @@ export interface State {
   replaceUrl:boolean,
   layerValuesX:number,
   layerValuesY:number,
-  layerValuesEnabled:boolean;
+  layerValuesEnabled:boolean,
-  layerValues: Array<ILayervalue>;
+  layerValues: Array<ILayervalue>
+  showDataLayerSlide:boolean,
+  viewEnabled:boolean
 }
 
 export const initialState: State = {
@@ -113,7 +115,9 @@ export const initialState: State = {
   layerValuesX:0,
   layerValuesY:0,
   layerValuesEnabled:false,
-  layerValues:[]
+  layerValues:[],
+  showDataLayerSlide:false,
+  viewEnabled:true
 }
 
 export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State {
@@ -172,6 +176,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       return tassign(state, {
         selectedItem: null,
         selectedItemLayer: null,
+        showDataLayerSlide: false,
         features:[],
         inSearch:inSearch
       });
@@ -501,7 +506,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 +520,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});
@@ -531,12 +540,17 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       v.push(a.layervalue);
       return tassign(state,{layerValues:v});
     }
+    case mapActions.SETVIEWSTATE:{
+      let a= action as mapActions.SetViewState;
+      return tassign(state,{viewEnabled:a.enabled});
+    }
     case commonActions.ITEMDELETEDEVENT:{
       let a= action as commonActions.ItemDeletedEvent;
       if(state.selectedItem && state.selectedItem.code == a.itemCode) {
          return tassign(state,{  
           selectedItem: null,
           selectedItemLayer: null,
+          showDataLayerSlide: false,
           features:[]
          });
       }
@@ -584,12 +598,14 @@ 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;
 export const getLayerValues = (state:State) => state.layerValues;
 export const getLayerValuesX = (state:State) => state.layerValuesX;
 export const getLayerValuesY = (state:State) => state.layerValuesY;
+export const getViewEnabled = (state:State) => state.viewEnabled;
 
 
 export const selectMapState = createFeatureSelector<State>(MODULE_NAME);
@@ -616,11 +632,13 @@ 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);
 export const selectGetLayerValues = createSelector(selectMapState,getLayerValues);
 export const selectGetLayerValuesX = createSelector(selectMapState,getLayerValuesX);
 export const selectGetLayerValuesY = createSelector(selectMapState,getLayerValuesY);
+export const selectGetViewEnabled = createSelector(selectMapState,getViewEnabled);
 
 

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/fm-map3d/common-map3d.module.ts

@@ -1,12 +1,14 @@
 import { NgModule } from '@angular/core';
 import { Switch2D3DComponent } from './components/olcs/switch2d3d/switch2d3d.component';
 import { AppCommonModule} from '@farmmaps/common';
+import { AppCommonMapModule} from '@farmmaps/common-map';
 
 
 @NgModule({
   declarations: [Switch2D3DComponent],
   imports: [
-    AppCommonModule
+    AppCommonModule,
+    AppCommonMapModule
   ],
   exports: [Switch2D3DComponent]
 })

projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts

@@ -1,8 +1,11 @@
 import { Component, OnInit,Input,Host  } from '@angular/core';
+import { Interaction} from 'ol/interaction';
 import { MapComponent } from 'ngx-openlayers';
-import OLCesium from 'ol-cesium';
+import OLCesium from 'olcs/OLCesium';
-
+import RasterSynchronizer from 'olcs/RasterSynchronizer';
-declare var olcs: any;
+import VectorSynchronizer from 'olcs/VectorSynchronizer';
+import { mapReducers,mapActions } from '@farmmaps/common-map';
+import { Store } from '@ngrx/store';
 
 @Component({
   selector: 'fm-map3d-switch2d3d',
@@ -16,9 +19,10 @@ export class Switch2D3DComponent {
   private ol3d: OLCesium;
   private synchronizers:any[];
   public loading:boolean = true;
+  private interactions:Interaction[] = [];
 
 
-  constructor(private map: MapComponent) {
+  constructor(private map: MapComponent,private store: Store<mapReducers.State>) {
     
   }
 
@@ -26,8 +30,8 @@ export class Switch2D3DComponent {
    
     this.ol3d = new OLCesium({ map: this.map.instance, createSynchronizers: (map,scene) => {
         this.synchronizers = [
-            new olcs.RasterSynchronizer(map,scene),
+            new RasterSynchronizer(map,scene),
-            new olcs.VectorSynchronizer(map,scene)
+            new VectorSynchronizer(map,scene)
         ];
         this.loading=false;
         return this.synchronizers;
@@ -41,12 +45,35 @@ export class Switch2D3DComponent {
       });
   }
 
+  disableInteractions() {
+      this.interactions=[];
+      this.map.instance.getInteractions().forEach((i) => {
+        if(i.getActive()) {
+          this.interactions.push(i);
+          i.setActive(false);
+        }
+      });
+  }
+
+  enableInteractions() {
+    this.interactions.forEach((i) => {
+      i.setActive(true);
+    });
+  }
+
   handleClick(event) {
     this.enable = !this.enable; 
     if(this.enable) {
-        this.synchronize();
+      this.store.dispatch(new mapActions.SetViewState(false));
+      this.disableInteractions();
+      this.synchronize();
+      this.ol3d.setEnabled(true);
+    } else {
+      this.ol3d.setEnabled(false);
+      this.enableInteractions();
+      this.store.dispatch(new mapActions.SetViewState(true));
     }
-    this.ol3d.setEnabled(this.enable);
+    
     this.label = this.enable?"2D":"3D";    
   }
 }

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/components/app/app.component.html

@@ -1,13 +1,15 @@
 <div class="app fullscreen" (click)="handleClick($event)" [ngClass]="{'fullscreen' :(fullScreen|async),'pagemode':(isPageMode|async),'appmode':!(isPageMode|async)}">
   <nav class="navbar navbar-light navbar-expand bg-light navigation-clean">
-    <div class="header-logo pageonly"><router-outlet name="header-logo"></router-outlet></div> 
+    <div class="container-fluid">
-    <button type="button" class="btn btn-outline-secondary apponly" (click)="handleToggleMenu($event)"><i class="fal fa-bars" aria-hidden="true"></i></button>
+      <div class="header-logo pageonly"><router-outlet name="header-logo"></router-outlet></div> 
-    <router-outlet name="menu" class="ml-4"></router-outlet>
+      <button type="button" class="btn btn-outline-secondary apponly" (click)="handleToggleMenu($event)"><i class="fal fa-bars" aria-hidden="true"></i></button>
-    <div class="collapse navbar-collapse pageonly">      
+      <router-outlet name="menu" class="ms-4"></router-outlet>
-      <a class="btn btn-primary ml-auto" role="button" [routerLink]="[ startPage == null?'/map':startPage]">
+      <div class="collapse navbar-collapse pageonly">      
-        <span *ngIf="(user|async)==null" i18n>Sign in</span>
+        <a class="btn btn-primary ms-auto" role="button" [routerLink]="[ startPage == null?'/map':startPage]">
-        <span *ngIf="(user|async)!=null" i18n>To app</span>
+          <span *ngIf="(user|async)==null" i18n>Sign in</span>
-      </a>
+          <span *ngIf="(user|async)!=null" i18n>To app</span>
+        </a>
+      </div>  
     </div>
   </nav>
   <div class="body">
@@ -19,7 +21,7 @@
       <div class="body">
         <div class="d-flex flex-row">
           <div class="mt-2 mb-2 flex-grow-1 logo" (click)="handleHome($event)"><router-outlet name="side-panel-logo"></router-outlet></div>
-          <div class="mt-2 mb-2 ml-2"><button type="button" class="btn btn-outline-secondary" (click)="handleToggleMenu($event)"><i class="fal fa-times" aria-hidden="true"></i></button></div>
+          <div class="mt-2 mb-2 ms-2"><button type="button" class="btn btn-outline-secondary" (click)="handleToggleMenu($event)"><i class="fal fa-times" aria-hidden="true"></i></button></div>
         </div>
         <div class="d-flex flex-column cards"> 
             <router-outlet name="side-panel-menu"></router-outlet>          

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

@@ -4,7 +4,7 @@
       <div class="card-header  p-3 bg-primary text-white">
         <span *ngIf="uploadService.isUploading">Uploading files (<span>{{uploadService.totalProgress | number:'1.1-1'}}</span> %)</span>
         <span *ngIf="uploadService.isUploading == false">Uploaded <span>{{uploadService.files.length}}</span> files</span>
-        <span title="Cancel" class="fal fa-times float-right" (click)="uploadService.close()"></span><span title="Minimize" class="fal fa-chevron-down float-right mr-2" (click)="uploadService.toggleMinimize()" [ngClass]="{'fa-chevron-down': uploadService.isMinimized == false, 'fa-chevron-up':uploadService.isMinimized}"></span>
+        <span title="Cancel" class="fal fa-times float-end" (click)="uploadService.close()"></span><span title="Minimize" class="fal fa-chevron-down float-end me-2" (click)="uploadService.toggleMinimize()" [ngClass]="{'fa-chevron-down': uploadService.isMinimized == false, 'fa-chevron-up':uploadService.isMinimized}"></span>
       </div>
       <div [ngClass]="{'minimized': uploadService.isMinimized }">
         <div class="card-block p-3">

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

@@ -76,7 +76,7 @@ div.card-header span.fa {
   }
 
 .upload-file.busy > div > span.fa-times {
-  color: theme-color("danger");
+  color: $danger;
   width: 20px;
   display: inline-block;
   vertical-align: middle;
@@ -94,7 +94,7 @@ div.card-header span.fa {
   }
 
   .upload-file > div.errormessage {
-    color: theme-color("danger");
+    color: $danger;
     display: none;
   }
 

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

@@ -1,5 +1,5 @@
 <div class="side-panel hidden" [ngClass]="{'hidden':!visible,'collapsed':collapsed,'resizeable':(resizeable && mobile),'resizing':resizing,'left':left}" [ngStyle]="{'top':top}">
-  <div *ngIf="collapsable" class="arrow rounded-right p-2" (click)="handleToggleClick($event)">
+  <div *ngIf="collapsable" class="arrow rounded-end p-2" (click)="handleToggleClick($event)">
     <i class="fal fa-chevron-left" aria-hidden="true"></i>
   </div>
   <div  draggable="true" class="resizegrip" (dragstart)="handleStartGripDrag($event)" (touchstart)="handleStartGripDrag($event)" (dragend)="handleEndGripDrag()" (touchend)="handleEndGripDrag()" (drag)="handleGripDrag($event)" (touchmove)="handleGripDrag($event)">

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/timespan/timespan.component.html

@@ -5,7 +5,7 @@
    <div class="popover-anchor" [style.left.px] = "endPopoverLeft" [ngbPopover]="popoverContent" #popoverEnd="ngbPopover">&nbsp;</div>
    <div class="collapsed clearfix" [ngClass]="{'collapsed':collapsed}">
      <!-- <div class="clearfix">
-        <select class="form-control float-right" [value]="unitScale">
+        <select class="form-control float-end" [value]="unitScale">
             <option value="0">Millisecond</option>
             <option value="1">Second</option>
             <option value="2">Minute</option>
@@ -21,9 +21,9 @@
         <canvas #timeLine (mousedown)="handleViewPanMouseDown($event)" (touchstart)="handleViewPanMouseDown($event)" (mousemove)="handleCanvasMouseMove($event)" (mouseleave)="handleCanvasMouseLeave($event)">
         </canvas>
         <div class="control-container"  [style.margin-left.px]="marginLeft" [style.height.px]="lineHeight" >
-            <div class="leftGrip rounded-left" (mousedown)="handleLeftGripMouseDown($event)" (touchstart)="handleLeftGripMouseDown($event)"   (mouseenter)="handleLeftGripMouseEnter($event)" (mouseleave)="handleLeftGripMouseLeave($event)"><i class="fal fa-ellipsis-v" aria-hidden="true"></i></div>
+            <div class="leftGrip rounded-start" (mousedown)="handleLeftGripMouseDown($event)" (touchstart)="handleLeftGripMouseDown($event)"   (mouseenter)="handleLeftGripMouseEnter($event)" (mouseleave)="handleLeftGripMouseLeave($event)"><i class="fal fa-ellipsis-v" aria-hidden="true"></i></div>
             <div class="range" [style.width.px]="rangeWidth" (mousedown)="handleRangeGripMouseDown($event)" (touchstart)="handleRangeGripMouseDown($event)" (mouseenter)="handleRangeGripMouseEnter($event)"></div>
-            <div class="rightGrip rounded-right" (mousedown)="handleRightGripMouseDown($event)" (touchstart)="handleRightGripMouseDown($event)" (mouseenter)="handleRightGripMouseEnter($event)" (mouseleave)="handleRightGripMouseLeave($event)"><i class="fal fa-ellipsis-v" aria-hidden="true"></i></div>
+            <div class="rightGrip rounded-end" (mousedown)="handleRightGripMouseDown($event)" (touchstart)="handleRightGripMouseDown($event)" (mouseenter)="handleRightGripMouseEnter($event)" (mouseleave)="handleRightGripMouseLeave($event)"><i class="fal fa-ellipsis-v" aria-hidden="true"></i></div>
         </div>
      </div>
      <!-- <div>

projects/common/src/fm/models/query.state.ts

@@ -1,6 +1,7 @@
 export interface IQueryState {
   itemCode: string;
   parentCode: string;
+  dataFilter?: string;
   level: number;
   itemType: string;
   query: string;

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: [FullScreenGuard], },
   { path: 'map3d', loadChildren: () => import('./map3d/map3d.module').then(m => m.Map3DModule), canActivateChild: [AuthGuard], canActivate: [FullScreenGuard] },
   {
     path: 'registerdevice/:deviceToken',

src/app/landingpage/landingpage.component.html

@@ -45,21 +45,21 @@
 </section>
 <section class="showcase">
     <div class="container-fluid p-0">
-        <div class="row no-gutters">
+        <div class="row g-0">
             <div class="col-lg-6 order-lg-2 text-white showcase-img" style="background-image:url('/images/bg-showcase-1.jpg');"><span></span></div>
             <div class="col-lg-6 my-auto order-lg-1 showcase-text">
                 <h2>Fully Responsive Design</h2>
                 <p class="lead mb-0">When you use a theme created with Bootstrap, you know that the theme will look great on any device, whether it's a phone, tablet, or desktop the page will behave responsively!</p>
             </div>
         </div>
-        <div class="row no-gutters">
+        <div class="row g-0">
             <div class="col-lg-6 text-white showcase-img" style="background-image:url('/images/bg-showcase-2.jpg');"><span></span></div>
             <div class="col-lg-6 my-auto order-lg-1 showcase-text">
                 <h2>Updated For Bootstrap 4</h2>
                 <p class="lead mb-0">Newly improved, and full of great utility classes, Bootstrap 4 is leading the way in mobile responsive web development! All of the themes are now using Bootstrap 4!</p>
             </div>
         </div>
-        <div class="row no-gutters">
+        <div class="row g-0">
             <div class="col-lg-6 order-lg-2 text-white showcase-img" style="background-image:url('/images/bg-showcase-3.jpg');"><span></span></div>
             <div class="col-lg-6 my-auto order-lg-1 showcase-text">
                 <h2>Easy to Use &amp;&nbsp;Customize</h2>

src/app/menu/menu.component.scss

@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .menu-card {
     padding-left:7px;
     padding-right:7px;
@@ -27,7 +29,7 @@
     width: 4rem;
     overflow: hidden;
     text-overflow: ellipsis;
-    color: theme-color();
+    color: $primary;
   }
   
   .shortcut-icon > .farm-icon {

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"
     ],