Kick version

.gitignore

@@ -47,3 +47,4 @@ testem.log
 Thumbs.db
 projects/common/node_modules/
 projects/common-map/node_modules/
+.angular/*

custom-webpack.config.js

@@ -4,9 +4,13 @@ module.exports = {
       // Resolve node module use of fs
       fs: "empty",
       Buffer: false,
-      http: "empty",
-      https: "empty",
-      zlib: "empty"
+      http: require.resolve("stream-http"),
+      https: require.resolve("https-browserify"),
+      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": "2.1.5",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -28,22 +28,30 @@
     "@ngrx/router-store": "^12.0",
     "@ngrx/store": "^12.0",
     "angular-oauth2-oidc": "^12.0",
+    "assert": "^2.0.0",
     "bootstrap": "^4.6.0",
-    "cesium": "^1.82.1",
+    "browserify-zlib": "^0.2.0",
+    "buffer": "^6.0.3",
+    "cesium": "^1.97.0",
     "core-js": "^2.6.12",
-    "moment": "^2.29.1",
-    "ngrx-store-localstorage": "^12.0",
+    "https-browserify": "^1.0.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",
-    "ol": "6.8.1",
-    "ol-cesium": "^2.13.0",
+    "ngx-uploadx": "^5.2.0",
+    "ol": "6.14.1",
+    "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": {

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/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) {
-      itemLayers.forEach((itemLayer, index) => {
+    if (ils) {
+      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/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,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>
-       <fm-map-zoom-to-extent [extent]="state.extent" [animate]="true"></fm-map-zoom-to-extent>
-    </aol-view>
+   
+      <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>
+        <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" >
-      <router-outlet name="map-controls"></router-outlet>
-      <fm-map-layer-switcher></fm-map-layer-switcher>
-      <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 class="viewport-container" [ngStyle]="{'bottom': bottom(state.panelVisible)}">
+      <div class="control-container">
+        <router-outlet name="map-controls"></router-outlet>
+        <fm-map-layer-switcher></fm-map-layer-switcher>
+        <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;
 }
 
-
-.control-container {
+.viewport-container {
   position: absolute;
-  right: 1em;
-  bottom: 8.1em;
+  left:0;
+  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,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/reducers/map.reducer.ts

@@ -69,8 +69,10 @@ export interface State {
   replaceUrl:boolean,
   layerValuesX:number,
   layerValuesY:number,
-  layerValuesEnabled:boolean;
-  layerValues: Array<ILayervalue>;
+  layerValuesEnabled:boolean,
+  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-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';
-
-declare var olcs: any;
+import OLCesium from 'olcs/OLCesium';
+import RasterSynchronizer from 'olcs/RasterSynchronizer';
+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 olcs.VectorSynchronizer(map,scene)
+            new RasterSynchronizer(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/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();
   }
 }

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/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"
 }