Merge branch 'develop'

This reverts commit a454f2306d.

angular.json

@@ -169,7 +169,7 @@
       "prefix": "fm",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "projects/common/tsconfig.lib.json",
             "project": "projects/common/ng-package.json"           
@@ -209,7 +209,7 @@
       "prefix": "fm-map",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "projects/common-map/tsconfig.lib.json",
             "project": "projects/common-map/ng-package.json"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -11,63 +11,62 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~10.2.4",
-    "@angular/common": "~10.2.4",
-    "@angular/compiler": "~10.2.4",
-    "@angular/core": "~10.2.4",
-    "@angular/forms": "~10.2.4",
-    "@angular/platform-browser": "~10.2.4",
-    "@angular/platform-browser-dynamic": "~10.2.4",
-    "@angular/router": "~10.2.4",
-    "@farmmaps/common": "~1.0",
-    "@farmmaps/common-map": "~1.0",
-    "@farmmaps/common-map3d": "~1.0",
-    "@microsoft/signalr": "^3.1.3",
-    "@ng-bootstrap/ng-bootstrap": "^7.0",
-    "@ngrx/effects": "^10.0",
-    "@ngrx/router-store": "^10.0",
-    "@ngrx/store": "^10.0",
+    "@angular/animations": "~11.2.14",
+    "@angular/common": "~11.2.14",
+    "@angular/compiler": "~11.2.14",
+    "@angular/core": "~11.2.14",
+    "@angular/forms": "~11.2.14",
+    "@angular/platform-browser": "~11.2.14",
+    "@angular/platform-browser-dynamic": "~11.2.14",
+    "@angular/router": "~11.2.14",
+    "@farmmaps/common": "1.1.1-prerelease.2031",
+    "@farmmaps/common-map": "1.1.1-prerelease.2031",
+    "@farmmaps/common-map3d": "1.1.1-prerelease.2031",
+    "@microsoft/signalr": "^3.1.16",
+    "@ng-bootstrap/ng-bootstrap": "^9.0",
+    "@ngrx/effects": "^11.0",
+    "@ngrx/router-store": "^11.0",
+    "@ngrx/store": "^11.0",
     "angular-oauth2-oidc": "^10.0.3",
-    "bootstrap": "^4.4.1",
-    "cesium": "^1.77.0",
-    "core-js": "^2.6.11",
-    "moment": "^2.27.0",
-    "ngrx-store-localstorage": "^10.0",
-    "ngx-avatar": "^4.0.0",
+    "bootstrap": "^4.6.0",
+    "cesium": "^1.82.1",
+    "core-js": "^2.6.12",
+    "moment": "^2.29.1",
+    "ngrx-store-localstorage": "^11.0.0",
+    "ngx-avatar": "^4.1.0",
     "ngx-clipboard": "^14.0.1",
     "ngx-image-cropper": "^3.3.5",
     "ngx-openlayers": "1.0.0-next.17",
     "ngx-uploadx": "^3.5.1",
     "ol": "6.5.0",
-    "ol-cesium": "^2.12.0",
+    "ol-cesium": "^2.13.0",
     "resumablejs": "^1.1.0",
-    "rxjs": "^6.5.4",
+    "rxjs": "^6.6.7",
     "tassign": "^1.0.0",
-    "tslib": "^2.0.0",
+    "tslib": "^2.2.0",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "~10.0.1",
-    "@angular-devkit/build-angular": "^0.1002.1",
-    "@angular-devkit/build-ng-packagr": "~0.1002.1",
-    "@angular/cli": "^10.2.1",
-    "@angular/compiler-cli": "~10.2.4",
-    "@angular/language-service": "~10.2.4",
+    "@angular-builders/custom-webpack": "^11.1.1",
+    "@angular-devkit/build-angular": "^0.1102.14",
+    "@angular/cli": "^11.2.14",
+    "@angular/compiler-cli": "~11.2.14",
+    "@angular/language-service": "~11.2.14",
     "@types/jasmine": "~2.8.8",
-    "@types/jasminewd2": "~2.0.3",
-    "@types/node": "^12.11.1",
+    "@types/jasminewd2": "^2.0.9",
+    "@types/node": "^12.20.15",
     "codelyzer": "^5.1.2",
     "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.0.0",
+    "karma": "~6.3.3",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",
-    "karma-jasmine-html-reporter": "^1.5.0",
-    "ng-packagr": "^10.1.0",
+    "karma-jasmine-html-reporter": "^1.6.0",
+    "ng-packagr": "^11.2.4",
     "protractor": "~7.0.0",
     "ts-node": "^8.8.1",
     "tslint": "~6.1.0",
-    "typescript": "~4.0.3"
+    "typescript": "~4.1.0"
   }
 }

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

@@ -6,12 +6,14 @@ import { ILayervalue } from '../models/layer.value';
 import { IQueryState } from '@farmmaps/common';
 import { IItem } from '@farmmaps/common';
 import { Feature,Style } from 'ol';
+import { IPeriodState } from '../models/period.state';
 
 export const SETSTATE = '[Map] SetState';
 export const SETMAPSTATE = '[Map] MapState';
 export const SETVIEWEXTENT = '[Map] SetViewExtent';
 export const INIT = '[Map] Init';
 export const SETPARENT = '[Map] SetParent';
+export const SETPERIOD = '[Map] SetPeriod';
 export const STARTSEARCH = '[Map] StartSearch';
 export const STARTSEARCHSUCCESS = '[Map] StartSearchSuccess';
 export const SELECTFEATURE = '[Map] SelectFeature';
@@ -86,6 +88,12 @@ export class SetParent implements Action {
   constructor(public parentCode:string) { }
 }
 
+export class SetPeriod implements Action {
+  readonly type = SETPERIOD;
+
+  constructor(public period:IPeriodState) { }
+}
+
 export class StartSearch implements Action {
   readonly type = STARTSEARCH;
 
@@ -257,7 +265,7 @@ export class ZoomToExtent implements Action {
 export class DoQuery implements Action {
   readonly type = DOQUERY;
 
-  constructor(public query:IQueryState) { }
+  constructor(public query:IQueryState,public replace:boolean = false) { }
 }
 
 export class SetStyle implements Action {
@@ -348,5 +356,6 @@ export type Actions = SetMapState
   | SetLayerValuesLocation
   | ToggleLayerValuesEnabled
   | GetLayerValueSuccess
-  | GetLayerValue;
+  | GetLayerValue
+  | SetPeriod;
 

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

@@ -82,9 +82,17 @@ export function LocalStorageSync(reducer: ActionReducer<any>): ActionReducer<any
         if(ms) {
           r2["mapState"] = JSON.parse(ms);
         }
+        let sp = window.localStorage.getItem(MODULE_NAME+"_searchPeriod");
+        if(sp) {          
+          let p = JSON.parse(sp);
+          r2["period"] = { startDate: new Date(Date.parse(p.startDate)),endDate:new Date(Date.parse(p.endDate))};
+        }
     }
     if(action.type == "[Map] MapState" || action.type == "[Map] SetState") {
-        window.localStorage.setItem(MODULE_NAME + "_mapState",JSON.stringify(r2["mapState"]));
+      window.localStorage.setItem(MODULE_NAME + "_mapState",JSON.stringify(r2["mapState"]));
+    }
+    if(action.type == "[Map] SetPeriod" ) {
+      window.localStorage.setItem(MODULE_NAME + "_searchPeriod",JSON.stringify(r2["period"]));
     }
 
     return r2;

projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.ts

@@ -13,7 +13,7 @@ export class GpsLocation  implements OnInit,OnChanges{
 
   @Input() enable:boolean;
   public instance: Overlay;
-  @Input() position: Position;
+  @Input() position: GeolocationPosition;
   @Input() location: number[]=[0,0];
   @Input() locationTolerance: number = 0;
   @Input() showHeading: boolean = false;
@@ -61,7 +61,7 @@ export class GpsLocation  implements OnInit,OnChanges{
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes.position && this.instance) {
-      var p = changes.position.currentValue as Position;
+      var p = changes.position.currentValue as GeolocationPosition;
       if(p && this.initialized) {
         this.instance.setPosition(fromLonLat([p.coords.longitude, p.coords.latitude]));
         this.locationTolerance = p.coords.accuracy;

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

@@ -112,17 +112,18 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
     this.host.instance.setSource(this.instance);
       
     this.host.instance.setStyle((feature) => {     
-      var key = feature.get('itemType') + (this.selectedItem?"_I":"");
+      var itemType = feature.get('itemType');
+      var key = itemType + (this.selectedItem?"_I":"");
       if (!this.stylesCache[key]) {
-        if (this.itemTypeService.itemTypes[key]) {
-          let itemType = this.itemTypeService.itemTypes[key];
-          let fillColor = color.asArray(itemType.iconColor);
+        if (this.itemTypeService.itemTypes[itemType]) {
+          let itemTypeEntry = this.itemTypeService.itemTypes[itemType];
+          let fillColor = color.asArray(itemTypeEntry.iconColor);
           fillColor[3] = 0;
           this.stylesCache[key] = new style.Style({
-              image: itemType.icon ? new style.Icon({
+              image: itemTypeEntry.icon ? new style.Icon({
                   anchor: [0.5, 1],
                   scale: 0.05,
-                  src: this.featureIconService$.getIconImageDataUrl(itemType.icon)
+                  src: this.featureIconService$.getIconImageDataUrl(itemTypeEntry.icon)
                 }):null,
               stroke: new style.Stroke({
                 color: 'red',

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

@@ -17,7 +17,7 @@
           </div>
           <div *ngIf="itemLayer.legendVisible">
             <div class="card legend">
-              <fm-map-layer-legend [layer]="firstLayer(itemLayer)" (click)="handleLegendClick($event,itemLayer);"></fm-map-layer-legend>
+              <fm-map-layer-legend [layer]="firstLayer(itemLayer)" (click)="handleLegendClick($event,itemLayer);" [histogramenabled]="true"></fm-map-layer-legend>
             </div>
           </div>
       </div>

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

@@ -7,7 +7,7 @@
                <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 class="mr-1">{{layerValue.quantity}}</span> <span class="mr-1 font-weight-bold">{{layerValue.value}}</span><span>{{layerValue.unit}}</span></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>
                </li>
            </ul>
            <ng-template #no_data>

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

@@ -14,7 +14,7 @@ export class PanToLocation  implements OnInit,OnChanges{
 
   view: View;
   map: MapComponent;
-  @Input() position: Position;
+  @Input() position: GeolocationPosition;
   @Input() mapState: IMapState;
   @Input() animate: boolean;
 

projects/common-map/src/fm-map/components/aol/zoom-to-extent/zoom-to-extent.component.ts

@@ -1,4 +1,5 @@
 import { Component, Host, Input, OnInit, OnChanges, SimpleChanges, forwardRef } from '@angular/core';
+import { ActivatedRoute  } from '@angular/router';
 import { ViewComponent, MapComponent } from 'ngx-openlayers';
 
  
@@ -9,12 +10,24 @@ import { ViewComponent, MapComponent } from 'ngx-openlayers';
 export class ZoomToExtentComponent implements OnChanges {
   view: ViewComponent;
   map: MapComponent;
+  paddingTop: number = 0;
+  paddingLeft: number = 0;
+  paddingBottom: number = 0;
+  paddingRight: number = 0;
+
   @Input() extent: number[];
   @Input() animate: boolean = false;
 
-  constructor(@Host() view: ViewComponent, @Host() map: MapComponent) {
+  constructor(@Host() view: ViewComponent, @Host() map: MapComponent,route: ActivatedRoute ) {
     this.view = view;
     this.map = map;
+    if(route && route.snapshot && route.snapshot.data && route.snapshot.data["fm-map-zoom-to-extent"]) {
+      let params = route.snapshot.data["fm-map-zoom-to-extent"];
+      this.paddingTop = params["padding-top"] ? params["padding-top"] : 0;
+      this.paddingBottom = params["padding-bottom"] ? params["padding-bottom"] : 0;
+      this.paddingLeft = params["padding-left"] ? params["padding-left"] : 0;
+      this.paddingRight = params["padding-right"] ? params["padding-right"] : 0;
+    }
   }
 
   ngOnChanges(changes: SimpleChanges) {
@@ -31,7 +44,7 @@ export class ZoomToExtentComponent implements OnChanges {
         bottom = 5 * rem;
         left = 23 * rem;
       }
-      options.padding = [top, right, bottom, left];
+      options.padding = [top + (this.paddingTop*rem), right+ (this.paddingRight*rem), bottom + (this.paddingBottom*rem), left+ (this.paddingLeft*rem)];
       if (this.animate) options["duration"] = 1000;
       this.view.instance.fit(this.extent, options);
     }

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

@@ -89,7 +89,7 @@ export class LegendComponent implements OnInit,AfterViewInit {
   }
 
   showHistogram(): boolean {
-    return this.histogramenabled && this.layer.renderer.band.histogram.entries && this.layer.renderer.band.histogram.entries.length > 0 && this.layer.renderer.colorMap.colormapType == "minmax";
+    return this.histogramenabled && this.layer.renderer.band.histogram.entries && this.layer.renderer.band.histogram.entries.length > 0 && this.layer.renderer.band.histogram.entries.length == this.layer.renderer.colorMap.entries.length;
   }
 
   bandContainsStatistics(): boolean {

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

@@ -33,4 +33,4 @@
     <ng-content></ng-content>
   </div>  
 </div>
-<fm-map-select-period-modal [modalState]="openedModalName" (onCloseModal)="handleCloseModal()" (onSelect)="handleSelectPeriod($event)" [startDate]="startDate" [endDate]="endDate"></fm-map-select-period-modal>
+<fm-map-select-period-modal [modalState]="openedModalName" (onCloseModal)="handleCloseModal()" (onSelect)="handleSelectPeriod($event)" [startDate]="periodLocal.startDate" [endDate]="periodLocal.endDate"></fm-map-select-period-modal>

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

@@ -22,7 +22,10 @@ export class MapSearchComponent {
   @Input() set searchMinified(minified: boolean) {
     this.searchMinifiedLocal = minified;
   }
-  @Input() period: IPeriodState
+  @Input() set period(period:IPeriodState) {
+    this.periodLocal =  tassign(this.periodLocal,{startDate: period.startDate,endDate:period.endDate});
+    this.startEndCaption = this.timespanService.getCaption(period.startDate, period.endDate, 4)
+  }
   @Output() onSearch = new EventEmitter<IQueryState>();
   @Output() onClear = new EventEmitter<any>();
   @Output() onSearchCollapse = new EventEmitter<any>();
@@ -30,6 +33,7 @@ export class MapSearchComponent {
   @Output() onToggleMenu = new EventEmitter<any>();
   @Output() onOpenModal = new EventEmitter<string>();
   @Output() onCloseModal = new EventEmitter<any>();
+  @Output() onPeriodChange = new EventEmitter<IPeriodState>();
   @Input() openedModalName: string;
   @Input() set filterOptions(filterOptions: IQueryState) {
     if (filterOptions && filterOptions.query && filterOptions.query.length > 0) {
@@ -42,23 +46,18 @@ export class MapSearchComponent {
       this.searchTextLocal = { name: filterOptions.tags };
     } else {
       this.searchTextLocal = { name: filterOptions.query };
-    }
-    if (this.dateFilter) {
-      this.filterOptionsLocal.startDate = this.startDate;
-      this.filterOptionsLocal.endDate = this.endDate;
-    }
+    } 
   }
 
   public collapsedLocal: boolean = true;
   public searchMinifiedLocal: boolean = false;
+  public periodLocal: IPeriodState = { startDate:new Date(new Date(Date.now()).getFullYear(), new Date(Date.now()).getMonth() - 3, 1), endDate:new Date(Date.now())};
   public filterOptionsLocal: IQueryState;
   private extent: number[];
   public searchTextLocal: any;
   public searchTextLocalOutput: string; 
-  public dateFilter: boolean = true;
-  public startDate: Date = new Date(new Date(Date.now()).getFullYear(), new Date(Date.now()).getMonth() - 3, 1);
-  public endDate: Date = new Date(Date.now());
-  public startEndCaption: string = this.timespanService.getCaption(this.startDate, this.endDate, 4);
+  public dateFilter: boolean = true; 
+  public startEndCaption: string = this.timespanService.getCaption(this.periodLocal.startDate, this.periodLocal.endDate, 4);
 
   searching = false;
   searchFailed = false;
@@ -94,8 +93,8 @@ export class MapSearchComponent {
     this.filterOptionsLocal.parentCode = null;
     this.filterOptionsLocal.query = this.searchTextLocalOutput;
     if (this.dateFilter) {
-      this.filterOptionsLocal.startDate = this.startDate;
-      this.filterOptionsLocal.endDate = this.endDate;
+      this.filterOptionsLocal.startDate = this.periodLocal.startDate;
+      this.filterOptionsLocal.endDate = this.periodLocal.endDate;
     }
     this.onSearch.emit(this.filterOptionsLocal);
   }
@@ -117,26 +116,30 @@ export class MapSearchComponent {
     this.filterOptionsLocal.parentCode = null;
     this.filterOptionsLocal.tags = event.item.name;
     if (this.dateFilter) {
-      this.filterOptionsLocal.startDate = this.startDate;
-      this.filterOptionsLocal.endDate = this.endDate;
+      this.filterOptionsLocal.startDate = this.periodLocal.startDate;
+      this.filterOptionsLocal.endDate = this.periodLocal.endDate;
     }
     this.onSearch.emit(this.filterOptionsLocal);
     this.searchTextLocal = { name: this.filterOptionsLocal.tags };
   }
 
   handleSelectPeriod(event: { startDate: Date, endDate: Date }) {
-    this.startDate = event.startDate;
-    this.endDate = event.endDate;   
-    this.handleCloseModal();
+    this.periodLocal = { startDate: event.startDate, endDate: event.endDate}
+    this.onPeriodChange.emit(this.periodLocal);
     this.startEndCaption = this.timespanService.getCaption(event.startDate, event.endDate, 4);
-    this.onSearch.emit(this.filterOptionsLocal);
+    if(this.dateFilter) {
+      this.filterOptionsLocal.startDate =event.startDate;
+      this.filterOptionsLocal.endDate = event.endDate;
+      this.onSearch.emit(this.filterOptionsLocal);
+    }
+    this.handleCloseModal();
   }
 
   handleChangeEnableDateFilter(enabled) {
     this.dateFilter = enabled;
     if (enabled) {
-      this.filterOptionsLocal.startDate = this.startDate;
-      this.filterOptionsLocal.endDate = this.endDate;
+      this.filterOptionsLocal.startDate = this.periodLocal.startDate;
+      this.filterOptionsLocal.endDate = this.periodLocal.endDate;
     } else {
       this.filterOptionsLocal.startDate = null;
       this.filterOptionsLocal.endDate = null;

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

@@ -33,8 +33,8 @@
     <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 [itemLayers]="state.overlayLayers"></fm-map-item-layers>
-    <fm-map-item-layers [itemLayer]="state.selectedItemLayer"></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>
     <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>
@@ -50,7 +50,7 @@
     <fm-map-file-drop-target [parentCode]="state.parentCode" (onFileDropped)="handleFileDropped($event)"></fm-map-file-drop-target>
 
     <div *ngIf="noContent">
-      <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"></fm-map-map-search>
+      <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)"></fm-map-map-search>
     </div>
     <div class="side-panel-container">
       <fm-side-panel [resizeable]="true" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false">

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

@@ -61,6 +61,7 @@ aol-map { position:absolute;width:100%;height:calc(100vh + 4rem);}
   top:0em;
   bottom: 7.1em;
   width: 100%;
+  pointer-events: none;
 }
 
 .fullscreen .side-panel-container {

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

@@ -11,6 +11,7 @@ import { DeviceService } from '@farmmaps/common';
 import * as mapReducers from '../../reducers/map.reducer';
 import * as mapActions from '../../actions/map.actions';
 import { IMapState} from '../../models/map.state';
+import { IQuery } from '../../reducers/map.reducer'
 import { ISelectedFeatures } from '../../models/selected.features';
 import { IItemLayer } from '../../models/item.layer';
 import { IListItem, IQueryState } from '@farmmaps/common';
@@ -73,8 +74,8 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   public searchCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetSearchCollapsed);
   public searchMinified$: Observable<boolean> = this.store.select(mapReducers.selectGetSearchMinified);
   public menuVisible$: Observable<boolean>;
-  public query$: Observable<IQueryState> =  this.store.select(mapReducers.selectGetQuery);
-  public position$: Observable<Position> = this.geolocationService.getCurrentPosition();
+  public query$: Observable<IQuery> =  this.store.select(mapReducers.selectGetQuery);
+  public position$: Observable<GeolocationPosition> = this.geolocationService.getCurrentPosition();
   public compassHeading$: Observable<number> = this.deviceorientationService.getCurrentCompassHeading();
   public baseLayersCollapsed:boolean = true;
   public overlayLayersCollapsed: boolean = true;
@@ -84,6 +85,8 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   private lastUrl = "";
   private initialized: boolean = false;
   public noContent: boolean = false;
+  public overrideSelectedItemLayer: boolean = false;
+  public overrideOverlayLayers: boolean = false;
   
   @ViewChild('map') map;
   @ViewChild('contentDiv') contentDiv: ElementRef;
@@ -99,28 +102,33 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     private zone: NgZone,
     private deviceorientationService:DeviceOrientationService,
     public devicesService:DeviceService) {
-      this.querySub = this.query$.pipe(skip(1), withLatestFrom(this.mapState$)).subscribe(([queryState,mapState]) =>{
-        if(queryState) {
+      if(route && route.snapshot && route.snapshot.data && route.snapshot.data["fm-map-map"]) {
+        let params = route.snapshot.data["fm-map-map"];
+        this.overrideSelectedItemLayer = params["overrideSelectedItemlayer"] ? params["overrideSelectedItemlayer"] : false;
+        this.overrideOverlayLayers = params["overrideOverlayLayers"] ? params["overrideOverlayLayers"] : false;
+      }
+      this.querySub = this.query$.pipe(skip(1), withLatestFrom(this.mapState$)).subscribe(([query,mapState]) =>{
+        if(query && query.querystate) {
           let newQueryState = tassign(mapReducers.initialQueryState);
           console.debug(`Do Query`);
           let urlparts=[];
-          if (queryState.itemCode && queryState.itemCode != "") {
-            if(queryState.itemType && queryState.itemType!= "") {
-              let itemType = this.itemTypeService.itemTypes[queryState.itemType];
+          if (query.querystate.itemCode && query.querystate.itemCode != "") {
+            if(query.querystate.itemType && query.querystate.itemType!= "") {
+              let itemType = this.itemTypeService.itemTypes[query.querystate.itemType];
               if (itemType && itemType.viewer && itemType.viewer == "edit_in_editor" && itemType.editor) {
                 urlparts.push('/editor');
                 urlparts.push(itemType.editor);
                 urlparts.push('item');
-                urlparts.push(queryState.itemCode);
+                urlparts.push(query.querystate.itemCode);
               }
             }
           } else {
-            newQueryState= queryState;
+            newQueryState= query.querystate;
           }
           if(urlparts.length==0 ) {
-            newQueryState.itemCode = queryState.itemCode;
+            newQueryState.itemCode = query.querystate.itemCode;
             this.zone.run(() => {
-              this.replaceUrl(mapState,newQueryState,false);             
+              this.replaceUrl(mapState,newQueryState,query.replace);             
             })
           } else {
             this.router.navigate(urlparts);
@@ -426,6 +434,10 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     this.store.dispatch(new mapActions.SelectOverlayLayer(itemLayer));
   }
 
+  handlePeriodChange(period:IPeriodState) {
+    this.store.dispatch(new mapActions.SetPeriod(period));
+  }
+
   ngOnDestroy() {
     if (this.paramSub) this.paramSub.unsubscribe();
     if (this.itemTypeSub) this.itemTypeSub.unsubscribe();

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

@@ -1,10 +1,12 @@
 import { Injectable } from '@angular/core';
 
-import { Store, Action } from '@ngrx/store';
-import { Effect, Actions,ofType } from '@ngrx/effects';
+import { Store, Action,createFeatureSelector } from '@ngrx/store';
+import { ROUTER_NAVIGATED, RouterReducerState } from '@ngrx/router-store';
+import * as fromRouter from '@ngrx/router-store';
+import { createEffect, Actions,ofType } from '@ngrx/effects';
 
-import { EMPTY, Observable , of,merge} from 'rxjs';
-import { withLatestFrom, switchMap, map, catchError, mergeMap,tap } from 'rxjs/operators';
+import { EMPTY, Observable , of} from 'rxjs';
+import { withLatestFrom, switchMap, map, catchError, mergeMap } from 'rxjs/operators';
 
 import {GeoJSON,WKT} from 'ol/format';
 import {Feature} from 'ol';
@@ -29,25 +31,38 @@ import * as style from 'ol/style';
 import { ItemTypeService,IQueryState } from '@farmmaps/common';
 import { TemporalItemLayer } from '../models/item.layer'
 
+export const getRouterState = createFeatureSelector<RouterReducerState>('router');
+
+export const {
+  selectCurrentRoute,   // select the current route
+  selectQueryParams,    // select the current route query params
+  selectQueryParam,     // factory function to select a query param
+  selectRouteParams,    // select the current route params
+  selectRouteParam,     // factory function to select a route param
+  selectRouteData,      // select the current route data
+  selectUrl,            // select the current url
+} = fromRouter.getSelectors(getRouterState);
+
 
 @Injectable()
 export class MapEffects {
   private _geojsonFormat: GeoJSON;
   private _wktFormat: WKT;
+  private overrideSelectedItemLayer: boolean = false;
 
-  private toPointFeature(updateEvent:commonActions.DeviceUpdateEvent): Feature {
+  private updateFeatureGeometry(feature:Feature, updateEvent:commonActions.DeviceUpdateEvent): Feature {
+    let newFeature = feature.clone();
     var f = this._wktFormat.readFeature(updateEvent.attributes["geometry"],{
       dataProjection: 'EPSG:4326',
       featureProjection: 'EPSG:3857'
     });
-    f.setId(updateEvent.itemCode);
     var centroid = getCenter(f.getGeometry().getExtent());
-    f.setGeometry(new Point(centroid));
-    return f;
+    newFeature.setId(feature.getId());
+    newFeature.setGeometry(new Point(centroid));
+    return newFeature;
   }
 
-  @Effect()
-  init$: Observable<Action> = this.actions$.pipe(
+  init$ =  createEffect(() => this.actions$.pipe(
     ofType(mapActions.INIT),
     withLatestFrom(this.store$.select(commonReducers.selectGetRootItems)),
     switchMap(([action, rootItems]) => {
@@ -87,25 +102,23 @@ export class MapEffects {
 
       return actions;
     }
-    ));
+    )));
 
-  @Effect()
-  initBaseLayers$: Observable<Action> = this.actions$.pipe(
+  initBaseLayers$ =  createEffect(() => this.actions$.pipe(
     ofType(mapActions.INIT),
     withLatestFrom(this.store$.select(mapReducers.selectGetProjection)),
-    map(([action, projection]) => new mapActions.LoadBaseLayers(projection)));
+    map(([action, projection]) => new mapActions.LoadBaseLayers(projection)))
+  );
 
-  @Effect()
-  loadBaseLayers$: Observable<Action> = this.actions$.pipe(
+  loadBaseLayers$ =  createEffect(() => this.actions$.pipe(
     ofType(mapActions.LOADBASELAYERS),
     switchMap((action: mapActions.LoadBaseLayers) => {
       return this.itemService$.getItemList("vnd.farmmaps.itemtype.layer", { "isBaseLayer": true }).pipe(
         map((items: IItem[]) => new mapActions.LoadBaseLayersSuccess(items)),
         catchError(error => of(new commonActions.Fail(error))));
-    }));
+    })));
 
-  @Effect()
-  startSearch$: Observable<Action> = this.actions$.pipe(
+  startSearch$ =  createEffect(() => this.actions$.pipe(
     ofType(mapActions.STARTSEARCH),
     switchMap((action) => {
       let a = action as mapActions.StartSearch;
@@ -128,11 +141,10 @@ export class MapEffects {
         return [];
       }
       return newAction;
-    }));
+    })));
 
 
-  @Effect()
-  zoomToExtent$: Observable<Action> = this.actions$.pipe(
+  zoomToExtent$ =  createEffect(() => this.actions$.pipe(
     ofType(mapActions.STARTSEARCHSUCCESS),
     mergeMap((action: mapActions.StartSearchSuccess) => {
       let actions =[];
@@ -149,10 +161,9 @@ export class MapEffects {
         }
       }
       return actions;
-    }));
+    })));
 
-    @Effect()
-    zoomToExtent2$: Observable<Action> = this.actions$.pipe(
+    zoomToExtent2$ =  createEffect(() => this.actions$.pipe(
       ofType(mapActions.SETFEATURES),
       switchMap((action: mapActions.SetFeatures) => {
         let extent = createEmpty();
@@ -163,17 +174,15 @@ export class MapEffects {
           if(action.features.length>0) return of(new mapActions.SetExtent(extent));
         }        
         return EMPTY;
-      }));
+      })));
 
-  @Effect()
-  hideMenu$: Observable<Action> = this.actions$.pipe(
+  hideMenu$ =  createEffect(() => this.actions$.pipe(
     ofType(mapActions.STARTSEARCHSUCCESS),
     mergeMap((action: mapActions.StartSearchSuccess) => {
       return of(new commonActions.SetMenuVisible(false));
-    }));
+    })));
 
-  @Effect()
-  selectItem$: Observable<Action> = this.actions$.pipe(
+  selectItem$ =  createEffect(() => this.actions$.pipe(
     ofType(mapActions.SELECTITEM),
     withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItem)),
       switchMap(([action, selectedItem]) => {
@@ -194,32 +203,33 @@ export class MapEffects {
           return [];
         }
       }
-    ));
+    )));
 
-    @Effect()
-    selectItemSuccessSetLayer$: Observable<Action> = this.actions$.pipe(
+    selectItemSuccessSetLayer$ =  createEffect(() => this.actions$.pipe(
       ofType(mapActions.SELECTITEMSUCCESS),
       map((action:mapActions.SelectItemSuccess) => 
          new mapActions.SetSelectedItemLayer(action.item)
         )
-      );
+      ));
 
-  @Effect()
-  selectItemSuccess$: Observable<Action> = this.actions$.pipe(
+  selectItemSuccess$ =  createEffect(() => this.actions$.pipe(
     ofType(mapActions.SELECTITEMSUCCESS),
-    switchMap((action:mapActions.SelectItemSuccess) => {
-      return this.itemService$.getFeature(action.item.code, "EPSG:3857").pipe(
-        map((feature: any) => {
-          let f = this._geojsonFormat.readFeature(feature);
-          f.setId(action.item.code);
-          return new mapActions.AddFeatureSuccess(f );
-        }),
-        catchError(error => of(new commonActions.Fail(error))));
+    switchMap((action:mapActions.SelectItemSuccess) => {  
+      if(!this.overrideSelectedItemLayer) {
+        return this.itemService$.getFeature(action.item.code, "EPSG:3857").pipe(
+          map((feature: any) => {
+            let f = this._geojsonFormat.readFeature(feature);
+            f.setId(action.item.code);
+            return new mapActions.AddFeatureSuccess(f );
+          }),
+          catchError(error => of(new commonActions.Fail(error))));  
+      } else {
+        return EMPTY;
+      }
     }
-    ));
+    )));
 
-    @Effect()
-    selectItemSuccessTemporal$: Observable<Action> = this.actions$.pipe(
+    selectItemSuccessTemporal$ =  createEffect(() => this.actions$.pipe(
       ofType(mapActions.SELECTITEMSUCCESS),
       switchMap((action:mapActions.SelectItemSuccess) => {
         if(action.item.itemType == "vnd.farmmaps.itemtype.temporal") {
@@ -234,16 +244,14 @@ export class MapEffects {
            return [];
         }
       }
-      ));
+      )));
 
-  @Effect()
-  uploadedItemClick$: Observable<Action> = this.actions$.pipe(
+  uploadedItemClick$ =  createEffect(() => this.actions$.pipe(
       ofType(commonActions.UPLOADEDFILECLICK),
-      switchMap((action: commonActions.UploadedFileClick) => of(new mapActions.DoQuery(tassign(mapReducers.initialState.query, {itemCode:action.itemCode})))
-    ));
+      switchMap((action: commonActions.UploadedFileClick) => of(new mapActions.DoQuery(tassign(mapReducers.initialState.query.querystate, {itemCode:action.itemCode})))
+    )));
 
-  @Effect()
-  featureUpdate$: Observable<Action> = this.actions$.pipe(
+  featureUpdate$ =  createEffect(() => this.actions$.pipe(
     ofType(commonActions.DEVICEUPDATEEVENT),
     withLatestFrom(this.store$.select(mapReducers.selectGetFeatures)),
     mergeMap(([action, features]) => {
@@ -256,14 +264,13 @@ export class MapEffects {
         }
       }
       if (feature) {
-        return of(new mapActions.UpdateFeatureSuccess(this.toPointFeature(deviceUpdateEventAction)));
+        return of(new mapActions.UpdateFeatureSuccess(this.updateFeatureGeometry(feature,deviceUpdateEventAction)));
       } else {
         return [];
       }
-    }));
+    })));
 
-  @Effect()
-  itemUpdate$: Observable<Action> = this.actions$.pipe(
+  itemUpdate$ =  createEffect(() => this.actions$.pipe(
     ofType(commonActions.ITEMCHANGEDEVENT),
     withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItem)),
     mergeMap(([action, selectedItem]) => {
@@ -282,7 +289,7 @@ export class MapEffects {
       } else {
         return [];
       }
-    }));
+    })));
 
   getActionFromQueryState(queryState:IQueryState, inSearch:boolean):Observable<Action>|[] {
     if(!inSearch && (queryState.itemType || queryState.parentCode || queryState.itemCode || queryState.query || queryState.tags)) {
@@ -299,8 +306,7 @@ export class MapEffects {
     return of(newAction);
   }
 
-   @Effect()
-   getLayerValue$: Observable<Action> = this.actions$.pipe(
+   getLayerValue$ =  createEffect(() => this.actions$.pipe(
     ofType(mapActions.GETLAYERVALUE),
     mergeMap((action:mapActions.GetLayerValue) => {
       var l = action.itemLayer.item.data["layers"][action.itemLayer.layerIndex];
@@ -311,7 +317,7 @@ export class MapEffects {
           if(v !== null) {
             if(l.renderer && l.renderer.colorMap && l.renderer.colorMap.colormapType == "manual") {
               l.renderer.colorMap.entries.forEach((e) => {
-                  if(e.value == v) {
+                  if(e.value == v && e.label) {
                     v=e.label;
                     return;
                   }
@@ -324,19 +330,17 @@ export class MapEffects {
           return a;
         }))
       }
-  ));
+  )));
 
-  @Effect()
-  updateLayerValuesOnLayerAddedOrRemoved$: Observable<Action> = this.actions$.pipe(
-     ofType(mapActions.ADDLAYER,mapActions.REMOVELAYER,mapActions.SELECTITEM,mapActions.NEXTTEMPORAL,mapActions.PREVIOUSTEMPORAL,mapActions.TOGGLELAYERVALUESENABLED),
+  updateLayerValuesOnLayerAddedOrRemoved$ =  createEffect(() => this.actions$.pipe(
+     ofType(mapActions.ADDLAYER,mapActions.REMOVELAYER,mapActions.SELECTITEMSUCCESS,mapActions.SELECTTEMPORALITEMSSUCCESS, mapActions.NEXTTEMPORAL,mapActions.PREVIOUSTEMPORAL,mapActions.TOGGLELAYERVALUESENABLED,mapActions.SETLAYERINDEX,mapActions.SETSELECTEDITEMLAYER),
      withLatestFrom(this.store$.select(mapReducers.selectGetLayerValuesX)),
      withLatestFrom(this.store$.select(mapReducers.selectGetLayerValuesY)),
      map(([[action,x],y]) => new mapActions.SetLayerValuesLocation(x,y))
-  );
+  ));
 
 
-  @Effect()
-  getLayerValues$: Observable<Action> = this.actions$.pipe(
+  getLayerValues$ =  createEffect(() => this.actions$.pipe(
     ofType(mapActions.SETLAYERVALUESLOCATION),
     withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItemLayer)),
     withLatestFrom(this.store$.select(mapReducers.selectGetLayerValuesEnabled)),
@@ -362,20 +366,18 @@ export class MapEffects {
          });
       } 
       return actions;
-    }));
+    })));
     
 
-  @Effect()
-  setState$: Observable<Action> = this.actions$.pipe(
+   setState$ =  createEffect(() => this.actions$.pipe(
     ofType(mapActions.SETSTATE),
     withLatestFrom(this.store$.select(mapReducers.selectGetInSearch)),
     switchMap(([action,inSearch]) => {
       let a = action as mapActions.SetState;
       return this.getActionFromQueryState(a.queryState,inSearch);
-    }));
+    })));
 
-    @Effect()
-    escape$:Observable<Action> = this.actions$.pipe(
+    escape$ =  createEffect(() => this.actions$.pipe(
       ofType(commonActions.ESCAPE),
       switchMap((action) => {
         let a = action as commonActions.Escape;
@@ -384,10 +386,24 @@ export class MapEffects {
         } else {
           return EMPTY;
         }       
-      }));
+      })));
 
-    constructor(private actions$: Actions, private store$: Store<mapReducers.State>, private folderService$: FolderService, private itemService$: ItemService,private featureIconService$:FeatureIconService,private itemTypeService$:ItemTypeService) {
+      setOverride$ = createEffect(() => this.actions$.pipe(
+        ofType(ROUTER_NAVIGATED),
+        switchMap(() => this.store$.select(selectRouteData as any)),
+        switchMap((data: any) => {
+          if(data && data["fm-map-map"]) {
+            let params = data["fm-map-map"];
+            this.overrideSelectedItemLayer = params["overrideSelectedItemlayer"] ? params["overrideSelectedItemlayer"] : false;
+          } else {
+            this.overrideSelectedItemLayer = false;
+          }
+          return [];
+        })
+      ));
+
+  constructor(private actions$: Actions, private store$: Store<mapReducers.State>, private folderService$: FolderService, private itemService$: ItemService,private featureIconService$:FeatureIconService,private itemTypeService$:ItemTypeService) {
     this._geojsonFormat = new GeoJSON();
-    this._wktFormat = new WKT();
-  }  
+    this._wktFormat = new WKT();  
+   }  
 }

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

@@ -3,7 +3,7 @@ import { IItem,Item } from '@farmmaps/common';
 import { IItemLayer,ItemLayer,ITemporalItemLayer,TemporalItemLayer} from '../models/item.layer';
 import { IMapState} from '../models/map.state';
 import { IQueryState} from '@farmmaps/common';
-import { IPeriodState} from '../models/period.state';
+import { IPeriodState } from '../models/period.state';
 import { IStyles} from '../models/style.cache';
 import { ILayervalue } from '../models/layer.value';
 import * as mapActions from '../actions/map.actions';
@@ -33,12 +33,17 @@ export const initialQueryState: IQueryState = {
   bbox: []
 };
 
+export interface IQuery {
+  querystate: IQueryState,
+  replace: boolean
+}
+
 export interface State {
   period:IPeriodState,
   mapState: IMapState,
   viewExtent: number[],
   queryState: IQueryState,
-  query:IQueryState,
+  query:IQuery,
   parentCode: string,
   features: Array<Feature>,
   panelVisible: boolean,
@@ -297,8 +302,18 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
     case mapActions.DOQUERY: {
       let a = action as mapActions.DoQuery;
       return tassign(state, {
-        query: tassign(a.query, { bbox: a.query.bboxFilter ? state.viewExtent : [] })});
+        query: tassign(state.query,
+          {
+            querystate: tassign(a.query, { bbox: a.query.bboxFilter ? state.viewExtent : [] }),  
+            replace:a.replace
+          })
+      })
     }
+
+    case mapActions.SETPERIOD: {
+       return tassign(state,{ period: action.period});
+    }
+
     case mapActions.ADDFEATURESUCCESS: {
       let a = action as mapActions.AddFeatureSuccess;
       let features = state.features.slice();
@@ -507,6 +522,30 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       v.push(a.layervalue);
       return tassign(state,{layerValues:v});
     }
+    case commonActions.ITEMDELETEDEVENT:{
+      let a= action as commonActions.ItemDeletedEvent;
+      if(state.selectedItem && state.selectedItem.code == a.itemCode) {
+         return tassign(state,{  
+          selectedItem: null,
+          selectedItemLayer: null,
+          features:[]
+         });
+      }
+      if(state.features.length>0)  {
+        var index = -1;
+        for (var i = 0; i < state.features.length; i++) {
+          if (state.features[i].getId() == a.itemCode ) {
+            index=i;
+          }
+        }
+        if(index>=0) {
+          let newFeatures = state.features.slice(0);
+          newFeatures.splice(index,1);
+          return tassign(state,{features:newFeatures});
+        }
+      }
+      return state;
+    }
     default: {
       return state;
     }

projects/common-map/src/fm-map/services/geolocation.service.ts

@@ -9,14 +9,14 @@ import { Observer, Observable,BehaviorSubject } from 'rxjs';
 @Injectable()
 export class GeolocationService {
 
-  private positionObserver$:BehaviorSubject<Position>  = new BehaviorSubject<Position>(null);
+  private positionObserver$:BehaviorSubject<GeolocationPosition>  = new BehaviorSubject<GeolocationPosition>(null);
 
   constructor() {
     navigator.geolocation.watchPosition(
-      (position: Position) => {
+      (position: GeolocationPosition) => {
         this.positionObserver$.next(position);
       },
-      (error: PositionError) => {
+      (error: GeolocationPositionError) => {
         console.debug('Geolocation service: ' + error.message);
       },
       {
@@ -28,7 +28,7 @@ export class GeolocationService {
   }
 
 
-  getCurrentPosition(): Observable<Position> {
+  getCurrentPosition(): Observable<GeolocationPosition> {
     return this.positionObserver$;
   }
 }

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

@@ -17,6 +17,7 @@ import { EventService } from './services/event.service';
 import { TypeaheadService } from './services/typeahead.service';
 import { UserService } from './services/user.service';
 import { ImageService } from './services/image.service';
+import { GeolocatorService } from './services/geolocator.service';
 import { WeatherService} from './services/weather.service';
 import { AppConfig } from './shared/app.config';
 import { AccessTokenInterceptor } from "./shared/accesstoken.interceptor";
@@ -44,6 +45,7 @@ export {
   TypeaheadService,
   UserService,
   ImageService,
+  GeolocatorService,
   WeatherService,
   AppConfig,
   AccessTokenInterceptor,

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

@@ -7,6 +7,7 @@
   transition: left 0.2s, top 0.2s;
   background-color: white;
   box-shadow: 0 0 20px rgba(0, 0, 0, 0.3);
+  pointer-events: all;
 }
 
 .side-panel.resizing {

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

@@ -1,9 +1,9 @@
 <div #thumbnail class="thumbnail" [style.background-color]="itemTypeService.getColor(item.itemType)" >
     <div class="content">
-        <img *ngIf="item.thumbnail" class="card-img-top" [src]="getThumbnailUrl(item)" />
-        <div *ngIf="!item.thumbnail" class="large-icon" [style.font-size]="getFontSize()" [style.line-height]="getLineHeight()"><i [ngClass]="itemTypeService.getIcon(item.itemType)"></i></div>
+        <img *ngIf="hasThumbnail()" class="card-img-top" [src]="getThumbnailUrl(item)" />
+        <div *ngIf="!hasThumbnail()" class="large-icon" [style.font-size]="getFontSize()" [style.line-height]="getLineHeight()"><i [ngClass]="itemTypeService.getIcon(item.itemType)"></i></div>
         <div *ngIf="canEdit()" class="edit btn btn-secondary rounded-circle" (click)="onEditClick()"><i class="fal fa-camera"></i></div>
     </div>
 </div>
 
-<fm-edit-image-modal #modal (changed)="onChanged()"></fm-edit-image-modal>
+<fm-edit-image-modal #modal (changed)="onChanged($event)"></fm-edit-image-modal>

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

@@ -1,7 +1,8 @@
-import { Component,Input ,ViewChild,ElementRef,ChangeDetectorRef} from '@angular/core';
+import { Component,Input ,ViewChild,ElementRef,ChangeDetectorRef, Output,EventEmitter} from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { IListItem  } from '../../models/list.item';
+import { ImageService } from '../../services/image.service';
 import { commonReducers,ItemTypeService } from '../../../public-api'
 import { EditImageModalComponent} from '../edit-image-modal/edit-image-modal.component';
 import { AppConfig } from "../../shared/app.config";
@@ -16,14 +17,25 @@ import { AppConfig } from "../../shared/app.config";
   export class ThumbnailComponent {
     @Input() public item: IListItem;
     @Input() public edit: boolean = false;
+    @Input() public save: boolean = true;
+    @Output() changed = new EventEmitter();
     @ViewChild('thumbnail') el:ElementRef;
     @ViewChild('modal') modal:EditImageModalComponent;
 
-    constructor(public store: Store<commonReducers.State>, public itemTypeService: ItemTypeService,public appConfig: AppConfig,private changeDetector:ChangeDetectorRef) {
+    public image = null;
+    private endpoint = "";
+    public thumnailUrl = "";
+
+    constructor(public store: Store<commonReducers.State>, public itemTypeService: ItemTypeService,public appConfig: AppConfig,private changeDetector:ChangeDetectorRef,public imageService:ImageService) {
     }
 
     getThumbnailUrl(item:IListItem):string {
-        return this.appConfig.getConfig("apiEndPoint")+item.url+'/thumbnail?v=' + Date.parse(item.updated);
+        if(this.image == null && this.item.thumbnail) {
+            this.thumnailUrl = this.appConfig.getConfig("apiEndPoint")+item.url+'/thumbnail?v=' + Date.parse(item.updated);
+        } else if (this.image == null) {
+            this.thumnailUrl = "";
+        } 
+        return this.thumnailUrl;
     }
 
     getFontSize():string {        
@@ -47,15 +59,28 @@ import { AppConfig } from "../../shared/app.config";
         return this.edit && this.item != null;
     }
 
-    onEditClick() {
-       var endpoint = `${this.appConfig.getConfig("apiEndPoint")}/api/v1/items/${this.item.code}/thumbnail`;
-       this.modal.open(endpoint,4/3);
+    hasThumbnail():boolean {
+        return (this.item && this.item.thumbnail) || this.image != null;
     }
 
-    onChanged() {
-        if(this.item) {
-            this.item.updated = new Date(new Date().getTime()).toISOString();
-            this.changeDetector.detectChanges();
-        }
+    onEditClick() {
+       this.endpoint = `${this.appConfig.getConfig("apiEndPoint")}/api/v1/items/${this.item.code}/thumbnail`;
+       this.modal.open(this.endpoint,4/3,false,200,false);
     }
+
+    onChanged(event:any) {
+        this.image = event.croppedImage;
+        this.imageService.blobToDataUrl(event.croppedImage).then(url => {
+           this.thumnailUrl = url
+           this.changeDetector.detectChanges();           
+           if(this.save) this.saveImage();
+           this.changed.emit(event.croppedImage);
+        });                
+    }
+
+    saveImage() {
+        if(this.image) {
+          this.imageService.putImage(this.endpoint,this.image).subscribe(() => {});      
+        }
+      }
   }

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

@@ -1,9 +1,9 @@
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 import { OAuthService,UserInfo } from 'angular-oauth2-oidc';
-import { Store, Action } from '@ngrx/store';
-import { Effect, Actions,ofType } from '@ngrx/effects';
-import { Observable ,  defer ,  of,from,zip } from 'rxjs';
+import { Store } from '@ngrx/store';
+import { Actions,ofType,createEffect } from '@ngrx/effects';
+import { of,from,zip } from 'rxjs';
 import { withLatestFrom,mergeMap,switchMap,map,catchError,first} from 'rxjs/operators';
 import * as appCommonActions from '../actions/app-common.actions';
 import * as appCommonReducers from '../reducers/app-common.reducer';
@@ -12,43 +12,37 @@ import { FolderService } from '../services/folder.service';
 import { UserService } from '../services/user.service';
 import { IItemTypes } from '../models/item.types';
 import { IListItem } from '../models/list.item';
-import { IUser } from '../models/user';
-import {IQueryState} from '../models/query.state';
 import {StateSerializerService} from '../services/state-serializer.service';
 
 @Injectable()
 export class AppCommonEffects {
 
-  @Effect({ dispatch: false })
-  login$: Observable<Action> = this.actions$.pipe(
+  login$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.LOGIN),
     withLatestFrom(this.store$.select(appCommonReducers.selectGetInitialized)),
     mergeMap(([action, initialized]) => {
       var a = (action as appCommonActions.Login);
       this.oauthService$.initCodeFlow(a.url,{"prompt":"login"});
       return [];
-    }));
+    })),{dispatch:false});
 
-    @Effect({ dispatch: false })
-    logout$: Observable<Action> = this.actions$.pipe(
+    logout$ =  createEffect(() => this.actions$.pipe(
       ofType(appCommonActions.LOGOUT),
       mergeMap((action) => {
         this.oauthService$.revokeTokenAndLogout();
         return [];
-      }));
+      })),{dispatch:false});
 
-  @Effect()
-  loadItemTypes$: Observable<Action> = this.actions$.pipe(
+  loadItemTypes$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.LOADITEMTYPES),
     switchMap((action) => {
       return this.itemService$.getItemTypes().pipe(
         map((itemTypes: IItemTypes) => new appCommonActions.LoadItemTypesSuccess(itemTypes)),
         catchError(error => of(new appCommonActions.Fail(error))))
       }
-  ));
+  )));
 
-  @Effect()
-  initUser$: Observable<Action> = this.actions$.pipe(
+  initUser$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.INITUSER),
     first(),
     switchMap((action) => {
@@ -56,11 +50,10 @@ export class AppCommonEffects {
         switchMap(([user,userInfo]) => {return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))} ),
         catchError(error => of(new appCommonActions.Fail(error))))
     }
-  ));
+  )));
     
 
-  @Effect()
-  initUserPackages$:Observable<Action> = this.actions$.pipe(
+  initUserPackages$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.INITUSERPACKAGES),
     switchMap(() => {
       return this.itemService$.getItemList('vnd.farmmaps.itemtype.package').pipe(
@@ -68,10 +61,9 @@ export class AppCommonEffects {
         catchError(error =>  of(new appCommonActions.Fail(error)))
       )
     })
-  );
+  ));
 
-  @Effect()
-  userPackagesChanged$:Observable<Action> = this.actions$.pipe(
+  userPackagesChanged$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.ITEMCHANGEDEVENT),
     switchMap((action) => {
       let a = action as appCommonActions.ItemChangedEvent;
@@ -80,10 +72,9 @@ export class AppCommonEffects {
       else
         return [];
     })
-  );
+  ));
   
-  @Effect()
-  initUserSettingsRoot$:Observable<Action> = this.actions$.pipe(
+  initUserSettingsRoot$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.INITUSERSETTINGSROOT),
     withLatestFrom(this.store$.select(appCommonReducers.SelectGetUser)),
     switchMap(([, user]) => {
@@ -92,10 +83,9 @@ export class AppCommonEffects {
         catchError(error =>  of(new appCommonActions.Fail(error)))
       )
     })
-  );
+  ));
 
-  @Effect()
-  initUserSettingsRootChanged$:Observable<Action> = this.actions$.pipe(
+  initUserSettingsRootChanged$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.ITEMCHANGEDEVENT),
     switchMap((action) => {
       let a = action as appCommonActions.ItemChangedEvent;
@@ -104,38 +94,34 @@ export class AppCommonEffects {
       else
         return [];
     })
-  );
+  ));
 
-  @Effect()
-  initUserSuccess$: Observable<Action> = this.actions$.pipe(
+  initUserSuccess$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.INITUSERSUCCESS),
     switchMap(() => {
       return [new appCommonActions.InitRoot(),new appCommonActions.InitUserPackages(),new appCommonActions.InitUserSettingsRoot()];
     }
-    ));
+    )));
 
-  @Effect()
-  initRoot$: Observable<Action> = this.actions$.pipe(
+  initRoot$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.INITROOT),
     switchMap(() => {
       return this.folderService$.getMyRoots().pipe(
         map((folders: IListItem[]) => new appCommonActions.InitRootSuccess(folders)),
         catchError(error => of(new appCommonActions.Fail(error))))
     }
-    ));
+    )));
 
-  @Effect()
-  deleteItems$: Observable<Action> = this.actions$.pipe(
+  deleteItems$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.DELETEITEMS),
     switchMap((action:appCommonActions.DeleteItems) => {
       return this.itemService$.deleteItems(action.itemCodes).pipe(
         map((deletedItemCodes: string[]) => new appCommonActions.DeleteItemsSuccess(deletedItemCodes)),
         catchError(error => of(new appCommonActions.Fail(error))))
     }
-  ));
+  )));
 
-  @Effect()
-  editItem$: Observable<Action> = this.actions$.pipe(
+  editItem$ =  createEffect(() => this.actions$.pipe(
       ofType(appCommonActions.EDITITEM),
       withLatestFrom(this.store$.select(appCommonReducers.selectGetItemTypes)),
       switchMap(([action, itemtypes]) => {
@@ -148,10 +134,9 @@ export class AppCommonEffects {
       this.router$.navigate(['/editor',editor,'item', a.item.code])
       return [];
     }
-  ));
+  )));
 
-  @Effect()
-  viewItem$: Observable<Action> = this.actions$.pipe(
+  viewItem$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.VIEWITEM),
     withLatestFrom(this.store$.select(appCommonReducers.selectGetItemTypes)),
     switchMap(([action, itemtypes]) => {
@@ -181,20 +166,18 @@ export class AppCommonEffects {
       }
       return [];
     }
-    ));
+    )));
 
  
-  @Effect({ dispatch: false })
-  fail$: Observable<Action> = this.actions$.pipe(
+  fail$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.FAIL),
     map((action) => {
       let failAction = action as appCommonActions.Fail;
       console.debug(failAction.payload)
       return null;
-    }));
+    })),{dispatch:false});
 
-    @Effect({ dispatch: false })
-    online$: Observable<Action> = this.actions$.pipe(
+    online$ =  createEffect(() => this.actions$.pipe(
       ofType(appCommonActions.ONLINE),
       switchMap((action) => {
           console.debug("Online: Check token");
@@ -206,7 +189,7 @@ export class AppCommonEffects {
             }
           }
           return of(undefined);
-      }));
+      })),{dispatch:false});
 
 
 

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

@@ -15,4 +15,5 @@ export interface IUser {
   cocNumber?: string;
   searchable: boolean;
   newsletter?: boolean;
+  language?: string;
 }

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

@@ -0,0 +1,21 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { IUser } from '../models/user';
+import { HttpClient,HttpHeaders } from "@angular/common/http";
+import { AppConfig } from "../shared/app.config";
+
+@Injectable({
+  providedIn: 'root',
+})
+export class GeolocatorService {
+  constructor(public httpClient: HttpClient, public appConfig: AppConfig) {
+  }
+
+  ApiEndpoint() {
+    return this.appConfig.getConfig("apiEndPoint");
+  }
+
+  geocode(address:string): Observable<any>  {
+    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/service/geocode?address=${address}`)   
+  }
+}

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

@@ -48,4 +48,18 @@ export class ImageService {
   blobToFile(blob:Blob, filename:string):File {
     return new File([blob],filename,{type:blob.type});
   }
+
+  blobToDataUrl(blob:File):Promise<string> {
+
+    return new Promise<string>((resolve) => {
+      let reader = new FileReader();
+      reader.addEventListener('error', () => {
+        resolve("");
+      });
+      reader.addEventListener("load", function () {
+        resolve(reader.result as string);
+      }, false);
+      reader.readAsDataURL(blob);
+    });
+  }
 }

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

@@ -65,7 +65,7 @@ export class ItemTypeService {
             })
             .catch(error => this.itemTypes = null);  
         } else {
-          return new Promise((resolve) => {resolve()});
+          return new Promise<void>((resolve) => {resolve()});
         }
       };
 }

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

@@ -28,7 +28,7 @@ export class PackageService {
     
     hasPackage(id:string):boolean {
        if(!this.packages$[id]) return false;
-       return this.packages$[id].enabled == true;
+       return this.packages$[id].enabled ? this.packages$[id].enabled == true : true;
     }
 
     postItemPackageTask(item: IItem, task: IItemTask): Observable<IItemTask> {

projects/common/src/fm/shared/app.config.factory.ts

@@ -10,7 +10,7 @@ import { IAuthconfigFactory } from './authconfigFactory';
 
 export function appConfigFactory(injector:Injector, appConfig: AppConfig, oauthService: OAuthService, authconfigFactory:IAuthconfigFactory,authStorage:OAuthStorage,itemtypeService:ItemTypeService): () => Promise<any> {
   return (): Promise<any> => {
-    return new Promise((resolve,reject) => {
+    return new Promise<void>((resolve,reject) => {
       appConfig.load().then(() => {            
         oauthService.configure(authconfigFactory.getAuthConfig(appConfig));
         oauthService.setStorage(authStorage);

projects/common/tsconfig.lib.prod.json

@@ -0,0 +1,40 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../out-tsc/lib",
+    "target": "es2015",
+    "module": "es2015",
+    "moduleResolution": "node",
+    "declaration": true,
+    "sourceMap": true,
+    "inlineSources": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "importHelpers": true,
+    "esModuleInterop": true,
+    "types": [],
+    "lib": [
+      "dom",
+      "es2018"
+    ],
+    "paths": {
+      "@angular/*": [
+
+      "node_modules/@angular/*"
+
+      ]
+    }
+  },
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true,
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true,
+    "enableResourceInlining": true,
+    "enableIvy": false
+  },
+  "exclude": [
+    "src/test.ts",
+    "**/*.spec.ts"
+  ]
+}

src/app/app-routing.module.ts

@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { RouterModule, UrlSegment } from '@angular/router';
+import { RouterModule, UrlSegment, ExtraOptions } from '@angular/router';
 
 import { AuthGuard, FullScreenGuard } from '@farmmaps/common';
 //import { MapComponent } from '@farmmaps/common-map';
@@ -78,7 +78,7 @@ const routes = [
 
 @NgModule({
   imports: [RouterModule.forRoot(routes,
-    { initialNavigation: true })], // ,  enableTracing: true
+    { initialNavigation: 'enabledBlocking' })], // ,  enableTracing: true
   exports: [RouterModule]
 })
 export class AppRoutingModule { }

src/app/app.module.ts

@@ -13,7 +13,7 @@ import {AppRootComponent} from './app.component';
 
 import {StoreModule, ActionReducer,MetaReducer} from '@ngrx/store';
 import {EffectsModule, EffectSources} from '@ngrx/effects';
-import { StoreRouterConnectingModule} from '@ngrx/router-store';
+import { StoreRouterConnectingModule,routerReducer} from '@ngrx/router-store';
 
 import {AppRoutingModule} from './app-routing.module';
 import { LogoComponent } from './logo/logo.component';
@@ -76,13 +76,14 @@ export const metaReducers: MetaReducer<any>[] = [debug];
     AppCommonModule,
     AppCommonServiceModule.forRoot(),
     BrowserModule,
-    StoreModule.forRoot({},{metaReducers,runtimeChecks: { // TODO fix this should all be true
+    StoreModule.forRoot({router:routerReducer},{metaReducers,runtimeChecks: { // TODO fix this should all be true
 			strictStateImmutability: false,
 			strictActionImmutability: false,
 			strictStateSerializability: false,
 			strictActionSerializability: false
-		}}),
-    EffectsModule.forRoot([])
+    }}),
+    StoreRouterConnectingModule.forRoot({stateKey:"router"}),
+    EffectsModule.forRoot([]),   
   ],
   providers: [
     AuthConfigFactory,