Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop

This reverts commit 9c16681b58.

.gitignore

@@ -22,6 +22,7 @@ speed-measure-plugin.json
 *.launch
 .settings/
 *.sublime-workspace
+.vs/*
 
 # IDE - VSCode
 .vscode/*

.npmrc

@@ -0,0 +1 @@
+@FarmMaps:registry=https://repository.akkerweb.nl/repository/npm-group/

README.md

@@ -16,8 +16,8 @@ Use one of the two options below to get started.
 *Setup*
 
 ```
-docker pull node:10.16.0
-docker run -t -i --entrypoint /bin/bash -p 4200:4200 node:10.16.0
+docker pull node:12.13.1
+docker run -t -i --entrypoint /bin/bash -p 4200:4200 node:12.13.1
 ```
 
 Inside the running container 

angular.json

@@ -13,6 +13,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "aot": true,
             "outputPath": "dist/farmmaps-lib-app",
             "index": "src/index.html",
             "main": "src/main.ts",
@@ -66,7 +67,11 @@
                 {
                   "type": "initial",
                   "maximumWarning": "2mb",
-                  "maximumError": "5mb"
+                  "maximumError": "7mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
                 }
               ]
             }
@@ -160,7 +165,12 @@
             "tsConfig": "projects/common/tsconfig.lib.json",
             "project": "projects/common/ng-package.json"           
           }
-        },
+        ,          "configurations": {
+            "production": {
+              "tsConfig": "projects/common/tsconfig.lib.prod.json"
+            }
+          }
+},
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
@@ -195,7 +205,12 @@
             "tsConfig": "projects/common-map/tsconfig.lib.json",
             "project": "projects/common-map/ng-package.json"
           }
-        },
+        ,          "configurations": {
+            "production": {
+              "tsConfig": "projects/common-map/tsconfig.lib.prod.json"
+            }
+          }
+},
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {

package.json

@@ -11,53 +11,57 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~7.2.0",
-    "@angular/common": "~7.2.0",
-    "@angular/compiler": "~7.2.0",
-    "@angular/core": "~7.2.0",
-    "@angular/forms": "~7.2.0",
-    "@angular/platform-browser": "~7.2.0",
-    "@angular/platform-browser-dynamic": "~7.2.0",
-    "@angular/router": "~7.2.0",
-    "@aspnet/signalr": "^1.1.4",
-    "@farmmaps/common": ">=0.0.1-prerelease.69 <0.0.1",
-    "@farmmaps/common-map": ">=0.0.1-prerelease.69 <0.0.1",
-    "@ng-bootstrap/ng-bootstrap": "^4.2.1",
-    "@ngrx/effects": "^7.2.0",
-    "@ngrx/router-store": "^7.2.0",
-    "@ngrx/store": "^7.2.0",
-    "bootstrap": "^4.3.1",
+    "@angular/animations": "~9.1.0",
+    "@angular/common": "~9.1.0",
+    "@angular/compiler": "~9.1.0",
+    "@angular/core": "~9.1.0",
+    "@angular/forms": "~9.1.0",
+    "@angular/platform-browser": "~9.1.0",
+    "@angular/platform-browser-dynamic": "~9.1.0",
+    "@angular/router": "~9.1.0",
+    "@farmmaps/common": ">=0.0.1-prerelease.325 <0.0.1",
+    "@farmmaps/common-map": ">=0.0.1-prerelease.325 <0.0.1",
+    "@microsoft/signalr": "^3.1.3",
+    "@ng-bootstrap/ng-bootstrap": "^6.0",
+    "@ngrx/effects": "^9.0",
+    "@ngrx/router-store": "^9.0",
+    "@ngrx/store": "^9.0",
+    "angular-oauth2-oidc": "^9.1",
+    "bootstrap": "^4.4.1",
+    "core-js": "^2.6.11",
     "font-awesome": "^4.7.0",
-    "core-js": "^2.5.4",
-    "ngrx-store-localstorage": "^8.0.0",
+    "ngrx-store-localstorage": "^9.0",
+    "ngx-bootstrap": "^5.6.1",
+    "ngx-openlayers": "1.0.0-next.13",
+    "ngx-uploadx": "^3.5.1",
+    "ol": "6.1.1",
     "resumablejs": "^1.1.0",
-    "rxjs": "~6.3.3",
+    "rxjs": "^6.5.4",
     "tassign": "^1.0.0",
-    "zone.js": "~0.8.26"
+    "tslib": "^1.10.0",
+    "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.13.0",
-    "@angular-devkit/build-ng-packagr": "~0.13.0",
-    "@angular/cli": "~7.3.8",
-    "@angular/compiler-cli": "~7.2.0",
-    "@angular/language-service": "~7.2.0",
-    "@types/node": "~8.9.4",
+    "@angular-devkit/build-angular": "~0.901.0",
+    "@angular-devkit/build-ng-packagr": "~0.901.0",
+    "@angular/cli": "^9.1.0",
+    "@angular/compiler-cli": "~9.1.0",
+    "@angular/language-service": "~9.1.0",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.3",
-    "codelyzer": "~4.5.0",
+    "@types/node": "^12.11.1",
+    "codelyzer": "^5.1.2",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~4.0.0",
+    "karma": "^5.0.2",
     "karma-chrome-launcher": "~2.2.0",
     "karma-coverage-istanbul-reporter": "~2.0.1",
     "karma-jasmine": "~1.1.2",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "ng-packagr": "^4.2.0",
-    "protractor": "~5.4.0",
-    "ts-node": "~7.0.0",
-    "tsickle": ">=0.34.0",
-    "tslib": "^1.9.0",
+    "ng-packagr": "^9.0.0",
+    "protractor": "^5.4.4",
+    "ts-node": "^8.8.1",
     "tslint": "~5.11.0",
-    "typescript": "~3.2.2"
+    "typescript": "~3.8.3"
   }
 }

projects/common-map/package-lock.json

@@ -1,108 +1,5 @@
 {
   "name": "@farmmaps/common-map",
   "version": "0.0.1",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@farmmaps/common": {
-      "version": "0.0.1-prerelease.56",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.56.tgz",
-      "integrity": "sha512-m9KxWsLkTSz2JI074gIJH1kDR0PCLsFAug8oBjtlU/QxgBySrvqHCRiODpNmNWnFyNTZHqKHJQefn3Q9iAil4g==",
-      "requires": {
-        "angular-oauth2-oidc": "^5.0.2",
-        "ngx-uploadx": "^3.1.3",
-        "tslib": "^1.9.0"
-      }
-    },
-    "angular-oauth2-oidc": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/angular-oauth2-oidc/-/angular-oauth2-oidc-5.0.2.tgz",
-      "integrity": "sha512-jtOv4IWEjSFfBHVE4seWGWT/ZfWJ95QJ1JaFhVVGJEF64ibGuPwV3ztwTOUl98QHi/Yg4PXXDAisb31JnIbxBw==",
-      "requires": {
-        "jsrsasign": "^8.0.12",
-        "tslib": "^1.9.0"
-      }
-    },
-    "ieee754": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
-    },
-    "jsrsasign": {
-      "version": "8.0.12",
-      "resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-8.0.12.tgz",
-      "integrity": "sha1-Iqu5ZW00owuVMENnIINeicLlwxY="
-    },
-    "ngx-openlayers": {
-      "version": "1.0.0-next.9",
-      "resolved": "https://registry.npmjs.org/ngx-openlayers/-/ngx-openlayers-1.0.0-next.9.tgz",
-      "integrity": "sha512-14UFxJX9oeOXtq+HJCJyXn0sBmYmCqj2AnFtetKk1FsDe8EUMFGIRju8UOFegCr2oEu5JsuRjALcfW7lCe+teg==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "ngx-uploadx": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/ngx-uploadx/-/ngx-uploadx-3.3.2.tgz",
-      "integrity": "sha512-gRdXXq2cRU9HE6dj65qay9GV8NRC7n8y5LtMzJWqsfu2k3CHMQxo2TqZwA9/l/PqJ76RoO7sTPy1OenFQ+krkQ==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "ol": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/ol/-/ol-5.3.3.tgz",
-      "integrity": "sha512-7eU4x8YMduNcED1D5wI+AMWDRe7/1HmGfsbV+kFFROI9RNABU/6n4osj6Q3trZbxxKnK2DSRIjIRGwRHT/Z+Ww==",
-      "requires": {
-        "pbf": "3.1.0",
-        "pixelworks": "1.1.0",
-        "rbush": "2.0.2"
-      }
-    },
-    "pbf": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.1.0.tgz",
-      "integrity": "sha512-/hYJmIsTmh7fMkHAWWXJ5b8IKLWdjdlAFb3IHkRBn1XUhIYBChVGfVwmHEAV3UfXTxsP/AKfYTXTS/dCPxJd5w==",
-      "requires": {
-        "ieee754": "^1.1.6",
-        "resolve-protobuf-schema": "^2.0.0"
-      }
-    },
-    "pixelworks": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pixelworks/-/pixelworks-1.1.0.tgz",
-      "integrity": "sha1-Hwla1I3Ki/ihyCWOAJIDGkTyLKU="
-    },
-    "protocol-buffers-schema": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.3.2.tgz",
-      "integrity": "sha512-Xdayp8sB/mU+sUV4G7ws8xtYMGdQnxbeIfLjyO9TZZRJdztBGhlmbI5x1qcY4TG5hBkIKGnc28i7nXxaugu88w=="
-    },
-    "quickselect": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-1.1.1.tgz",
-      "integrity": "sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ=="
-    },
-    "rbush": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/rbush/-/rbush-2.0.2.tgz",
-      "integrity": "sha512-XBOuALcTm+O/H8G90b6pzu6nX6v2zCKiFG4BJho8a+bY6AER6t8uQUZdi5bomQc0AprCWhEGa7ncAbbRap0bRA==",
-      "requires": {
-        "quickselect": "^1.0.1"
-      }
-    },
-    "resolve-protobuf-schema": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
-      "integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==",
-      "requires": {
-        "protocol-buffers-schema": "^3.3.1"
-      }
-    },
-    "tslib": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
-    }
-  }
+  "lockfileVersion": 1
 }

projects/common-map/package.json

@@ -4,17 +4,15 @@
   "publishConfig": {
     "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
   },
-  "dependencies": {
-    "ngx-openlayers": "1.0.0-next.9",
-    "ol": "^5.3.3"
-  },
   "peerDependencies": {
-    "@angular/core": "^7.2.0",
-    "ngrx-store-localstorage": "^8.0.0",
-    "@ngrx/effects": "^7.2",
-    "@ngrx/router-store": "^7.2",
-    "@ngrx/store": "^7.2",
+    "@angular/core": "^9.1.0",
+    "ngrx-store-localstorage": "^9.0",
+    "@ngrx/effects": "^9.0",
+    "@ngrx/router-store": "^9.0",
+    "@ngrx/store": "^9.0",
     "tassign": "^1.0.0",
-    "@farmmaps/common": ">=0.0.1-prerelease.56 <0.0.1"
+    "@farmmaps/common": ">=0.0.1-prerelease.308 <0.0.1",
+    "ngx-openlayers": "1.0.0-next.13",
+    "ol": "6.1.1"
   }
 }

projects/common-map/src/fm-map/_theme.scss

@@ -1,2 +0,0 @@
-//$theme-colors: ( "primary": #a7ce39, "secondary": #ffc800 );
-//$theme-colors: ( "primary": #a7ce39);

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

@@ -1,9 +1,10 @@
 import { Action } from '@ngrx/store';
 
-import { IMapState,IItemLayer,IQueryState } from '../models';
+import { IMapState } from '../models/map.state';
+import { IItemLayer } from '../models/item.layer';
+import { IQueryState } from '@farmmaps/common';
 import { IItem } from '@farmmaps/common';
-import { Feature } from 'ol';
-import { Extent } from 'ol/extent';
+import { Feature,Style } from 'ol';
 
 export const SETSTATE = '[Map] SetState';
 export const SETMAPSTATE = '[Map] MapState';
@@ -15,11 +16,14 @@ export const STARTSEARCHSUCCESS = '[Map] StartSearchSuccess';
 export const SELECTFEATURE = '[Map] SelectFeature';
 export const SELECTITEM = '[Map] SelectItem';
 export const SELECTITEMSUCCESS = '[Map] SelectItemSuccess';
+export const SELECTTEMPORALITEMSSUCCESS = '[Map] SelectTemporalItemsSuccess';
+export const NEXTTEMPORAL = '[Map] NextTemporal';
+export const PREVIOUSTEMPORAL = '[Map] PreviousTemporal';
+export const SELECTTEMPORAL = '[Map] SelectTemporal';
 export const ADDFEATURESUCCESS = '[Map] AddFeatureSuccess';
 export const UPDATEFEATURESUCCESS = '[Map] UpdateFeatureSuccess';
 export const EXPANDSEARCH = '[Map] ExpandSearch';
 export const COLLAPSESEARCH = '[Map] CollapseSearch';
-export const TOGGLEMENU = '[Map] ToggleMenu';
 export const SETEXTENT = '[Map] SetExtent';
 export const SETQUERYSTATE = '[Map] SetQueryState';
 export const SETTIMESPAN = '[Map] SetTimeSpan';
@@ -34,6 +38,15 @@ export const SELECTBASELAYER = '[Map] SelectBaseLayers';
 export const SELECTOVERLAYLAYER = '[Map] SelectOverlayLayers';
 export const ZOOMTOEXTENT = '[Map] ZoomToExtent';
 export const DOQUERY = '[Map] DoQuery';
+export const SETSTYLE = '[Map] SetStyle';
+export const SHOWLAYERSWITCHER = '[Map] ShowLayerSwitcher';
+export const CLEAR = '[Map] Clear';
+export const SETREPLACEURL = '[Map] SetReplaceUrl';
+
+export class Clear implements Action {
+  readonly type = CLEAR;
+  constructor() {}
+}
 
 export class SetState implements Action {
   readonly type = SETSTATE;
@@ -74,7 +87,7 @@ export class StartSearch implements Action {
 export class StartSearchSuccess implements Action {
   readonly type = STARTSEARCHSUCCESS;
 
-  constructor(public features: Array<Feature>, public query:IQueryState) { }
+  constructor(public features: Array<Feature>, public query:IQueryState,public setStateCount:number) { }
 }
 
 export class SelectFeature implements Action {
@@ -92,7 +105,31 @@ export class SelectItem implements Action {
 export class SelectItemSuccess implements Action {
   readonly type = SELECTITEMSUCCESS;
 
-  constructor(public item: IItem) { }
+  constructor(public item: IItem, public parentItem: IItem) { }
+}
+
+export class SelectTemporalItemsSuccess implements Action {
+  readonly type = SELECTTEMPORALITEMSSUCCESS;
+
+  constructor(public temporalItems: IItem[]) { }
+}
+
+export class NextTemporal implements Action {
+  readonly type = NEXTTEMPORAL;
+
+  constructor() { }
+}
+
+export class PreviousTemporal implements Action {
+  readonly type = PREVIOUSTEMPORAL;
+
+  constructor() { }
+}
+
+export class SelectTemporal implements Action {
+  readonly type = SELECTTEMPORAL;
+
+  constructor(item:IItem) { }
 }
 
 export class AddFeatureSuccess implements Action {
@@ -119,12 +156,6 @@ export class CollapseSearch implements Action {
   constructor() { }
 }
 
-export class ToggleMenu implements Action {
-  readonly type = TOGGLEMENU;
-
-  constructor() { }
-}
-
 export class SetExtent implements Action {
   readonly type = SETEXTENT;
 
@@ -134,7 +165,7 @@ export class SetExtent implements Action {
 export class SetQueryState implements Action {
   readonly type = SETQUERYSTATE;
 
-  constructor(public queryState: IQueryState) { }
+  constructor(public queryState: IQueryState,public replaceUrl:boolean = true) { }
 }
 
 export class SetTimeSpan implements Action {
@@ -209,19 +240,39 @@ export class DoQuery implements Action {
   constructor(public query:IQueryState) { }
 }
 
+export class SetStyle implements Action {
+  readonly type = SETSTYLE;
+
+  constructor(public itemType:string,public style: Style | (Feature)) { }
+}
+
+export class ShowLayerSwitcher implements Action {
+  readonly type = SHOWLAYERSWITCHER;
+  constructor(public show:boolean) {}
+}
+
+export class SetReplaceUrl implements Action {
+  readonly type = SETREPLACEURL;
+  constructor(public replaceUrl:boolean) {}
+}
+
 export type Actions = SetMapState
   | Init
+  | Clear
   | SetParent
   | StartSearch
   | StartSearchSuccess
   | SelectFeature
   | SelectItem
   | SelectItemSuccess
+  | SelectTemporalItemsSuccess
+  | NextTemporal
+  | PreviousTemporal
+  | SelectTemporal
   | AddFeatureSuccess
   | UpdateFeatureSuccess
   | ExpandSearch
   | CollapseSearch
-  | ToggleMenu
   | SetExtent
   | SetQueryState
   | SetTimeSpan
@@ -237,5 +288,8 @@ export type Actions = SetMapState
   | ZoomToExtent
   | SetState
   | SetViewExtent
-  | DoQuery;
+  | DoQuery
+  | SetStyle
+  | ShowLayerSwitcher
+  | SetReplaceUrl;
 

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

@@ -5,7 +5,7 @@ import { AuthGuard } from '@farmmaps/common';
 
 const routes = [
     {
-    path: '', canActivateChild: [AuthGuard], children: [
+    path: '', children: [
             {
                 path: '',
                 component: MapComponent
@@ -13,7 +13,7 @@ const routes = [
         ]
     },
     {
-      path: ':xCenter/:yCenter/:zoom/:rotation/:baseLayer/:queryState', canActivateChild: [AuthGuard], children: [
+      path: ':xCenter/:yCenter/:zoom/:rotation/:baseLayer/:queryState', children: [
             {
                 path: '',
                 component: MapComponent

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

@@ -16,12 +16,11 @@ import * as mapReducers from './reducers/map.reducer';
 import * as mapActions from './actions/map.actions';
 import * as mapEffects from './effects/map.effects';
 
-import { IMapState} from './models';
-import { ISelectedFeatures } from './models';
-import { IItemLayer } from './models';
-import { ItemLayer} from './models';
-import { IQueryState } from './models';
-import { IPeriodState } from './models';
+import { IMapState} from './models/map.state';
+import { ISelectedFeatures } from './models/selected.features';
+import { IItemLayer } from './models/item.layer';
+import { ItemLayer} from './models/item.layer';
+import { IPeriodState } from './models/period.state';
 
 // components
 import { GpsLocation} from './components/aol/gps-location/gps-location.component';
@@ -35,6 +34,7 @@ import { AbstractItemListComponent,ItemListComponent} from './components/item-li
 import { AbstractSelectedItemComponent, SelectedItemComponent } from './components/selected-item/selected-item.component';
 import { SelectedItemCropfieldComponent } from './components/selected-item-cropfield/selected-item-cropfield.component';
 import { SelectedItemGeotiffComponent } from './components/selected-item-geotiff/selected-item-geotiff.component';
+import { SelectedItemTemporalComponent} from './components/selected-item-temporal/selected-item-temporal.component';
 import {SelectedItemShapeComponent } from './components/selected-item-shape/selected-item-shape.component';
 import { SelectedItemContainerComponent } from './components/selected-item-container/selected-item-container.component';
 import { AbstractFeatureListFeatureComponent, FeatureListFeatureComponent } from './components/feature-list-feature/feature-list-feature.component';
@@ -46,7 +46,6 @@ import { WidgetHostDirective} from './components/widget-host/widget-host.directi
 import { FeatureListComponent,AbstractFeatureListComponent} from './components/feature-list/feature-list.component';
 import { FileDropTargetComponent } from './components/aol/file-drop-target/file-drop-target.component';
 import { ItemVectorSourceComponent } from './components/aol/item-vector-source/item-vector-source.component';
-import { ItemFeaturesSourceComponent } from './components/aol/item-features-source/item-features-source.component';
 import { ItemLayersComponent } from './components/aol/item-layers/item-layers.component';
 import { ZoomToExtentComponent } from './components/aol/zoom-to-extent/zoom-to-extent.component';
 import { RotationResetComponent } from './components/aol/rotation-reset/rotation-reset.component';
@@ -54,18 +53,41 @@ import { LayerListComponent } from './components/aol/layer-list/layer-list.compo
 import { MetaDataModalComponent } from './components/meta-data-modal/meta-data-modal.component';
 import { SelectPeriodModalComponent } from './components/select-period-modal/select-period-modal.component';
 import { MapComponent } from './components/map/map.component';
-import { MapSearchComponent } from './components/map-search';
+import { MapSearchComponent } from './components/map-search/map-search.component';
 import { MapRoutingModule } from './common-map-routing.module';
 import { LegendComponent } from './components/legend/legend.component';
 import { LayerVectorImageComponent } from './components/aol/layer-vector-image/layer-vector-image.component';
-import { StateSerializerService } from './services/state-serializer.service';
+import {FeatureIconService} from './services/feature-icon.service';
 import { GeolocationService } from './services/geolocation.service';
-import { localStorageSync } from 'ngrx-store-localstorage';
+import {DeviceOrientationService} from './services/device-orientation.service';
 import { WidgetStatusComponent } from './components/widget-status/widget-status.component';
 import { ForChild} from './components/for-item/for-child.decorator';
 import {ForItemType } from './components/for-item/for-itemtype.decorator';
 import { ForSourceTask} from './components/for-item/for-sourcetask.decorator';
+import { ForPackage } from './components/for-item/for-package.decorator';
+import { PanToLocation} from './components/aol/pan-to-location/pan-to-location.component';
+import {LayerSwitcher} from './components/layer-switcher/layer-switcher.component';
 
+export function LocalStorageSync(reducer: ActionReducer<any>): ActionReducer<any> {
+  const r = function(state, action) {
+    const r2 = reducer(state, action);
+
+    if(action.type == "@ngrx/store/update-reducers") {
+        let ms = window.localStorage.getItem(MODULE_NAME+"_mapState");
+        if(ms) {
+          r2["mapState"] = JSON.parse(ms);
+        }
+    }
+    if(action.type == "[Map] MapState" || action.type == "[Map] SetState") {
+        window.localStorage.setItem(MODULE_NAME + "_mapState",JSON.stringify(r2["mapState"]));
+    }
+
+    return r2;
+  };
+  return r;
+ }
+
+const metaReducers: Array<MetaReducer<any, any>> = [LocalStorageSync];
 
 export {
   mapEffects,
@@ -73,7 +95,6 @@ export {
   mapActions,
   ZoomToExtentComponent,
   ItemVectorSourceComponent,
-  ItemFeaturesSourceComponent,
   ItemLayersComponent,
   FileDropTargetComponent,
   MapComponent,
@@ -97,6 +118,7 @@ export {
   SelectedItemComponent,
   SelectedItemCropfieldComponent,
   SelectedItemGeotiffComponent,
+  SelectedItemTemporalComponent,
   SelectedItemShapeComponent,
   ItemListItemComponent,
   ItemListItemContainerComponent,
@@ -104,23 +126,26 @@ export {
   ItemWidgetListComponent,
   WidgetStatusComponent,
   GpsLocation,
+  PanToLocation,
+  LayerSwitcher,
   AbstractFeatureListComponent,
   AbstractFeatureListFeatureComponent,
   AbstractSelectedItemComponent,
   AbstractItemWidgetComponent,
   AbstractItemListItemComponent,
   AbstractItemListComponent,
-  StateSerializerService,
+  FeatureIconService,
   GeolocationService,
+  DeviceOrientationService,
   IMapState,
   ISelectedFeatures,
   IItemLayer,
   ItemLayer,
-  IQueryState,
   IPeriodState,
   ForChild,
   ForItemType,
-  ForSourceTask
+  ForSourceTask,
+  ForPackage
 }
 
 @NgModule({  
@@ -128,7 +153,7 @@ export {
     CommonModule,
     AngularOpenlayersModule,
     MapRoutingModule,
-    StoreModule.forFeature(MODULE_NAME, mapReducers.reducer),
+    StoreModule.forFeature(MODULE_NAME, mapReducers.reducer,{metaReducers:metaReducers}),
     EffectsModule.forFeature([mapEffects.MapEffects]),
     NgbModule,
     FormsModule,
@@ -138,7 +163,6 @@ export {
   declarations: [
     ZoomToExtentComponent,
     ItemVectorSourceComponent,
-    ItemFeaturesSourceComponent,
     ItemLayersComponent,
     FileDropTargetComponent,
     MapComponent,
@@ -162,6 +186,7 @@ export {
     SelectedItemComponent,
     SelectedItemCropfieldComponent,
     SelectedItemGeotiffComponent,
+    SelectedItemTemporalComponent,
     SelectedItemShapeComponent,
     ItemListItemComponent,
     ItemListItemContainerComponent,
@@ -169,6 +194,8 @@ export {
     ItemWidgetListComponent,
     WidgetStatusComponent,
     GpsLocation,
+    PanToLocation,
+    LayerSwitcher
   ],
   entryComponents: [
     FeatureListComponent,
@@ -180,18 +207,20 @@ export {
     SelectedItemComponent,
     SelectedItemCropfieldComponent,
     SelectedItemGeotiffComponent,
+    SelectedItemTemporalComponent,
     SelectedItemShapeComponent,
     ItemListComponent,
     ItemListItemComponent,
   ],
   exports: [
        ItemVectorSourceComponent,
-       ItemFeaturesSourceComponent,
        ItemLayersComponent,
        FileDropTargetComponent,
        MetaDataModalComponent,
        MapComponent,
        GpsLocation,
+       PanToLocation,
+       LayerSwitcher,
        FeatureListFeatureComponent,
        FeatureListFeatureCropfieldComponent,
        FeatureListFeatureCroppingschemeComponent,
@@ -199,6 +228,7 @@ export {
        SelectedItemComponent,
        SelectedItemCropfieldComponent,
        SelectedItemGeotiffComponent,
+       SelectedItemTemporalComponent,
        SelectedItemShapeComponent,
        ItemListItemComponent,
        ItemListItemContainerComponent,
@@ -221,13 +251,15 @@ export {
   ]
 })
 
+
 export class AppCommonMapModule {
-  static forRoot(): ModuleWithProviders {
+  static forRoot(): ModuleWithProviders<AppCommonMapModule> {
     return {
       ngModule: AppCommonMapModule,      
       providers: [
-        StateSerializerService,
+        FeatureIconService,
         GeolocationService,
+        DeviceOrientationService,
         { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
         { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
         { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
@@ -236,6 +268,7 @@ export class AppCommonMapModule {
         { provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
         { provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
         { provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
+        { provide: AbstractSelectedItemComponent, useClass: SelectedItemTemporalComponent, multi: true },
         { provide: AbstractSelectedItemComponent, useClass: SelectedItemShapeComponent, multi: true },
         { provide: AbstractItemListItemComponent, useClass: ItemListItemComponent, multi: true },
         { provide: AbstractItemListComponent, useClass: ItemListComponent, multi: true }

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

@@ -1,4 +1,3 @@
-@import "../../../_theme.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 
 
@@ -11,25 +10,25 @@
 }
 
 .tolerance {
-  fill: theme-color();
+  fill: $primary;
   fill-opacity:0.4;
 }
 
 .border {
-  fill: white;
+  fill: $white;
 }
 
 .center {
-  fill: theme-color();
+  fill: $primary;
 }
 
 .stop1 {
-  stop-color: theme-color();
+  stop-color: $primary;
   stop-opacity:1;
 }
 
 .stop2 {
-  stop-color: theme-color();
+  stop-color:$primary;
   stop-opacity: 0;
 }
 

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

@@ -23,7 +23,7 @@ export class GpsLocation  implements OnInit,OnChanges{
   public path: string = "";
   public rotate: string = "";
   private resolution: number = 0;
-  @ViewChild('location') locationElement: ElementRef;
+  @ViewChild('location', { static: true }) locationElement: ElementRef;
 
   constructor(private map: MapComponent) {
     
@@ -59,10 +59,14 @@ export class GpsLocation  implements OnInit,OnChanges{
   ngOnChanges(changes: SimpleChanges) {
     if (changes.position && this.instance) {
       var p = changes.position.currentValue as Position;
-      this.instance.setPosition(fromLonLat([p.coords.longitude, p.coords.latitude]));
-      this.locationTolerance = p.coords.accuracy;
-      this.recalcLocationTolerance();
-      this.heading = p.coords.heading;
+      if(p) {
+        this.instance.setPosition(fromLonLat([p.coords.longitude, p.coords.latitude]));
+        this.locationTolerance = p.coords.accuracy;
+        this.recalcLocationTolerance();  
+      }
+    }
+    if(changes.heading && this.instance) {
+      this.rotate = "rotate(" +   Math.round(changes.heading.currentValue) + " 500 500)";
     }
   }
 }

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

@@ -1,90 +0,0 @@
-import { Component, Host, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges, forwardRef, Inject, InjectionToken } from '@angular/core';
-import { HttpClient } from "@angular/common/http";
-import { LayerVectorComponent, SourceVectorComponent, MapComponent, LayerImageComponent } from 'ngx-openlayers';
-import { LayerVectorImageComponent } from '../layer-vector-image/layer-vector-image.component';
-import { ItemService } from '@farmmaps/common';
-import { IItem } from '@farmmaps/common';
-import { ISelectedFeatures } from '../../../models';
-
-import {Vector} from 'ol/source';
-import {Feature,Collection} from 'ol';
-import {Extent} from 'ol/extent';
-import * as style from 'ol/style';
-import * as proj from 'ol/proj';
-import Projection from 'ol/proj/Projection';
-import * as loadingstrategy from 'ol/loadingstrategy';
-import {GeoJSON} from 'ol/format';
-
-@Component({
-  selector: 'fm-map-item-features-source',
-  template: `<ng-content></ng-content>`,
-  providers: [
-    { provide: SourceVectorComponent, useExisting: forwardRef(() => ItemFeaturesSourceComponent) }
-  ]
-})
-
-export class ItemFeaturesSourceComponent extends SourceVectorComponent implements OnInit, OnChanges {
-  instance:Vector;
-  features: Collection<Feature>;
-  @Input() item: IItem;
-  @Input() layerIndex: number = 0;
-  constructor(@Host() private layer: LayerVectorImageComponent, private itemService: ItemService, @Host() private map: MapComponent) {
-    super(layer);
-  }
-
-  private colorIndex = 0;
-  private styleCache = {};
-
-  ngOnInit() {
-    this.instance = new Vector({
-      loader: (extent: Extent, resolution: number, projection: Projection) => {
-        let format = new GeoJSON();
-        this.itemService.getItemFeatures(this.item.code, extent, projection.getCode(), this.layerIndex).subscribe((data) => {
-          var features = format.readFeatures(data);        
-          // TODO 13/6/2019 The line below causes an endless loop. Action required?
-          this.instance.addFeatures(features);
-          // TODO 13/6/2019 Action required: check if feature collection hasn't been changed (Willem)
-          // var t = this.vectorSource.getFeatures();
-        });
-      },
-      format: new GeoJSON(),
-      strategy: loadingstrategy.bbox
-    });
-    this.features = new Collection<Feature>();
-    this.layer.instance
-    this.layer.instance.setStyle((feature) => {
-      var resolution = this.map.instance.getView().getResolution();
-      var r = (2 / resolution) / 2;
-      var color = feature.get("color");
-      return new style.Style(
-        {
-          fill: new style.Fill({
-            color: color
-          }),
-          image: new style.Circle({
-            fill: new style.Fill({
-              color: color
-            }),
-            stroke: new style.Stroke({
-              color: color,
-              width: 1.25
-            }),
-            radius: r
-          }),
-          stroke: new style.Stroke({
-            color: color,
-            width: 1.25
-          })
-        });           
-    });
-    this.host.instance.setSource(this.instance);
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    if (this.instance) {
-      if (changes['layerIndex']) {
-        this.instance.clear();
-      }      
-    }
-  }
-}

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

@@ -1,10 +1,10 @@
 import { Component, Host, Input, Output, EventEmitter, Optional, QueryList, OnInit, AfterViewInit, OnChanges, SimpleChanges, SkipSelf, forwardRef, Inject, InjectionToken } from '@angular/core';
 import { HttpClient } from "@angular/common/http";
 import { LayerVectorComponent, LayerTileComponent, LayerGroupComponent, MapComponent } from 'ngx-openlayers';
-import { ItemService } from '@farmmaps/common';
-import { AppConfig } from '@farmmaps/common';
-import { IItemLayer, ILayerData, IRenderoutputTiles, IRenderoutputImage, IGradientstop, ILayer, IHistogram } from '../../../models';
-
+import { ItemService,IItem,AppConfig } from '@farmmaps/common';
+import { IItemLayer,ItemLayer, ITemporalItemLayer} from '../../../models/item.layer';
+import { ILayerData} from '../../../models/layer.data';
+import { IRenderoutputTiles,IRenderoutputImage,IGradientstop,ILayer,IHistogram} from '../../../models/color.map';
 import {Extent} from 'ol/extent';
 import Projection from 'ol/proj/Projection';
 import * as proj from 'ol/proj';
@@ -85,81 +85,95 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
       });
   }
 
-  createLayer(itemLayer: IItemLayer): Layer {
+  createGeotiffLayer(item:IItem,itemLayer:IItemLayer):Layer {
+    var layerIndex = -1;
     var layer: Layer = null;  
-    if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.geotiff.processed') {
-      let source = new XYZ({ maxZoom: 19, minZoom: 1, url: `${this._apiEndPoint}/api/v1/items/${itemLayer.item.code}/tiles/{z}/{x}/{y}.png?v=${itemLayer.item.updated.getTime()}` });
+    layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index;
+    let source = new XYZ({ maxZoom: 19, minZoom: 1, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` });
+    layer = new Tile({ source: source });
+    var data = item.data;
+    var l = (data && data.layers && data.layers.length > 0) ? data.layers[0] : null;
+    if (l && l.rendering && l.rendering.renderoutputType == "Tiles") {
+      var rt = l.rendering as IRenderoutputTiles;
+      let source = new XYZ({ maxZoom: rt.maxzoom, minZoom: rt.minzoom, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` });
       layer = new Tile({ source: source });
-      var data = itemLayer.item.data;
-      var l = (data && data.layers && data.layers.length > 0) ? data.layers[0] : null;
-      if (l && l.rendering && l.rendering.renderoutputType == "Tiles") {
-        var rt = l.rendering as IRenderoutputTiles;
-        let source = new XYZ({ maxZoom: rt.maxzoom, minZoom: rt.minzoom, url: `${this._apiEndPoint}/api/v1/items/${itemLayer.item.code}/tiles/{z}/{x}/{y}.png?v=${itemLayer.item.updated.getTime()}` });
-        layer = new Tile({ source: source });
-      }
-      if (l && l.rendering && l.rendering.renderoutputType == "Image") {
-        var ri = l.rendering as IRenderoutputImage;
-        let projection = new Projection({
-          code: 'image',
-          units: 'pixels',
-          extent: ri.extent
-        });
-        let source = new ImageStatic({ imageExtent: ri.extent, projection: projection, url: `${this._apiEndPoint}/api/v1/items/${itemLayer.item.code}/mapimage?v=${itemLayer.item.updated.getTime()}` });
-        layer = new Image({ source: source });
-      }
-    } else if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
-      var data = itemLayer.item.data;
-      var layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : itemLayer.item.data.layers[0].index;
-      var l = itemLayer.item.data.layers[layerIndex];
-      if (l && l.rendering && l.rendering.renderoutputType == "VectorTiles") {
-        var rt = itemLayer.item.data.layers[layerIndex].rendering as IRenderoutputTiles;
-        layer = new VectorTileLayer({
-          declutter: true,
-          source: new VectorTileSource({
-            maxZoom: rt.maxzoom,
-            minZoom: rt.minzoom,
-            format: new MVT(),
-            url: `${this._apiEndPoint}/api/v1/items/${itemLayer.item.code}/vectortiles/{z}/{x}/{y}.pbf?v=${itemLayer.item.updated.getTime()}`
-          }),
-          style: (feature) => {
-            return this.getColorFromGradient(l, feature);           
-          }
+    }
+    if (l && l.rendering && l.rendering.renderoutputType == "Image") {
+      var ri = l.rendering as IRenderoutputImage;
+      let projection = new Projection({
+        code: 'image',
+        units: 'pixels',
+        extent: ri.extent
+      });
+      let source = new ImageStatic({ imageExtent: ri.extent, projection: projection, url: `${this._apiEndPoint}/api/v1/items/${item.code}/mapimage/${layerIndex}?v=${Date.parse(item.updated)}` });
+      layer = new Image({ source: source });
+    }
+    return layer;
+  }
+
+  createShapeLayer(item:IItem,itemLayer:IItemLayer):Layer {
+    var layerIndex = -1;
+    var layer: Layer = null; 
+    layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index;
+    var data = item.data;
+    var l = (data && data.layers && data.layers.length > 0) ? data.layers[0] : null;
+    if (l && l.rendering && l.rendering.renderoutputType == "VectorTiles") {
+      var rt = item.data.layers[layerIndex].rendering as IRenderoutputTiles;
+      layer = new VectorTileLayer({
+        declutter: true,
+        source: new VectorTileSource({
+          maxZoom: rt.maxzoom,
+          minZoom: rt.minzoom,
+          format: new MVT(),
+          url: `${this._apiEndPoint}/api/v1/items/${item.code}/vectortiles/{z}/{x}/{y}.pbf?v=${Date.parse(item.updated)}`
+        }),
+        style: (feature) => {
+          return this.getColorFromGradient(l, feature);
+        }
+      })
+    } else if (l && l.rendering && l.rendering.renderoutputType == "Tiles") {
+      var rt = l.rendering as IRenderoutputTiles;
+      layer = new Tile({
+        source: new XYZ({
+          maxZoom: rt.maxzoom,
+          minZoom: rt.minzoom,
+          url: `${this._apiEndPoint}/api/v1/items/${item.code}/vectortiles/image_tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}`
         })
-      } if (l && l.rendering && l.rendering.renderoutputType == "Tiles") {
-        var rt = l.rendering as IRenderoutputTiles;
-        layer = new Tile({
-          source: new XYZ({
-            maxZoom: rt.maxzoom,
-            minZoom: rt.minzoom,
-            url: `${this._apiEndPoint}/api/v1/items/${itemLayer.item.code}/vectortiles/image_tiles/${layerIndex}/{z}/{x}/{y}.png?v=${itemLayer.item.updated.getTime()}`
-          })
-        });
-      } else {
-        let __this = this;
-        let format = new GeoJSON();
-        let source = new VectorSource({
-          strategy: loadingstrategy.bbox,
-          loader: function (extent: Extent, resolution: number, projection: Projection) {
-            var source = this as VectorSource;
-            __this.itemService.getItemFeatures(itemLayer.item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) {
-              var features = format.readFeatures(data);
-              for (let f of features) {
-                if (f.get("code")) {
-                  f.setId(f.get("code"));
-                }
+      });
+    } else {
+      let __this = this;
+      let format = new GeoJSON();
+      let source = new VectorSource({
+        strategy: loadingstrategy.bbox,
+        loader: function (extent: Extent, resolution: number, projection: Projection) {
+          var source = this as VectorSource;
+          __this.itemService.getItemFeatures(item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) {
+            var features = format.readFeatures(data);
+            for (let f of features) {
+              if (f.get("code")) {
+                f.setId(f.get("code"));
               }
-              source.addFeatures(features);
-            });
-          }
-        });
-        layer = new VectorLayer({
-          source: source,
-          style: (feature) => {
-            var key = feature.get("color");
-            if (!this.styleCache[key]) {
-              var color = feature.get("color");
-              this.styleCache[key] = new style.Style(
-                {
+            }
+            source.addFeatures(features);
+          });
+        }
+      });
+      layer = new VectorLayer({
+        source: source,
+        style: (feature) => {
+          var key = feature.get("color");
+          if (!this.styleCache[key]) {
+            var color = feature.get("color");
+            this.styleCache[key] = new style.Style(
+              {
+                fill: new style.Fill({
+                  color: color
+                }),
+                stroke: new style.Stroke({
+                  color: color,
+                  width: 1.25
+                }),
+                image: new style.Circle({
                   fill: new style.Fill({
                     color: color
                   }),
@@ -167,50 +181,58 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
                     color: color,
                     width: 1.25
                   }),
-                  image: new style.Circle({
-                    fill: new style.Fill({
-                      color: color
-                    }),
-                    stroke: new style.Stroke({
-                      color: color,
-                      width: 1.25
-                    }),
-                    radius: 5
-                  }),
-                }
-              )
-            }
-            return this.styleCache[key];
+                  radius: 5
+                }),
+              }
+            )
           }
-        });
+          return this.styleCache[key];
+        }
+      });
+    }
+    return layer;
+  }
+
+  createExternalLayer(item:IItem,itemLayer:IItemLayer):Layer {
+    let data = item.data as ILayerData;
+    var layer: Layer = null; 
+    switch (data.interfaceType) {
+      case 'OSM': {
+        let source = new OSM();
+        layer = new Tile({ source: source });
+        break;
       }
+      case 'BingMaps': {
+        let source = new BingMaps(data.options);
+        layer = new Tile({ source: source });
+        break;
+      }
+      case 'TileWMS': {
+        let source = new TileWMS(data.options);
+        layer = new Tile({ source: source });
+        break;
+      }
+      case 'TileArcGISRest': {
+        let source = new TileArcGISRest(data.options);
+        layer = new Tile({ source: source });
+        break;
+      }
+      default: {
+        break;
+      }
+    }
+    return layer;
+  }
+
+  createLayer(itemLayer: IItemLayer): Layer {
+    var layer: Layer = null;   
+    var layerIndex = -1;
+    if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.geotiff.processed') {
+      layer = this.createGeotiffLayer(itemLayer.item,itemLayer);
+    } else if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
+      layer = this.createShapeLayer(itemLayer.item,itemLayer);
     } else if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.layer') {
-      let data = itemLayer.item.data as ILayerData;
-      switch (data.interfaceType) {
-        case 'OSM': {
-          let source = new OSM();
-          layer = new Tile({ source: source });
-          break;
-        }
-        case 'BingMaps': {
-          let source = new BingMaps(data.options);
-          layer = new Tile({ source: source });
-          break;
-        }
-        case 'TileWMS': {
-          let source = new TileWMS(data.options);
-          layer = new Tile({ source: source });
-          break;
-        }
-        case 'TileArcGISRest': {
-          let source = new TileArcGISRest(data.options);
-          layer = new Tile({ source: source });
-          break;
-        }
-        default: {
-          break;
-        }
-      }
+      layer = this.createExternalLayer(itemLayer.item,itemLayer);
     }
     if (layer) {
       let geometry = new GeoJSON().readGeometry(itemLayer.item.geometry);
@@ -226,33 +248,51 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     this.updateLayers(this.itemLayers);
   }
 
-  updateLayers(itemLayers: IItemLayer[]) {
-    if (itemLayers) {
-      var olLayers = this.instance.getLayers();
-      itemLayers.forEach((itemLayer, index) => {
+  addOrUpdateOlLayer(itemLayer:IItemLayer,index:number):Layer {
+    if(!itemLayer) return null;
+    var olLayers = this.instance.getLayers();
+    var layer = itemLayer.layer;
+    let olIndex = olLayers.getArray().indexOf(layer);
+    if (olIndex < 0) {
+      // New layer: we add it to the map
+      layer = this.createLayer(itemLayer);
+      if (layer) {
+        olLayers.insertAt(index, layer);
+      }
+    } else if (index !== olIndex) {
+      // layer has moved inside the layers list
+      olLayers.removeAt(olIndex);
+      olLayers.insertAt(index, layer);
+    }
+    if(layer) {
+      itemLayer.layer = layer;
+      layer.setOpacity(itemLayer.opacity);
+      layer.setVisible(itemLayer.visible); 
+    }
+    return layer;
+  }
 
-        var layer = itemLayer.layer;
-        let olIndex = olLayers.getArray().indexOf(layer);
-        if (olIndex < 0) {
-          // New layer: we add it to the map
-          layer = this.createLayer(itemLayer);
-          if (layer) {
-            itemLayer.layer = layer;
-          }
-          olLayers.insertAt(index, layer);
-        } else if (index !== olIndex) {
-          // layer has moved inside the layers list
-          olLayers.removeAt(olIndex);
-          olLayers.insertAt(index, layer);
+  updateLayers(itemLayers: IItemLayer[]) {
+    let newLayers: IItemLayer[] = [];
+    if (itemLayers) {
+      itemLayers.forEach((itemLayer, index) => {
+        if(itemLayer.item.itemType ==  'vnd.farmmaps.itemtype.temporal') {
+          let il = itemLayer as ITemporalItemLayer;
+          let previousLayer = this.addOrUpdateOlLayer(il.previousItemLayer,newLayers.length);          
+          if(previousLayer) newLayers.push(previousLayer);
+          let selectedLayer = this.addOrUpdateOlLayer(il.selectedItemLayer,newLayers.length);
+          if(selectedLayer) newLayers.push(selectedLayer);
+          let nextLayer = this.addOrUpdateOlLayer(il.nextItemLayer,newLayers.length);
+          if(nextLayer) newLayers.push(nextLayer);
+        } else {
+          let layer = this.addOrUpdateOlLayer(itemLayer,newLayers.length);
+          if(layer) newLayers.push(layer);           
         }
-        layer.setOpacity(itemLayer.opacity);
-        layer.setVisible(itemLayer.visible);
       });
       // Remove the layers that have disapeared from childrenLayers
-      if (olLayers.getLength() > itemLayers.length) {
-        for (let i = itemLayers.length; i < olLayers.getLength(); i++) {
-          olLayers.removeAt(i);
-        }
+      var olLayers = this.instance.getLayers();
+      while(olLayers.getLength() > newLayers.length) {
+        olLayers.removeAt(newLayers.length);
       }
     }
   }

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

@@ -14,6 +14,8 @@ import {Vector,Cluster} from 'ol/source';
 import {Layer} from 'ol/layer';
 import {GeoJSON} from 'ol/format';
 import {Select} from 'ol/interaction';
+import {IStyles} from '../../../models/style.cache';
+import {FeatureIconService} from '../../../services/feature-icon.service';
  
 @Component({
   selector: 'fm-map-item-source-vector',
@@ -31,41 +33,12 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
   @Input() features: Array<Feature>;
   @Input() selectedFeature: Feature;
   @Input() selectedItem: IItem;
+  @Input() styles:IStyles;
   @Output() onFeaturesSelected: EventEmitter<Feature> = new EventEmitter<Feature>();
-  private styleCache = {
-    'file': new style.Style({
-      image: new style.Icon({
-          anchor: [0.5, 1],
-          scale: 0.05,
-        src: this.getIconImageDataUrl("fa fa-file-o")
-      }),         
-      stroke: new style.Stroke({
-        color: 'red',
-        width: 1
-      }),
-      fill: new style.Fill({
-        color: 'rgba(0, 0, 255, 0.1)'
-      }),
-      geometry: (feature) => this.geometry(feature)
-    }),
-    'selected': new style.Style({
-      image: new style.Icon({
-        anchor: [0.5, 1],
-        scale: 0.08,
-        src: this.getIconImageDataUrl(null)
-      }),
-      stroke: new style.Stroke({
-        color: 'red',
-        width: 3
-      }),
-      fill: new style.Fill({
-        color: 'rgba(0, 0, 255, 0.1)'
-      }),
-      geometry: (feature) => this.geometry(feature)
-    })
-    };
+  @Output() onFeatureHover: EventEmitter<Feature> = new EventEmitter<Feature>();
+  private stylesCache:IStyles = {};
 
-  constructor(@Host() private layer: LayerVectorComponent, private itemService: ItemService, @Host() private map: MapComponent, private itemTypeService: ItemTypeService) {
+  constructor(@Host() private layer: LayerVectorComponent, private itemService: ItemService, @Host() private map: MapComponent, private itemTypeService: ItemTypeService,private featureIconService$:FeatureIconService) {
     super(layer);
     this._format = new GeoJSON();
   }  
@@ -80,53 +53,38 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
       geometry = new Point(extent.getCenter(e));
     }
     return geometry;
-  }
+   }
 
-  getIconImageDataUrl(iconClass:string, backgroundColor: string = "#c80a6e",color:string = "#ffffff"): string {
-    var canvas = document.createElement('canvas');
-    canvas.width = 365;
-    canvas.height = 560;
-    var ctx = canvas.getContext('2d');
-    ctx.lineWidth = 6;
-    ctx.fillStyle = backgroundColor;
-    ctx.strokeStyle = "#000000";
-    var path = new Path2D("m182.9 551.7c0 0.1 0.2 0.3 0.2 0.3s175.2-269 175.2-357.4c0-130.1-88.8-186.7-175.4-186.9-86.6 0.2-175.4 56.8-175.4 186.9 0 88.4 175.3 357.4 175.3 357.4z");
-    ctx.fill(path)
-
-    var iconCharacter = "";
-    if (iconClass != null) {
-      var element = document.createElement("i");
-      element.style.display = "none";
-      element.className = iconClass;
-      document.body.appendChild(element);
-      iconCharacter = getComputedStyle(element, "::before").content.replace(/"/g, '');
-      let iconFont = "200px " +getComputedStyle(element, "::before").fontFamily
-      document.body.removeChild(element);
-      ctx.strokeStyle = color;
-      ctx.fillStyle = color;
-      ctx.lineWidth = 15;
-      ctx.font = iconFont;
-      var ts = ctx.measureText(iconCharacter);
-      ctx.fillText(iconCharacter, 182.9 - (ts.width / 2), 250);
-      ctx.strokeText(iconCharacter, 182.9 - (ts.width / 2), 250);
+  getSelectedStyle(feature:Feature):style.Style {
+    let key = feature.get('itemType')+"_selected";
+    let evaluatedStyle =null;
+    var styleEntry = this.stylesCache[key];    
+    if(styleEntry) {
+      if(typeof styleEntry === 'function')  {
+        evaluatedStyle = styleEntry(feature);
+      } else {
+        evaluatedStyle = styleEntry;
+      }
+    } else {
+      evaluatedStyle = this.stylesCache["selected"];
     }    
-
-    return canvas.toDataURL();
+    if(evaluatedStyle ) {
+      evaluatedStyle.setGeometry((feature) => this.geometry(feature));
+    } 
+    return evaluatedStyle
   }
 
   ngOnInit() {
     this.strategy = loadingstrategy.bbox;
     this.format = new GeoJSON();
     this._select = new Select({
-      style: (feature) => {        
-        return this.styleCache['selected'];
-      },
+      style:null,
       hitTolerance: 10,
       layers: [this.layer.instance as Layer]
     });
     this._hoverSelect = new Select({
       style: (feature) => {        
-        return this.styleCache['selected'];
+        return this.getSelectedStyle(feature);
       },
       hitTolerance: 10,
       condition: (e: MapBrowserEvent) => {
@@ -143,21 +101,28 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
         this.onFeaturesSelected.emit(null);
       }
     });
+    this._hoverSelect.on('select', (e) => {
+      if (e.selected.length > 0 && e.selected[0]) {
+        this.onFeatureHover.emit(e.selected[0]);
+      } else {
+        this.onFeatureHover.emit(null);
+      }
+    });
     this.instance = new Vector(this);
     this.host.instance.setSource(this.instance);
       
     this.host.instance.setStyle((feature) => {     
       var key = feature.get('itemType') + (this.selectedItem?"_I":"");
-      if (!this.styleCache[key]) {
+      if (!this.stylesCache[key]) {
         if (this.itemTypeService.itemTypes[key]) {
           let itemType = this.itemTypeService.itemTypes[key];
           let fillColor = color.asArray(itemType.iconColor);
           fillColor[3] = this.selectedItem?0:0.5;
-          this.styleCache[key] = new style.Style({
+          this.stylesCache[key] = new style.Style({
               image: itemType.icon ? new style.Icon({
                   anchor: [0.5, 1],
                   scale: 0.05,
-                  src: this.getIconImageDataUrl(itemType.icon)
+                  src: this.featureIconService$.getIconImageDataUrl(itemType.icon)
                 }):null,
               stroke: new style.Stroke({
                 color: 'red',
@@ -166,14 +131,23 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
               fill: new style.Fill({
                 color: fillColor
               }),
-              geometry: (feature) => this.geometry(feature)
+              geometry:(feature) => this.geometry(feature)
             });                   
         } else {
           key = 'file';
         }
       } 
-      var styleEntry = this.styleCache[key];
-      return styleEntry;
+      let evaluatedStyle =null;
+      var styleEntry = this.stylesCache[key];    
+      if(typeof styleEntry === 'function')  {
+        evaluatedStyle = styleEntry(feature);
+      } else {
+        evaluatedStyle = styleEntry;
+      }
+      if(evaluatedStyle && evaluatedStyle.geometry_ == null) {
+        evaluatedStyle.setGeometry((feature) => this.geometry(feature));
+      } 
+      return evaluatedStyle;
     });
   }
 
@@ -185,7 +159,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
     }
 
     if (changes["selectedFeature"] && this.instance) {
-      var features = this._select.getFeatures();
+      var features = this._hoverSelect.getFeatures();
       var feature = changes["selectedFeature"].currentValue
       //this.instance.clear(false);
       //this.instance.addFeatures(features.getArray());
@@ -203,5 +177,13 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
         this.map.instance.addInteraction(this._hoverSelect);  
       }
     }
+    if (changes["styles"] && this.instance) {
+      let styles = changes["styles"].currentValue;
+      for (const key in styles) {
+        if (styles.hasOwnProperty(key)) {
+          this.stylesCache[key]=styles[key]; 
+        }
+      }
+    }
   }
 }

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

@@ -1,24 +1,26 @@
-<div class="layerlist" *ngIf="itemLayers.length > 0;else noLayers">
-  <div class="list-group">
-    <div *ngFor="let itemLayer of itemLayers" class="list-group-item list-group-item-action p-2 text-truncate" [ngClass]="{'active' : selectedLayer==itemLayer}">
-      <div (click)="handleSelectLayer($event,itemLayer)"  [title]="itemLayer.item.name">{{itemLayer.item.name}}</div>
-        <div class="mt-1" *ngIf="selectedLayer==itemLayer && !baseLayers">
-          <span class="btn-group">
-            <a title="Toggle visibility"href="#" class="btn btn-light btn-sm" (click)="handleToggleVisibility($event,itemLayer)"><i class="fa" aria-hidden="true" [ngClass]="{'fa-eye':!itemLayer.visible,'fa-eye-slash':itemLayer.visible}"></i></a>
-            <a title="Transparency 25%" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.25)">25%</a>
-            <a title="Transparency 50%" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.5)">50%</a>
-            <a title="Transparency 75%" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.75)">75%</a>
-            <a title="No transparency" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,1)">100%</a>
-          </span>
-          <a href="#" title="Zoom to extent" class="btn btn-light btn-sm" (click)="handleZoomToExtent($event,itemLayer)"><i class="fa fa-search-plus" aria-hidden="true"></i></a>
-          <span *ngIf="firstLayer(itemLayer)"><a href="#" title="Toggle legend" class="btn btn-light btn-sm" (click)="itemLayer.legendVisible=toggleLegend($event,itemLayer.legendVisible)"><i class="fa fa-bar-chart" aria-hidden="true"></i></a></span>
-          <span class="float-right"><a href="#" title="Remove overlay" class="btn btn-light btn-sm" (click)="handleDelete($event,itemLayer)"><i class="fa fa-minus" aria-hidden="true"></i></a></span>
-        </div>
-        <div *ngIf="itemLayer.legendVisible">
-          <div class="card legend">
-            <fm-map-layer-legend [layer]="firstLayer(itemLayer)" (click)="handleLegendClick($event,itemLayer);"></fm-map-layer-legend>
+<div>
+  <div class="layerlist" *ngIf="itemLayers.length > 0;else noLayers">
+    <div class="list-group">
+      <div *ngFor="let itemLayer of itemLayers" class="list-group-item list-group-item-action p-2 text-truncate" [ngClass]="{'active' : selectedLayer==itemLayer}">
+        <div (click)="handleSelectLayer($event,itemLayer)"  [title]="itemLayer.item.name">{{itemLayer.item.name}}</div>
+          <div class="mt-1" *ngIf="selectedLayer==itemLayer && !baseLayers">
+            <span class="btn-group">
+              <a title="Toggle visibility"href="#" class="btn btn-light btn-sm" (click)="handleToggleVisibility($event,itemLayer)"><i class="fa" aria-hidden="true" [ngClass]="{'fa-eye':!itemLayer.visible,'fa-eye-slash':itemLayer.visible}"></i></a>
+              <a title="Transparency 25%" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.25)">25%</a>
+              <a title="Transparency 50%" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.5)">50%</a>
+              <a title="Transparency 75%" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.75)">75%</a>
+              <a title="No transparency" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,1)">100%</a>
+            </span>
+            <a href="#" title="Zoom to extent" class="btn btn-light btn-sm" (click)="handleZoomToExtent($event,itemLayer)"><i class="fa fa-search-plus" aria-hidden="true"></i></a>
+            <span *ngIf="firstLayer(itemLayer)"><a href="#" title="Toggle legend" class="btn btn-light btn-sm" (click)="itemLayer.legendVisible=toggleLegend($event,itemLayer.legendVisible)"><i class="fa fa-bar-chart" aria-hidden="true"></i></a></span>
+            <span class="float-right"><a href="#" title="Remove overlay" class="btn btn-light btn-sm" (click)="handleDelete($event,itemLayer)"><i class="fa fa-minus" aria-hidden="true"></i></a></span>
           </div>
-        </div>
+          <div *ngIf="itemLayer.legendVisible">
+            <div class="card legend">
+              <fm-map-layer-legend [layer]="firstLayer(itemLayer)" (click)="handleLegendClick($event,itemLayer);"></fm-map-layer-legend>
+            </div>
+          </div>
+      </div>
     </div>
   </div>  
 </div>

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

@@ -1,5 +1,5 @@
 import { Component,Input,Output,EventEmitter } from '@angular/core';
-import { IItemLayer } from '../../../models';
+import { IItemLayer } from '../../../models/item.layer';
 
 @Component({
   selector: 'fm-map-layer-list',
@@ -8,7 +8,7 @@ import { IItemLayer } from '../../../models';
 })
 
 export class LayerListComponent  {
-  @Input() itemLayers: IItemLayer[];
+  @Input() itemLayers: IItemLayer[] = [];
   @Input() baseLayers: boolean = false;
   @Output() onToggleVisibility = new EventEmitter<IItemLayer>();
   @Output() onSetOpacity = new EventEmitter<{layer: IItemLayer,opacity:number }>();

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

@@ -0,0 +1,13 @@
+<div (click)="handleClick($event)" class="btn btn-outline-secondary gps-location">
+  <svg height="100%" width="100%" viewBox="0 0 96 96">
+    <g
+    id="XMLID_1_"><circle      
+      class="pan-to"  [ngClass]="{'pan-to-centered':centered(),'pan-to-disabled':disabled()}"
+      cx="48"
+      cy="48"
+      r="9.8000002"/><path     
+      class="pan-to" [ngClass]="{'pan-to-centered':centered(),'pan-to-disabled':disabled()}"
+      d="M 80.5,44.8 H 73.8 C 72.3,33 63,23.7 51.3,22.2 v -6.7 h -6.5 v 6.7 C 33,23.7 23.7,33 22.2,44.8 h -6.7 v 6.5 h 6.7 C 23.7,63 33,72.3 44.8,73.8 v 6.7 h 6.5 V 73.8 C 63,72.3 72.3,63 73.8,51.3 h 6.7 z M 48,67.5 C 37.2,67.5 28.5,58.8 28.5,48 28.5,37.2 37.2,28.5 48,28.5 c 10.8,0 19.5,8.7 19.5,19.5 0,10.8 -8.7,19.5 -19.5,19.5 z"
+      inkscape:connector-curvature="0"/></g>
+  </svg>
+</div>

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

@@ -0,0 +1,37 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+.gps-location {
+  display:block; 
+  width:2.5em;
+  height:2.5em;
+  background-color: $body-bg;
+  background-size: contain;
+  margin-top:0.5em;
+  border-radius: 1.75em;
+  padding:0
+}
+
+.center, .tolerance, .border {
+  stroke-width: 0;
+}
+
+.pan-to {
+  fill: $secondary;
+}
+
+div.gps-location:hover .pan-to {
+  fill: $white;
+}
+
+.pan-to-centered {
+  fill: $primary;
+}
+
+div.gps-location:hover .pan-to-centered {
+  fill: theme-color-level($color-name: "primary", $level: -10) 
+}
+
+.pan-to.pan-to-disabled {
+  fill: $gray-300;
+}

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

@@ -0,0 +1,84 @@
+import { Component, OnInit, Input, Host, OnChanges, SimpleChanges,ChangeDetectorRef } from '@angular/core';
+import { MapComponent } from 'ngx-openlayers';
+import {IMapState} from '../../../models/map.state'
+import {View} from 'ol';
+import { fromLonLat } from 'ol/proj';
+
+
+@Component({
+  selector: 'fm-map-pan-to-location',
+  templateUrl: './pan-to-location.component.html',
+  styleUrls: ['./pan-to-location.component.scss']
+})
+export class PanToLocation  implements OnInit,OnChanges{
+
+  view: View;
+  map: MapComponent;
+  @Input() position: Position;
+  @Input() mapState: IMapState;
+  @Input() animate: boolean;
+
+  constructor(@Host() map: MapComponent,private changeDetectorRef$: ChangeDetectorRef ) {
+    this.map = map;
+  }
+
+  ngOnInit() {  
+    this.view = this.map.instance.getView();
+    this.view.on('change:center', () => {
+      this.changeDetectorRef$.detectChanges();
+    });
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    // if (changes.position && this.instance) {
+    //   var p = changes.position.currentValue as Position;
+    //   this.instance.setPosition(fromLonLat([p.coords.longitude, p.coords.latitude]));
+    //   this.locationTolerance = p.coords.accuracy;
+    //   this.recalcLocationTolerance();
+    //   this.heading = p.coords.heading;
+    // }
+  }
+
+  p
+
+  public centered():boolean {
+    if(this.position && this.mapState) {
+      let center = this.view.getCenter();
+      let newCenter = fromLonLat([this.position.coords.longitude,this.position.coords.latitude]);
+      let x1 = newCenter[0].toFixed(0);
+      let x2 = center[0].toFixed(0);
+      let y1 = newCenter[1].toFixed(0);
+      let y2 = center[1].toFixed(0);
+      return x1==x2 && y1==y2;  
+    }
+    return false;
+  }
+
+  public disabled():boolean {
+    return !this.position;
+  }
+
+  handleClick(event:Event) {
+    if(this.position) {
+      let view = this.map.instance.getView();
+      let newCenter = fromLonLat([this.position.coords.longitude,this.position.coords.latitude]);
+      let extent = [newCenter[0]-500,newCenter[1]-500,newCenter[0]+500,newCenter[1]+500];
+      var options = { padding: [0, 0, 0, 0],minResolution:1 };
+      let size = this.map.instance.getSize();
+      let rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
+      let threshold = 44 * rem;
+      var left = 1 * rem;
+      var right = 1 * rem;
+      var bottom = Math.round(size[1] / 2);
+      var top = 1 * rem;
+      if (size[0] > threshold) {
+        bottom = 1 * rem;
+        left = 23 * rem;
+      }
+      //options.padding = [top, right, bottom, left];
+      if (this.animate) options["duration"] = 2000;
+      view.fit(extent, options);  
+    }
+    event.preventDefault();
+  }
+}

projects/common-map/src/fm-map/components/aol/rotation-reset/rotation-reset.component.html

@@ -0,0 +1,35 @@
+<div (click)="handleClick($event)" class="btn btn-outline-secondary compass" [style.transform]="Rotation()" [ngClass]="{'compass-n':IsNorth()}">
+  <svg height="100%" width="100%" viewBox="0 0 132.29166 132.29167">
+    <g
+     inkscape:label="Laag 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-164.70832)">
+    <g
+       id="g4550"
+       transform="translate(2.3213753,-1.8555167)">
+      <path
+         id="top-r"
+         d="m 63.824458,179.82737 v 52.8823 H 48.380953 Z"
+         style="stroke:none;stroke-width:0.15389842px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="top-l"
+         d="m 63.824458,179.82737 v 52.8823 h 15.443505 z"
+         style="stroke:none;stroke-width:0.15389842px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="bottom-l"
+         d="m 63.824458,285.59197 v -52.8823 h -15.4435 z"
+         style="stroke:none;stroke-width:0.15389842px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="bottom-r"
+         d="m 63.824458,285.59197 v -52.8823 h 15.443505 z"
+         style="stroke:none;stroke-width:0.15389842px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+
+         <path
+         id="north"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:2.95481014"
+         d="m 50.702335,239.32724 h 9.926315 l 12.534859,23.63848 v -23.63848 h 8.425825 v 34.46509 H 71.663019 L 59.12816,250.15385 v 23.63848 h -8.425825 z" />         
+    </g>
+  </g>
+  </svg>
+</div>

projects/common-map/src/fm-map/components/aol/rotation-reset/rotation-reset.component.scss

@@ -0,0 +1,67 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+.compass {
+  width:2.5em;
+  height:2.5em;
+  background-color: white; 
+  opacity: 1;
+  border-radius:1.75em;
+  padding:0;
+  margin-top:0.5em;
+}
+
+#north {
+  display: none;
+  fill:$black;
+}
+
+#top-l {
+  fill:#d40000;
+}
+
+#top-r {
+  fill:#ff0000;
+}
+
+#bottom-l {
+  fill:#000000;
+}
+
+#bottom-r {
+  fill:#666666;
+}
+
+div.compass:hover #top-l {
+  fill:$white;
+}
+
+div.compass:hover #top-r {
+  fill:$gray-300;
+}
+
+div.compass:hover #bottom-l {
+  fill:$gray-300;
+}
+
+div.compass:hover #bottom-r {
+  fill:$white;
+}
+
+div.compass:hover #north {
+  fill:$white;
+}
+
+.compass-n {    
+  transition: opacity 1s ease-out 2s,height 1s ease-out 3s,margin-top 1s ease-out 3s;
+  opacity:0;
+  height:0;
+  margin-top:0;
+}
+
+.compass-n #bottom-l, .compass-n #bottom-r {
+  display: none;
+}
+
+.compass-n #north {
+  display: inline;
+}

projects/common-map/src/fm-map/components/aol/rotation-reset/rotation-reset.component.ts

@@ -7,22 +7,8 @@ import {View} from 'ol';
 
 @Component({
   selector: 'fm-map-rotation-reset',
-  template: `<div (click)="handleClick($event)" class="rounded-circle compass" [style.transform]="Rotation()" [ngClass]="{'compass-n':IsNorth()}"></div>`,
-  styles: [`.compass {
-      width:2.5em;
-      height:2.5em;
-      background-color: white;
-      background-size: contain;
-      background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAF6AAABegB0iYb4wAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAmlSURBVHic7d39c1xVHcfxz92kCVh0BojVRpABRGBAKj6P4+io1LYp/hv9O/I/dNqmmU2mP9sf7SMFsSBaRMU+ZUAFB8HC1FKqJLR52D3+cJNm0ySb3XvPOd9zN+/XTGfa3eTe76T7yT3n3Hu/VwIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMlz0iMXpEes68CymnUBWGGkJu2xLgLLCEha9i7+AdDKSXc76bNL0s0/SZ+zrgc5jiDpeE7S3ZLuGpR+Zl0McgQkHSNLf6m1/B22CEg6bk/OnfS8ZSFYRkAS4KRvSHqo5aUHp6SnrerBMgKShlUrV01Ws5JAQNKwas7hmIckIbMuYLNz0r2Srkrql6TLi69nUkPStqek61a1gSNICnZpMRytnNTXlHYa1IMWBMTeunONGvMQcwTEkMt//r9o8/4ex/+RKX74tr4naVub94empO/GKgarERBbGw6hHMMsUwTEFgFJHAEx4qTtkr650ddl0rNvScMRSsIaCIidEXV2Hiqbl3aHLgZrIyB2Oh46ZQyzzHAm3YCTBiRdk/T5O9+7vPrLJWl6UBp6TJoNWxnuxBHExo+1RjjauGdO+lGoYrA+AmKj6wsRuXjRBgGx0fWcgnmIDQISmcv7Xn29wPc9fln6WoCS0AYBie+XRb+xyTArOgISX+EPeUZAomOZNyInbVW+vHvXel+zzjLvktlMGnpKmvZbGdbDESSu59QmHB0YFD2zoiIgcZVeieLixbgISFy7PGxjxDE0joaAROKkHZK+6mFTD1zK+2ghAgISj7ehEfeqx0NA4vH2oWYeEg9j2QicdJ/y3ld9G33tBsu8kvKeWTXpS09KH5cuDm1xBIljtzoIR6ec1Ndo0w0F/hCQOLwPiRhmxUFAAnP5kcPH8u4KmbTnVx6PSlgbAQnvB5LuD7Dd+56Uvh9gu2hBQMILdoEhT6IKj4CEF2yuwDwkPAISkMv7WT0TcBc7zksPBNz+pkdAwnpeYc81ZX0tzzaEfwQkrOBzBJo5hMWZ9EBcfu/Gf9Rde5+OzqTfYWZQup+eWWFwBAnnJ+oyHAVtvZX32UIABCScaEMf7lUPh4CEE/NDW7hTCtojIAG4vO/VYxF3+ehU3P1tGgQkjOgn8JqcNAyCgIQRfU7APCQMlnk9c9I9yntfDRb5/gLLvEvm+qWhJ6RPi28Cd+II4t9OFQxHSQNN6ecG++1pBMQ/s7kA8xD/CIhHi/2qLJ8nuJeeWX4REL+elfQVw/1vn+rgybnoHAHxy3wliUck+EVA/DKfA9BUzi/Gq544aUjSRyrZSKHEMu+SZkPaviPvw4WSOIL4s0dpdBmp1eiZ5Q0B8SeZsT9n1f0hIB4s9r7aaV1Hi90vS/3WRfQCAuLHDxWm91VR927L+3GhJALiR3JDGpZ7/SAgfiS3tJolWFMVEZCSnPSgpKet61jDM1PSQ9ZFVB0BKW+vEj2f5GyvC+sJBKS8ZMf69MwqL8nffFWx2PvqmvKbpLzwcCa91cxWaehh6ZbfzW4eHEHK+ak8hiOArTN5fy4UREDKSX6liA7w5RCQcpJvHF3LG2ijIAJSkJOekPSodR0bcdLD56XHreuoKgJSXGWGLv0VqjU1BKS4ynzomIcUxzJvAU76gvJHGwz43rbnZd4l87ekL35H+m+YzfcujiDF7FSAcAS0ZZCeWYUQkGIqN2ThXvViCEiXFvtO7bKuo1tOGqFnVvcISPe+rfzptVXz5YvSt6yLqBpuy+xS6F/B+/btC7btZrMp1evBtt+LOIJ078+SrlgXUcBH9Xr9L9ZFVA0B6Z6TdNq6iAJOKK8dXSAgxRy3LqBbWZZVruYUEJBizkiasy6iC/POuZesi6giAlLM/yS9Zl1Ep7Ise3V8fJyz6AUQkOKqNGSpUq1JISDFVeZDV6vVKlNraghIcW9Jese6iA7889ChQ29bF1FVBKSck9YFbMQ5d8y6hiojIOVUYehShRqTRUDKeVnStHURbczMz8+ftS6iyghIObPKQ5Kql44cOUJPrBIISHknrAtoI+XaKoGAlHdciV7j1Gg0TlnXUHUEpLz3JV2yLmINFyYmJt6zLqLqCIgfya0UcXGiHwTEj+TG+s655GqqIgLix+8lfWxdRItPhoeHz1kX0QsIiB8N5ZfAJ8E5d2p0dHTBuo5eQED8SWZIU6vVkqml6giIPyeVH0msNbMse8G6iF5BQPy5JukN6yIkvT42NnbVuoheQUD8SmFpNYUaegYB8ct87M/8wy8C4tebkv5tuP8Px8bG/mq4/55DQPxykiyvf0r2urCqIiD+Wc4BmH94RkD8O6P8PpHY5hYWFuh95RkB8W9a0quxd+qcOzs5Oflp7P32OgISRvSVpCzLWL0KgICEEX0uwOXtYRCQMP4m6e8R9/fO4cOHY+5v0yAg4cQc8vw64r42FQISTrSAMP8Ih4CEc1ZSjFWlmYGBgVci7GdTIiDhzEr6TYT9nNm/f7/FeZdNgYCEFXzow73nYRGQsI4p7LVRzjmXfAPtKiMgYV2RdCHg9s/X6/UPAm5/0yMg4YU8gcfJwcAISHjB5gjMP8IjIOGdU5ieWddv3LjxeoDtogUBCa8h6bTvjWZZdvLo0aMpdFHpaQQkjhBzBeYfERCQOE7Jb8+sRn9/P72vIiAgcVyX5G2+4Jw7d+DAgZR6AfcsAhKPzyERw6tICEg83j7UzjkCEgkBiee8pH952M4H9Xr9ooftoAMEJC4fy70nRO+raAhIXKWHRgyv4iIgcb0oqcxzy2e3bNkS4x4TLCIgcc1IKnz3X5Zlvz148OC0x3qwAQISX+ELDLk4MT4CEl/hDiSNRoOAREZA4ntXed+sbr09MTHxD9/FoD0CYqPrlShWr2wQEBtdD5V4cpQNAmLjFXXXM2t6YGDgd6GKwfoIiI055edEOvUCva9sEBA7Hc8pmH/YISB2Or2myjUaDcvnHm5qBMTOh5I6eSLtm5OTk1dCF4O1ERBbnQydGF4ZIiC2CEjiCIitP0q62ub9a8PDw2/EKgarERBbTUntupOcHB0dbcYqBqsREHvrDqF4MKc9AmLvtKSFNV5vLCwsnIldDFYiIPY+kfSHNV5/bWJi4nrsYrASAUnDqgsReTBnGghIGlbNNZh/pIGApOGipPda/v3+2NjYJatisIyApKP1WYPHzKrACgQkHbfnHDRnSEe/dQG47UVJNyVlWZbR+yoRBCQdNyWdleTGx8c/sy4GOQKSluOi725SCEhaTvT19VnXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOvB/FOHOpgoUlk8AAAAASUVORK5CYII=);
-      opacity: 1;
-    }
-    .compass-n {    
-      background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAF6AAABegB0iYb4wAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAe9SURBVHic7d07jB1XHcfx712vDXYinDhegw2YOOERYhzLxAhhAhhE4sSORUdDKioaKpoIEBHhIR4NSomgBEEdCQqKCImKAhHwxilAbpASiC3iOMkGr3cPxXizu/Zd37kz5zW734+0ze6Zmb/u3d89Z87MnAuSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSpE0qwCjAqHQdWjVTugCtc3QeHihdhFbNli5A65wJEIDnSxeihj1IXc6M4EzpIqTqBNgT4No8XDsPd5WuRw17kHo8BmwLsG0ZTpUuRg0DUo+3h1bBYZa0KjQ9x8UA4Vzzc+k5J1CqYA9Sh0+x/rxjzxx8slQxWmVA6nD6xl+MxvxO+RmQOtx0zuF5SB0MSGEB3gccGfOno/NwMHc9Ws+AlHeGje+/ejRnIbqZASlvw3ON4HlIcd45WlCAdwAXgdtXfje/vskbt8HeQ/BW3sq0wh6krJOsCccYt70On81Ui8YwIGVNHELNOMwqyoCUNfGfP8DZHIVoPANSSICPAB9s0fSe8/Dh1PVoPANSTusLgUteNCzGgJQzzT+9ASnEad4CQjNzdZFmmned+ZubA1ydhb33wZW0lelG9iBlPMKYcNzCjkX4YqpitDEDUsbUQ6YZh1lFGJDMrq97NfU9VgFOu2ZWfgYkv48DBzpst/88HItdjG7NgOTX+cr4slfVszMg+XU+l/Ahqvwc02YUYA54mVt8MG0wzbtieQn2H4X/xK1MG7EHyesx+r3mMzOumZWVAcmr9zmEiznkZUAyCbANeDjCrk65ZlY+BiSfTwN7Iuznzn3NOlrKwIDkE21o5LPq+RiQfKJN0foVCfkYkAwCvB/4WMT9HXkBPhBrf9qYAcnj8dg7XGqmjJWYAckj+jmD0715eCU9sQDvBC4Bu9q0n3Al/W0jWLgMd52Ahc7FaSJ7kPQ+T8twTCPAzt3wudj71XoGJL1kM07evJieAUkv2QLUTvemZ0ASCvBR4N6E+z/0N7gv1f5lQFJL/gm/zV4kKQOSVvJ/Xs9D0nKaN5EA76JZ+2r7NNu1neZdY3ER9h2DV6ffVJPYg6RziinD0dH2Ha6ZlYwBSSfblW4Xc0jHgCQQmtc12/cLjuBM8L1Mwhc1jQeB92Q83r5zzXpbisyApJF9ZsmlSdMwIGlkPyfwKcM0nOaNLMA+4CU6fvh0mOZdsRzgwBH4d/dd6Eb2IPGdpszrOjPKODGwVRiQ+IoNdRxmxecQK6LQrFf1CnBH1330GGIxgssLMHccFnvsRmvYg8T1ED3C0VeA3TvgRKnjb0YGJK7iU63e3RuXAYmr+DmA5yFxGZBIAhwE7i9dB3D4PNxduojNwoDEc7Z0ASuW7EWiMSDxVDP29yGqeJzmjSDATpqHo3ov79NnmnfFCBYWYO9xeDPC7rY0e5A4vkCCta+6CrBzF5wsXcdmYEDiqG5Is1xhTUNkQOKocSHp6Atmb0UGpKfQfK3B3aXrGOPgPBwuXcTQGZD+qp1S9Vn1/gxIf9WO9X3KsD+neXsIsJvm7t1oy/vEmOZd49oizLlmVnf2IP08Sp61r7qanYVHShcxZAakn+rH+H4TVT8GpKPr61CdKl3HJCM47ZpZ3fnCdfcJ4N2li5gkwNwLcLx0HUNlQLobzAyRNy92Z0C6G9LYfki1VsWAdBCaZUWHtNTngy/CgdJFDJEB6eY0w7qGNFoawIRCjQxIN4Mb03se0s2QPgWrEJoLg6/QXEWPLvKV9LVeG8HcYbia7hCbz2zpAgbofuAfqXae8hPr+rfuPp/wEJIkSZIkSZIkSZI0fN5q0s+dwB+m3OYtmpsdX+tx3GeB/S3bPgz8t8expM7mgNDh5+mex70wxbHmeh5L6qxrQK7Q73FdA5KJt7uXcTvwzdJFaDIDUs7XgHtKF6FbMyDl7ACeKl2Ebs2AlPUEcLR0EdqYASlrBvhu6SK0MQNS3peAE6WL0HgGpA4/Kl2AxjMgdfgMzUrxqowBqceP8f2ojm9IPR4Avly6CK1nQOryNHV/Ic+WY0DyuQRcntDmQ8BXM9SilgxIPleAn7Zo9xSwK3EtasmA5PUz4OUJbfYDX89Qi1owIHm9AXy/RbsngT2Ja1ELBiS/nwP/nNDmDuAbGWqRkprmgakLa7Z7okX7N4H3bnBcH5jKxB6kjF8Df53QZic+VKWB69qDAJxtsc1V4N4xx7UHycQepJxngT9OaLMdb4fXgPXpQQAearHdEnDshu3sQTKxBynrT8DvJrSZAb6XoRYpur49CMARml5i0vYn12xjD5KJPUh5fwd+06JdmwuMUlVi9CAAh4D/tdjH49fb24NkYg9ShwvAL1u0+yG+ZxqQWD0INDcpvt5iP1/BHiQbP43q8RLwTIt2PlSlwYjZg0Bzk+KlKfZpD5KYPUhdXgV+UroIrTIg9XkG+FfpItQwIPVZAH5Qugg1DEidfgG8WLoIGZBaXcO7eKtgQOr1W+AvpYvY6gxIvQLw7dJFbHUGpG6/B54rXcRWZkDq9yRNb6ICDEj9/kzzeK4KMCDD8C2ah6qUmQEZhnPAr0oXsRUZkOH4Ds1DVZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkbSX/B0lc8D0skvAeAAAAAElFTkSuQmCC);
-      transition: opacity 1s ease-out;
-      transition-delay: 2s;
-      opacity:0;
-    }
-`]
+  templateUrl: './rotation-reset.component.html',
+  styleUrls: ['./rotation-reset.component.scss']
 })
 export class RotationResetComponent implements OnInit {
   view: View;

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

@@ -22,7 +22,7 @@ export class ZoomToExtentComponent implements OnChanges {
       var options = { padding: [0, 0, 0, 0],minResolution:1 };
       let size = this.map.instance.getSize();
       let rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
-      let threshold = 44 * rem;
+      let threshold = 40 * rem;
       var left = 1 * rem;
       var right = 1 * rem;
       var bottom = Math.round(size[1] / 2);
@@ -32,7 +32,7 @@ export class ZoomToExtentComponent implements OnChanges {
         left = 23 * rem;
       }
       options.padding = [top, right, bottom, left];
-      if (this.animate) options["duration"] = 2000;
+      if (this.animate) options["duration"] = 1000;
       this.view.instance.fit(this.extent, options);
     }
   }

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

@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 
 
@@ -8,7 +7,7 @@
   user-select: none;
 }
 
-.row:hover {
+.row.selected {
   background-color: gray('100');
 }
 

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

@@ -1,11 +1,12 @@
-import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject, Type} from '@angular/core';
+import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject} from '@angular/core';
 import { Feature } from 'ol';
 import { FeatureListComponent,AbstractFeatureListComponent } from '../feature-list/feature-list.component';
 import { WidgetHostDirective } from '../widget-host/widget-host.directive';
-import  {IQueryState } from '../../models/query.state';
+import  {IQueryState,PackageService } from '@farmmaps/common';
 import * as mapReducers from '../../reducers/map.reducer';
 import * as mapActions from '../../actions/map.actions';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
 
 
 @Component({
@@ -15,45 +16,73 @@ import { Store } from '@ngrx/store';
 })
 export class FeatureListContainerComponent {
 
-  constructor(private store: Store<mapReducers.State>,private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractFeatureListComponent) public featureLists: AbstractFeatureListComponent[] ) {
+  constructor(private store: Store<mapReducers.State>,private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractFeatureListComponent) public featureLists: AbstractFeatureListComponent[],private packageService:PackageService ) {
   }
 
   @Input() features: Array<Feature>
   @Input() queryState: IQueryState;
+  @Input() selectedFeature: Feature;
+  @Input() clickedFeature:Observable<Feature>;
 
-  @ViewChild(WidgetHostDirective) widgetHost: WidgetHostDirective; 
+  @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; 
+  componentRef:any;
 
   loadComponent(queryState:IQueryState) {
-    var componentFactory: ComponentFactory<AbstractFeatureListComponent> = this.componentFactoryResolver.resolveComponentFactory(FeatureListComponent); // default
-    var selected = -1;
-    for (var i = 0; i < this.featureLists.length; i++) {
-      if (this.featureLists[i]['forItemType'] == queryState.itemType && this.featureLists[i]['forChild'] && queryState.parentCode && queryState.parentCode != "") {
-        selected = i;
-        break;
-      } else if (this.featureLists[i]['forItemType'] == queryState.itemType) {
-        selected = i;        
-        break;
+    let componentFactory: ComponentFactory<AbstractFeatureListComponent> = this.componentFactoryResolver.resolveComponentFactory(FeatureListComponent); // default
+    let selected = -1;
+    let maxMatches =0;
+    let showItem = true;
+    for (let i = 0; i < this.featureLists.length; i++) {
+      let matches=0;
+      let criteria=0;
+      if (this.featureLists[i]['forItemType']) {
+        criteria++;
+        if( this.featureLists[i]['forItemType'].indexOf(queryState.itemType) >= 0) {
+          matches++;
+        }
+      }
+      if(this.featureLists[i]['forChild'] ) {
+        criteria++;
+        if(queryState.parentCode && queryState.parentCode != "") {
+          matches++;
+        }
+      }     
+      if(criteria == matches && matches > maxMatches) {
+        selected=i;
+        maxMatches = matches;
       }
     }
     if (selected >= 0) {
-      componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.featureLists[i]['constructor'] as any);
+      componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.featureLists[selected]['constructor'] as any);
       if (this.featureLists[selected]['collapseSearch'] === true) {
         this.store.dispatch(new mapActions.CollapseSearch());
       }     
     }
     const viewContainerRef = this.widgetHost.viewContainerRef;
     viewContainerRef.clear();
+    if(showItem) {
+      this.componentRef = viewContainerRef.createComponent(componentFactory);
+      (<AbstractFeatureListComponent>this.componentRef.instance).features = null;
+      (<AbstractFeatureListComponent>this.componentRef.instance).queryState = queryState;
+      (<AbstractFeatureListComponent>this.componentRef.instance).selectedFeature = null;
+    }    
+  }
 
-    const componentRef = viewContainerRef.createComponent(componentFactory);
-    (<AbstractFeatureListComponent>componentRef.instance).features = this.features;
-    (<AbstractFeatureListComponent>componentRef.instance).queryState = this.queryState;
+  ngOnInit() {
+    this.clickedFeature.subscribe((feature => {
+      (<AbstractFeatureListComponent>this.componentRef.instance).handleFeatureClick(feature);
+    }));
   }
 
   ngOnChanges(changes: SimpleChanges) {
-    if (changes["features"] && changes["features"].currentValue) {
-      if (this.queryState) {
-        this.loadComponent(this.queryState);
-      }
+    if ((changes["queryState"] && changes["queryState"].currentValue)) {
+        this.loadComponent(changes["queryState"].currentValue);
+    }
+    if ((changes["features"] && changes["features"].currentValue)) {
+      (<AbstractFeatureListComponent>this.componentRef.instance).features = changes["features"].currentValue;
+    }
+    if(changes["selectedFeature"]) {
+      (<AbstractFeatureListComponent>this.componentRef.instance).selectedFeature = changes["selectedFeature"].currentValue;
     }
   }
 }

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

@@ -1,11 +1,11 @@
-<div *ngIf="features;let features">
-  <div class="card border-0">
-    <div class="card-body" *ngIf="(schemeItem|async);let schemeItem">
-      <div><a href="#" (click)="handleBackClick($event)" i18n>back</a></div>
-      <h4 i18n>Farm</h4>
-      <h3>{{schemeItem.name}}</h3>
-      <div class="cropfields">
-        <div class="row m-0" *ngFor="let feature of features" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
+<div class="card border-0">
+  <div class="card-body" *ngIf="(schemeItem|async);let schemeItem">
+    <div><a href="#" (click)="handleBackClick($event)" i18n>back</a></div>
+    <h4 i18n>Farm</h4>
+    <h3>{{schemeItem.name}}</h3>
+    <div *ngIf="features;let features">
+        <div class="cropfields">
+          <div class="row m-0 pl-3 pr-3" *ngFor="let feature of features" [ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
           <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
         </div>
       </div>

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

@@ -1,7 +1,6 @@
-@import "../../_theme.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 
-feature-list-feature-container {
+fm-map-feature-list-feature-container {
   width:100%;
   pointer-events:none;
 }
@@ -12,12 +11,12 @@ feature-list-feature-container {
   padding-left:1.5rem;
 }
 
-.row:hover {
+.row.selected {
   background-color: gray('100');
 }
 
 .cropfields {
   border-top: 1px solid gray('500');
-  margin-left: -1.5rem;
-  margin-right: -1.5rem;
+  margin-left: -1.25rem;
+  margin-right: -1.25rem;
 }

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

@@ -1,4 +1,4 @@
-import { Component, Injectable,AfterViewInit, OnInit} from '@angular/core';
+import { Component, Injectable,AfterViewInit, OnInit,SimpleChanges, ChangeDetectorRef} from '@angular/core';
 import { Location } from '@angular/common';
 import { AbstractFeatureListComponent } from '../feature-list/feature-list.component';
 import {ForItemType } from '../for-item/for-itemtype.decorator';

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

@@ -1,10 +1,10 @@
-<div *ngIf="features;let features">
-  <div class="card border-0">
-    <div class="card-body">
-      <div><a href="#" (click)="handleBackClick($event)" i18n>Back</a></div>
-      <h3 i18n><i class="fm fm-farm"></i> Farms</h3>
+<div class="card border-0">
+  <div class="card-body">
+    <div><a href="#" (click)="handleBackClick($event)" i18n>Back</a></div>
+      <h3><i class="fm fm-farm"></i>&nbsp;<span i18n>Farms</span></h3>
+      <div *ngIf="features;let features">
       <div class="farms">
-        <div class="row m-0" *ngFor="let feature of features" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
+        <div class="row m-0 pl-3 pr-3" *ngFor="let feature of features"[ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
           <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
         </div>
       </div>      

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

@@ -1,7 +1,6 @@
-@import "../../_theme.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 
-feature-list-feature-container {
+fm-map-feature-list-feature-container {
   width:100%;
   pointer-events:none;
 }
@@ -12,12 +11,12 @@ feature-list-feature-container {
   padding-left:1.5rem;
 }
 
-.row:hover {
+.row.selected {
   background-color: gray('100');
 }
 
 .farms {
   border-top: 1px solid gray('500');
-  margin-left: -1.5rem;
-  margin-right: -1.5rem;
+  margin-left: -1.25rem;
+  margin-right: -1.25rem;
 }

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

@@ -2,12 +2,13 @@ import { Component, Injectable } from '@angular/core';
 import { Location } from '@angular/common';
 import { AbstractFeatureListComponent } from '../feature-list/feature-list.component';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
-import { Store } from '@ngrx/store';
+import { Store,Action } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
 import { commonReducers, ItemTypeService } from '@farmmaps/common';
 import * as mapActions from '../../actions/map.actions';
 import { tassign } from 'tassign';
 import { Router } from '@angular/router';
+import { Feature } from 'ol';
 
 @ForItemType("vnd.farmmaps.itemtype.croppingscheme")
 @Injectable()
@@ -22,8 +23,8 @@ export class FeatureListCroppingschemeComponent extends AbstractFeatureListCompo
         super(store, itemTypeService, location);
     }
 
-    handleFeatureClick(feature) {
+    getAction(feature:Feature):Action {
         var queryState = tassign(mapReducers.initialState.queryState, { parentCode: feature.get('code'), itemType: "vnd.farmmaps.itemtype.cropfield" });
-        this.store.dispatch(new mapActions.DoQuery(queryState));
+        return new mapActions.DoQuery(queryState);
     }
 }

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

@@ -19,15 +19,31 @@ export class FeatureListFeatureContainerComponent {
 
   @Input() feature: Feature;
 
-  @ViewChild(WidgetHostDirective) widgetHost: WidgetHostDirective; 
+  @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; 
 
   loadComponent() {
     var componentFactory: ComponentFactory<AbstractFeatureListFeatureComponent> = this.componentFactoryResolver.resolveComponentFactory(FeatureListFeatureComponent); // default
-    for (var i = 0; i < this.featureLists.length; i++) {
-      if (this.featureLists[i]['forItemType'] == this.feature.get("itemType")) {
-        componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.featureLists[i]['constructor'] as any);
+   
+    let selected = -1;
+    let maxMatches =0;
+    for (let i = 0; i < this.featureLists.length; i++) {
+      let matches=0;
+      let criteria=0;
+      if (this.featureLists[i]['forItemType']) {
+        criteria++;
+        if(this.featureLists[i]['forItemType'].indexOf(this.feature.get("itemType")) >= 0) {
+          matches++;
+        }
+      }         
+      if(criteria == matches && matches > maxMatches) {
+        selected=i;
+        maxMatches = matches;
       }
     }
+    if (selected >= 0) {
+      componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.featureLists[selected]['constructor'] as any);        
+    }     
+
     const viewContainerRef = this.widgetHost.viewContainerRef;
     viewContainerRef.clear();
 

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

@@ -1,6 +1,12 @@
-<div *ngIf="feature;let feature" class="row m-0">  
-  <div class="col p-2">
+<div *ngIf="feature;let feature" class="d-flex m-0">  
+  <div class="p-2">
+    <div #container class="thumbnail">
+      <canvas  #canvas ></canvas>
+  </div>
+  </div>
+  <div class="flex-grow p-2 overflow-hidden">
     <h1 class="card-title" title="{{feature.get('name')}}">{{feature.get('name')}}</h1>
+    <div class="card-text"><span>{{areaInHa(feature)| number:'1.2-2'}} ha</span>&nbsp;<span>{{feature.get('cropTypeName')}}</span> </div>
     <div class="card-text"><span>{{feature.get('datadate')|date}}</span> - <span>{{feature.get('dataenddate')|date}}</span> </div>
   </div>
 </div>

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

@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 
 
@@ -10,21 +9,18 @@
   text-overflow: ellipsis;
 }
 
-.thumbnail > img {
-  width: 100%;
-  height: auto;
-}
-
-.thumbnail > div {
-  width: 100%;
-  font-size: 2rem;
-  text-align: center;
-  min-height: 3rem;
-  color: white;
-  padding-top: 0.5rem;
+.card-text {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 
 .col {
   overflow: hidden;
 }
 
+.thumbnail {
+  width: 4em;
+  height: 4em;
+}
+

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

@@ -1,10 +1,14 @@
-import { Component, Input, Injectable} from '@angular/core';
+import { Component, Injectable,ViewChild,AfterViewInit} from '@angular/core';
 import { Feature } from 'ol';
+import * as extent from 'ol/extent';
+import * as render from 'ol/render';
 import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
 import { commonReducers,ItemTypeService,AppConfig } from '@farmmaps/common';
 import { AbstractFeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
+import {getArea} from 'ol/sphere';
+import * as style from 'ol/style';
 
 
 @ForItemType("vnd.farmmaps.itemtype.cropfield")
@@ -14,9 +18,58 @@ import { ForItemType } from '../for-item/for-itemtype.decorator';
   templateUrl: './feature-list-feature-cropfield.component.html',
   styleUrls: ['./feature-list-feature-cropfield.component.scss']
 })
-export class FeatureListFeatureCropfieldComponent extends AbstractFeatureListFeatureComponent {
+export class FeatureListFeatureCropfieldComponent extends AbstractFeatureListFeatureComponent implements AfterViewInit {
+
+  @ViewChild('canvas') canvas;
+  @ViewChild('container') container;
 
   constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService,config:AppConfig) {
     super(store, itemTypeService,config);
   }
+
+  areaInHa(feature:Feature):number {
+    if(!feature) return 0;
+    // get area from faeture if 0 calculate from polygon
+    let a = feature.get('area');
+    if(a) return a;
+    return  getArea(feature.getGeometry(),{projectio:"EPSG:3857"}) / 10000;
+  }
+
+
+  render(canvas,width,height,feature:Feature) {  
+    let renderContext = render.toContext(canvas.getContext( '2d'),{ size: [width, height] });  
+   
+    let strokeStyle  = new style.Style({
+      stroke: new style.Stroke({ color: 'black',width:1.5 })
+    });
+
+    let geom   = feature.getGeometry().clone(),
+        line   = geom.getCoordinates()[0],
+        e = extent.boundingExtent( line );
+
+    let dxy = extent.getCenter(e),
+        sxy = [ 
+            (width - 2 ) / extent.getWidth(e),
+            (height - 2 ) / extent.getHeight(e)
+        ];
+
+    let dx = dxy[0], 
+        dy = dxy[1],
+        sx = sxy[0],
+        sy = sxy[1];
+
+    geom.translate( -dx, -dy );
+    geom.scale( Math.min(sx, sy), -Math.min(sx, sy));
+    geom.translate( width / 2, height / 2 );
+
+    renderContext.setStyle( strokeStyle );  
+    renderContext.drawGeometry( geom );
+  }
+
+  ngAfterViewInit() {
+    this.render(this.canvas.nativeElement,
+      this.container.nativeElement.offsetWidth, 
+      this.container.nativeElement.offsetHeight,
+      this.feature);
+  }  
 }

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

@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 
 

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

@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 
 

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

@@ -1,4 +1,4 @@
-import { Component, Input, Injectable} from '@angular/core';
+import { Component, Input, Injectable,Directive} from '@angular/core';
 import { Feature } from 'ol';
 import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
@@ -7,6 +7,7 @@ import { commonReducers,ItemTypeService,AppConfig } from '@farmmaps/common';
 
 
 @Injectable()
+@Directive()
 export abstract class AbstractFeatureListFeatureComponent {
   @Input() feature: Feature
 

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

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

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

@@ -1,7 +1,6 @@
-@import "../../_theme.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 
-feature-list-feature-container {
+fm-map-feature-list-feature-container {
   width: 100%;
   pointer-events: none;
 }
@@ -11,6 +10,6 @@ feature-list-feature-container {
   user-select: none;
 }
 
-.row:hover {
+.row.selected {
   background-color: gray('100');
 }

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

@@ -1,27 +1,38 @@
-import { Component, Input, Injectable } from '@angular/core';
+import { Component, Input, Injectable,Directive,SimpleChanges } from '@angular/core';
 import { Location } from '@angular/common';
 import { Feature } from 'ol';
-import { Store } from '@ngrx/store';
+import { Store,Action} from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
 import { commonReducers,ItemTypeService, IItem, Item } from '@farmmaps/common';
 import * as mapActions from '../../actions/map.actions';
 import { Observable, from } from 'rxjs';
 import { withLatestFrom } from 'rxjs/operators';
 import { tassign } from 'tassign';
-import { IQueryState } from '../../models';
+import { IQueryState } from '@farmmaps/common';
 
 
 @Injectable()
+@Directive()
 export abstract class AbstractFeatureListComponent {
   @Input() features: Array<Feature>;
   @Input() queryState: IQueryState;
+  @Input() selectedFeature: Feature;
   constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, private location: Location) {
   }
 
   handleFeatureClick(feature:Feature) {
-    var newQuery: any = tassign(mapReducers.initialState.query);
-    newQuery.itemCode = feature.get('code');
-    this.store.dispatch(new mapActions.DoQuery(newQuery));
+    if(feature) {
+      let action = this.getAction(feature);
+      this.store.dispatch(action);  
+    }
+  }
+
+  getAction(feature:Feature):Action {
+      var newQuery: any = tassign(mapReducers.initialState.queryState);
+      newQuery.parentCode = feature.get('parentCode');
+      newQuery.itemCode = feature.get('code');
+      newQuery.itemType = feature.get('itemType');
+      return new mapActions.DoQuery(newQuery)  
   }
 
   handleFeatureMouseEnter(feature) {
@@ -36,6 +47,11 @@ export abstract class AbstractFeatureListComponent {
     event.preventDefault();
     this.location.back();
   }
+
+  isFeatureSelected(feature:Feature):boolean {
+    if(!this.selectedFeature) return false;
+    return feature.getId() == this.selectedFeature.getId();
+  }  
 }
 
 @Injectable()

projects/common-map/src/fm-map/components/for-item/for-package.decorator.ts

@@ -0,0 +1,5 @@
+export function ForPackage(packageCode: string) {
+  return function (constructor:Function) {
+    constructor.prototype.forPackage = packageCode;
+  };
+}

projects/common-map/src/fm-map/components/item-list-item-container/item-list-item-container.component.ts

@@ -19,19 +19,39 @@ export class ItemListItemContainerComponent {
 
   @Input() item: IListItem;
 
-  @ViewChild(WidgetHostDirective) widgetHost: WidgetHostDirective; 
+  @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; 
 
   loadComponent() {
     var componentFactory: ComponentFactory<AbstractItemListItemComponent> = this.componentFactoryResolver.resolveComponentFactory(ItemListItemComponent); // default
-    for (var i = 0; i < this.itemComponentList.length; i++) {
-      if (this.itemComponentList[i]['forItemType'] &&
-        this.itemComponentList[i]['forItemType'].indexOf(this.item.itemType) >= 0 &&
-        this.itemComponentList[i]['forSourceTask'] &&
-        this.itemComponentList[i]['forSourceTask'].indexOf(this.item.sourceTask) >= 0 )
-      {
-        componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.itemComponentList[i]['constructor'] as any);
+
+    let selected = -1;
+    let maxMatches =0;
+    let showItem = true;
+    for (let i = 0; i < this.itemComponentList.length; i++) {
+      let matches=0;
+      let criteria=0;
+      if (this.itemComponentList[i]['forItemType']) {
+        criteria++;
+        if(this.itemComponentList[i]['forItemType'].indexOf(this.item.itemType) >= 0) {
+          matches++;
+        }
+      }
+      if (this.itemComponentList[i]['forSourceTask']) {
+        criteria++;
+        if(this.itemComponentList[i]['forSourceTask'].indexOf(this.item.sourceTask) >= 0) {
+          matches++;
+        }
+      }
+        
+      if(criteria == matches && matches > maxMatches) {
+        selected=i;
+        maxMatches = matches;
       }
     }
+    if (selected >= 0) {
+      componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.itemComponentList[selected]['constructor'] as any);         
+    }
+    
     const viewContainerRef = this.widgetHost.viewContainerRef;
     viewContainerRef.clear();
 

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

@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 
 .widget {

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

@@ -1,4 +1,4 @@
-import { Component, Input, Injectable} from '@angular/core';
+import { Component, Input, Injectable,Directive} from '@angular/core';
 import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
 import { commonReducers,ItemTypeService,IListItem } from '@farmmaps/common';
@@ -6,19 +6,37 @@ import { commonReducers,ItemTypeService,IListItem } from '@farmmaps/common';
 
 
 @Injectable()
+@Directive()
 export abstract class AbstractItemListItemComponent {
   @Input() item: IListItem
 
   constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService) {
   } 
+
+  getScaledValue(value:number,scale:number = 0):number {
+    let v = value;
+    if(scale && scale != 0) {
+      v=scale*value;
+    }
+    return v;
+  }
 }
 
 @Injectable()
+@Directive()
 export abstract class AbstractItemWidgetComponent {
   @Input() item: IListItem
 
   constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService) {
   }
+
+  getScaledValue(value:number,scale:number = 0):number {
+    let v = value;
+    if(scale && scale != 0) {
+      v=scale*value;
+    }
+    return v;
+  }
 }
 
 @Injectable()

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

@@ -1,4 +1,4 @@
-<div *ngIf="items;let items" class="widget-container">
+<div *ngIf="items;let items" class="widget-container pt-0">
   <div class="widget" *ngFor="let item of items" (click)="handleItemClick(item)">
     <div class="content">
       <fm-map-item-list-item-container [item]="item" class="item-container"></fm-map-item-list-item-container>

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

@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 
 .widget-container {
@@ -19,7 +18,7 @@
 .widget:after {
   content: "";
   display: block;
-  padding-bottom: 100%;
+  padding-bottom: 66%;
 }
 
 .content {

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

@@ -1,17 +1,14 @@
-import { Component, Input, Injectable } from '@angular/core';
+import { Component, Input, Injectable, Directive } from '@angular/core';
 import { Location } from '@angular/common';
-import { Feature } from 'ol';
 import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
-import { commonReducers,ItemTypeService, IItem, Item,IListItem } from '@farmmaps/common';
+import { commonReducers,ItemTypeService,IListItem } from '@farmmaps/common';
 import * as mapActions from '../../actions/map.actions';
-import { Observable, from } from 'rxjs';
-import { withLatestFrom } from 'rxjs/operators';
 import { tassign } from 'tassign';
-import { IQueryState } from '../../models';
 
 
 @Injectable()
+@Directive()
 export abstract class AbstractItemListComponent {
   @Input() items: Array<IListItem>
   constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, private location: Location) {

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

@@ -1,4 +1,4 @@
-<div *ngIf="widgets;let widgets" class="widget-container">
+<div *ngIf="widgets;let widgets" class="widget-container pt-0">
   <div class="widget" *ngFor="let widget of widgets">
     <div class="content">
       <ng-template #widgetTemplate></ng-template>

projects/common-map/src/fm-map/components/item-widget-list/item-widget-list.component.scss

@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 
 .widget-container {

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

@@ -0,0 +1,25 @@
+<div class="btn btn-outline-secondary layer-switcher" (click)="handleClick($event)">
+  <i class="fa fa-map-o"></i>  
+  <div class="layers hidden" [ngClass]="{'hidden':!(showLayerSwitcher|async)}" (click)="$event.stopPropagation();">
+    <div class="card layers-card m-1">
+      <div class="card-header">
+        <span i18n>Layers</span>
+        <i class="float-right fa fa-close" (click)="close($event)"></i>
+      </div>
+      <ul class="navbar-nav">
+        <li class="nav-item py-0">
+          <span><i class="fa fa-map-o" aria-hidden="true"></i>&nbsp;<span i18n>Base maps</span></span>
+          <div  class="mb-4">
+            <fm-map-layer-list [baseLayers]="true" [itemLayers]="baseLayers|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
+          </div>
+        </li>
+        <li class="nav-item py-0">
+          <span><i class="fa fa-map-o" aria-hidden="true"></i>&nbsp;<span i18n>Overlays</span></span>
+          <div class="mb-4">
+            <fm-map-layer-list [itemLayers]="overlayLayers|async" [selectedLayer]="selectedOverlayLayer|async" (onDelete)="handleOnDelete($event)" (onToggleVisibility)="handleOnToggleVisibility($event)" (onSetOpacity)="handleOnSetOpacity($event)" (onZoomToExtent)="handleZoomToExtent($event)" (onSelectLayer)="handleSelectOverlayLayer($event)"></fm-map-layer-list>
+          </div>
+        </li>
+      </ul>
+  </div>
+  </div>
+</div>

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

@@ -0,0 +1,71 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+.layer-switcher {  
+  display:block; 
+  width:2.5em;
+  height:2.5em;
+  background-color: $body-bg;
+  background-size: contain;
+  margin-top:0.5em;
+  text-align: center;
+  line-height: 2.5em; 
+  border-radius: 1.75em;
+  padding: 0;
+  color: $secondary;
+}
+
+.layer-switcher i {
+  font-weight: bold;
+}
+
+.layers {
+  color:$secondary;
+  position: absolute;
+  overflow: hidden;
+  bottom: -1em;
+  right: -1em;
+  text-align: left;
+  min-width: 100vw;
+  z-index: 4;
+ // transition: max-height 0.3s ease-out,max-width 0.3s ease-out,min-height 0.3s ease-out,min-width 0.3s ease-out;
+}
+
+.hidden {
+  max-width:0;
+  max-height: 0;
+  min-height: 0;
+  min-width: 0;
+}
+
+.navbar-nav {
+  padding-left: 7px;
+  padding-right: 7px;
+  margin-bottom: 7px;
+  overflow-x: hidden;
+  overflow-y: auto; 
+  bottom:-3rem;
+  height:  50vh;
+}
+
+@media screen and (min-width:44rem) {
+  .layer-switcher {
+    position: relative;
+  }
+
+  .layers {
+    max-width: 100%;
+    min-width: 22em;
+    bottom: 2.5em;
+    right: 2.5em;
+    min-height: 0;
+    max-height: calc(100vh - 9rem);
+  }
+
+  .hidden {
+    max-width:0;
+    max-height: 0;
+    min-height: 0;
+    min-width: 0;
+  }   
+}

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

@@ -0,0 +1,77 @@
+import { Component, OnInit,  OnChanges, SimpleChanges } from '@angular/core';
+import {IItemLayer} from '../../models/item.layer';
+import { Store } from '@ngrx/store';
+import * as mapReducers from '../../reducers/map.reducer';
+import * as mapActions from '../../actions/map.actions';
+import {createEmpty,extend } from 'ol/extent';
+import { Observable } from 'rxjs';
+
+@Component({
+  selector: 'fm-map-layer-switcher',
+  templateUrl: './layer-switcher.component.html',
+  styleUrls: ['./layer-switcher.component.scss']
+})
+export class LayerSwitcher  implements OnInit,OnChanges{
+
+  public showLayerSwitcher:Observable<boolean>;
+  public overlayLayers: Observable<Array<IItemLayer>>;
+  public selectedOverlayLayer: Observable<IItemLayer>;
+  public baseLayers: Observable<Array<IItemLayer>>;
+  public selectedBaseLayer: Observable<IItemLayer>;
+
+  constructor( private store: Store<mapReducers.State>) {
+  }
+
+  ngOnInit() { 
+    this.overlayLayers = this.store.select(mapReducers.selectGetOverlayLayers);
+    this.selectedOverlayLayer = this.store.select(mapReducers.selectGetSelectedOverlayLayer);
+    this.baseLayers = this.store.select(mapReducers.selectGetBaseLayers);
+    this.selectedBaseLayer = this.store.select(mapReducers.selectGetSelectedBaseLayer);
+    this.showLayerSwitcher = this.store.select(mapReducers.selectGetShowLayerSwitcher);
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+  }
+
+
+
+  handleClick(event:Event) {
+    event.stopPropagation();
+    this.store.dispatch(new mapActions.ShowLayerSwitcher(true));
+  }
+
+  close(event:Event) {
+    event.stopPropagation();
+    this.store.dispatch(new mapActions.ShowLayerSwitcher(false));
+  }
+
+
+
+  handleOnToggleVisibility(itemLayer: IItemLayer) {
+    this.store.dispatch(new mapActions.SetVisibility(itemLayer,!itemLayer.visible));
+  }
+
+  handleOnSetOpacity(event:{ layer: IItemLayer,opacity:number }) {
+    this.store.dispatch(new mapActions.SetOpacity(event.layer, event.opacity));
+  }
+
+  handleOnDelete(itemLayer: IItemLayer) {
+    this.store.dispatch(new mapActions.RemoveLayer(itemLayer));
+  }
+
+  handleZoomToExtent(itemLayer: IItemLayer) {
+    var extent =  createEmpty();
+    extend(extent, itemLayer.layer.getExtent());
+    if (extent) {
+      this.store.dispatch(new mapActions.SetExtent(extent));
+    }    
+  }
+
+  handleSelectOverlayLayer(itemLayer: IItemLayer) {
+    this.store.dispatch(new mapActions.SelectOverlayLayer(itemLayer));
+  }
+
+  handleSelectBaseLayer(itemLayer: IItemLayer) {
+    this.store.dispatch(new mapActions.SelectBaseLayer(itemLayer));
+  }
+}

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

@@ -1,6 +1,6 @@
-<table class="container" *ngIf="layer">
+<table class="container" *ngIf="showLegend()">
   <tr>
-    <td colspan="2">
+    <td colspan="3">
       <div class="title">
         <h4 *ngIf="showTitle">{{layer.name}}</h4>
         <b *ngIf="layer.unit">({{layer.unit}})</b>
@@ -14,23 +14,28 @@
     </td>
   </tr>
   <tr *ngFor="let entry of layer.renderer.colorMap.entries; let i = index ">
-    <td class="legend-items"><div [style.background-color]="getHex(entry.color)"></div></td>
-    <td class="legend-items-text">{{entry.value | number:'1.0-2'}} {{legendunit}}</td>
-    <!--<td class="histogram-items-text"><span *ngIf="histogramenabled">{{entry.value}} {{histogramunit}}</span></td>
+    <td class="legend-items"><span [style.background-color]="getHex(entry.color)" class="color"></span></td>
+    <td class="legend-items-text"><span *ngIf="!entry.label">{{getScaledValue(entry.value,layer.scale) | number:'1.0-2'}} {{legendunit}}</span><span *ngIf="entry.label">{{entry.label}}</span></td>    
     <td class="histogram-items">
-      <div *ngIf="histogramenabled" [style.background-color]="getHex(selectedColorMap.noValue)" [style.width]="getPart(selectedColorMap, entry)">
+      <div *ngIf="showHistogram()">
+        <span class="bar" [style.background-color]="getHex(entry.color)" [style.width]="getPart(layer.renderer, i)">
+        </span>
+        <span class="bar-label">{{getLabel(layer.renderer,i)}}</span>
       </div>     
-    </td>-->
-  </tr>
-  <tr>
-    <td colspan="4"></td>
-  </tr>
-  <!--<tr>
-    <td>
-      <i class="fas fa-chart-bar" (click)="onClickHistoGram()"></i>
     </td>
-    <td colspan="3"></td>
-  </tr>-->
+  </tr>  
+  <tr *ngIf="showHistogram()">
+    <td colspan="4" class="pb-2 pt-2">
+      <a i18n-title title="more info"><i class="fa fa-info-circle text-primary" (click)="hideHistogramDetails = !hideHistogramDetails"></i></a>
+      <div class="info pt-2"  [ngbCollapse]="hideHistogramDetails">
+        <div><span i18n>Average: </span>{{layer.renderer.band.histogram.mean| number:'1.0-3'}}</div>
+        <div><span i18n>Standard deviation: </span>{{layer.renderer.band.histogram.stddev| number:'1.0-3'}}</div>
+        <div><span i18n>Min: </span>{{layer.renderer.band.histogram.min| number:'1.0-3'}}</div>
+        <div><span i18n>Max: </span>{{layer.renderer.band.histogram.max| number:'1.0-3'}}</div>
+        <div *ngIf="showConfidenceInterval()"><span i18n>Confidence interval:</span> {{layer.renderer.band.histogram.confidence * 100| number:'1.0-0'}}%</div>  
+      </div>  
+    </td>
+  </tr>
 </table>
 
 

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

@@ -16,9 +16,13 @@
   margin-bottom: 0;
 }
 
-.legend-items {
+span.color {
+  display:inline-block;
   width: 1.5em;
   height: 1.5em;
+}
+
+.legend-items {
   padding: 0.1em;
   border-style: none;
   border-width: 0.05em;
@@ -33,19 +37,14 @@
   max-width: 20em;
   padding-left: 0.5em;
   text-align: left;
+  white-space: nowrap;
 }
 
 .histogram-items {
-  width: 5em;
+  width: 100%;
   padding-left: 1em;
 }
 
-  .histogram-items > div {
-    height: 1em;
-    border-style: solid;
-    border-width: 0.05em;
-    vertical-align: middle;
-  }
 
 .histogram-items-text {
   max-width: 20em;
@@ -54,5 +53,19 @@
   text-align: left;
 }
 
+.bar {
+  display:inline-block;
+  height: 1em;
+  vertical-align: middle;
+}
+
+.bar-label {
+  margin-left:0.3em;
+  font-size:0.7em;
+}
+
+.info {
+  line-height: 1.3em;
+}
 
 

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

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input,AfterViewInit } from '@angular/core';
-import { IColorMap, IColor, IColorEntry,ILayer } from '../../models';
+import { IColorMap, IColor, IColorEntry,ILayer, IRenderer } from '../../models/color.map';
 
 
 @Component({
@@ -40,27 +40,57 @@ export class LegendComponent implements OnInit,AfterViewInit {
   @Input()
   histogramunit: string;
 
+  public hideHistogramDetails:boolean = true;
 
   onClickHistoGram(): void {
     this.histogramenabled = !this.histogramenabled;
   }
 
+
+
+
   public getHex(color: IColor): string {
     return '#' + this.componentToHex(color.red) + this.componentToHex(color.green) + this.componentToHex(color.blue);
   }
 
-  public componentToHex(c: number): string {
+  private componentToHex(c: number): string {
     const hex = c.toString(16);
     return hex.length === 1 ? `0${hex}` : hex;
   }
 
-  private getPart(colorMap: IColorMap, colorEntry: IColorEntry): string {
-    let sumOfValue = colorMap.entries.reduce((sum, item) => sum + item.value, 0);
-    let part = ((colorEntry.value / sumOfValue) * 100) + "%";
+  public getPart(renderer: IRenderer, index: number): string {
+    let max = renderer.band.histogram.entries.reduce((max, entry) => entry.freqency > max ? entry.freqency : max, 0);
+    let scale = 65 / max;
+    let part = (renderer.band.histogram.entries[index].freqency * scale) + "%";
 
     return part;
   }
 
+  public getScaledValue(value:number,scale:number):number {
+     let v = value;
+     if(scale && scale != 0) {
+       v=scale*value;
+     }
+     return v;
+  }
+
+  public getLabel(renderer: IRenderer, index: number): string {
+    let scale = 100 / renderer.band.histogram.entries.reduce((sum, entry) => sum + entry.freqency, 0);
+    let percent = renderer.band.histogram.entries[index].freqency * scale;
+    return percent < 0.1 ? "" : percent.toFixed(1) + " %";
+  }
+
+  showLegend(): boolean {
+       return this.layer && this.layer.renderer && this.layer.renderer.renderType != "MULTIBAND_COLOR";
+  }
+
+  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";
+  }
+
+  showConfidenceInterval():boolean {
+    return this.histogramenabled && this.layer.renderer.band.histogram.confidence != null && this.layer.renderer.band.histogram.confidence != 1;
+  }
 }
 
 

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

@@ -1 +0,0 @@
-export * from './map-search.component';

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

@@ -19,13 +19,16 @@
       <div class="options">
         <div class="form-check">
           <input class="form-check-input" (ngModelChange)="handleChangeEnableDateFilter($event)" [ngModel]="dateFilter" name="datefilterEnabled" type="checkbox" value="" id="filtercheck1">
-          <label class="form-check-label" for="filtercheck1">from <a (click)="handleOpenSelectPeriodModal($event)" href="#">{{startEndCaption}}</a></label>
+          <label class="form-check-label" for="filtercheck1"><span i18n>from</span> <a (click)="handleOpenSelectPeriodModal($event)" href="#">{{startEndCaption}}</a></label>
         </div>
         <div class="form-check">
           <input class="form-check-input" (ngModelChange)="handleChangeEnableBBOXFilter($event)" [ngModel]="filterOptionsLocal.bboxFilter" name="bboxfilterEnabled" type="checkbox" value="" id="filtercheck2">
-          <label class="form-check-label" for="filtercheck2">Restrict to visible area</label>
+          <label class="form-check-label" for="filtercheck2" i18n>Restrict to visible area</label>
         </div>    
       </div>
+      <div class="shortcuts">
+        <router-outlet name="map-search"></router-outlet>
+      </div>
     </form>
     <ng-content></ng-content>
   </div>  

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

@@ -1,11 +1,12 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 div.map-search {
   position: absolute;
   top: 0.5rem;
   left: 0.5rem;
   transition: opacity 0.5s ease-out, left 0.3s,max-height 0.3s ease-out,max-width 0.3s ease-out;
   max-height: 10rem;
-  width: 21rem;
-  max-width: 21rem;
+  min-width: calc(100vw - 1rem);
   box-shadow: 0 0 20px rgba(0, 0, 0, 0.3);
   z-index:3;
 }
@@ -40,11 +41,13 @@ div.map-search button {
 div.map-search.collapsed {
   max-height:3.5rem;
   max-width:10rem;
+  min-width: 0;
 }
 
 div.map-search.searchcollapsed {
   max-height: 3.5rem;
   max-width: 6rem;
+  min-width: unset;
 }
 
 div.map-search div.options {
@@ -55,11 +58,24 @@ div.map-search div.options {
   max-height:4.5rem;
 }
 
+div.map-search div.shortcuts {
+  padding-top: 0.5rem;
+  line-height: 1.5rem;
+  overflow: hidden;
+  max-height: 50vh;
+  transition: max-height 0.3s ease-in-out;
+}
+
 div.map-search.collapsed div.options, div.map-search.searchcollapsed div.options {
   max-height: 0;
   padding:0;
 }
 
+div.map-search.collapsed div.shortcuts, div.map-search.searchcollapsed div.shortcuts {
+  max-height: 0;
+  padding:0;
+}
+
 div.map-search button {
   overflow: hidden;
 }
@@ -89,6 +105,18 @@ div.map-search.searchcollapsed button[type="submit"] {
   white-space:nowrap;
 }
 
+.form-control, .form-control:focus {
+  border-color: $secondary;
+}
+
+
+@media screen and (min-width:44rem) {
+  div.map-search {
+    width: 21rem;
+    max-width: 21rem;
+    min-width:0;
+  }
+}
 
 
 

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

@@ -2,8 +2,8 @@ import { Component, Input, Output, OnInit, EventEmitter, SimpleChanges, OnChange
 import { Observable ,  of } from 'rxjs';
 import { debounceTime,distinctUntilChanged,tap,switchMap,merge,catchError} from 'rxjs/operators';
 import { TypeaheadService, TimespanService } from '@farmmaps/common';
-import { IQueryState,IPeriodState } from '../../models';
-import { fillProperties } from '@angular/core/src/util/property';
+import { IQueryState } from '@farmmaps/common';
+import { IPeriodState } from '../../models/period.state';
 import { tassign } from 'tassign';
 
 @Component({
@@ -13,7 +13,7 @@ import { tassign } from 'tassign';
 })
 export class MapSearchComponent {
 
-  @ViewChild('searchText') searchText;
+  @ViewChild('searchText', { static: true }) searchText;
   @Input() clearEnabled: boolean
   @Input() set collapsed(collapsed: boolean) {
     this.collapsedLocal = collapsed;
@@ -67,7 +67,7 @@ export class MapSearchComponent {
   public disabled: boolean = true;
 
   constructor(private typeaheadService: TypeaheadService, private timespanService: TimespanService) {
-    this.filterOptionsLocal = { query: "", tags: "", startDate: null, endDate: null, bboxFilter: true, itemType: null, itemCode:null,level:0,parentCode:null,bbox:[] };   
+    this.filterOptionsLocal = { query: "", tags: "", startDate: null, endDate: null, bboxFilter: false, itemType: null, itemCode:null,level:0,parentCode:null,bbox:[] };   
   }
 
   search = (text$: Observable<string>) =>

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

@@ -1,58 +1,72 @@
-<aol-map #map (onMoveEnd)="handleOnMoveEnd($event)" (click)="handleOnMouseDown($event)" [ngClass]="{'panel-visible':(panelVisible|async)}" class="map">  
-  <div>
+<ng-container *ngIf="{
+  mapState:mapState$|async,
+  extent:extent$|async,
+  baseLayers:baseLayers$|async,
+  overlayLayers:overlayLayers$|async,
+  selectedItemLayer:selectedItemLayer$|async,
+  features:features$|async,
+  position:position$|async,
+  parentCode:parentCode$|async,
+  panelVisible:panelVisible$|async,
+  openedModalName:openedModalName$|async,
+  panelCollapsed:panelCollapsed$|async,
+  searchMinified:searchMinified$|async,
+  selectedItem:selectedItem$|async,
+  parentItem:parentItem$|async,
+  queryState:queryState$|async,
+  searchCollapsed:searchCollapsed$|async,
+  clearEnabled:clearEnabled$|async,
+  period:period$|async,
+  compassHeading:compassHeading$|async,
+  styles:styles$|async,
+  selectedFeature:selectedFeature$|async
+} as state">
+  <aol-map #map (moveEnd)="handleOnMoveEnd($event)" (click)="handleOnMouseDown($event)" [ngClass]="{'panel-visible':state.panelVisible}" class="map">
+    <div>
 
-  </div>
-  <aol-view [zoom]="(mapState|async).zoom" [rotation]="(mapState|async).rotation">
-     <aol-coordinate [x]="(mapState|async).xCenter" [y]="(mapState|async).yCenter" [srid]="'EPSG:4326'"></aol-coordinate>
-     <fm-map-zoom-to-extent [extent]="extent|async" [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]="baseLayers|async"></fm-map-item-layers>
-  <fm-map-item-layers [itemLayers]="overlayLayers|async"></fm-map-item-layers>
-  <fm-map-item-layers [itemLayer]="selectedItemLayer|async"></fm-map-item-layers>
-  <aol-layer-vector>
-    <fm-map-item-source-vector [features]="features|async" (onFeaturesSelected)="handleFeaturesSelected($event)" [selectedFeature]="selectedFeature|async" [selectedItem]="selectedItem|async"></fm-map-item-source-vector>
-  </aol-layer-vector>
-  <fm-map-gps-location [position]="position|async" [headingTolerance]="20" [showHeading]="true"></fm-map-gps-location>
-  <div class="control-container">
-<!--    <switch2d3d></switch2d3d>-->
-    <fm-map-rotation-reset></fm-map-rotation-reset>
-  </div>
-  <fm-map-file-drop-target [parentCode]="(parentCode | async)" (onFileDropped)="handleFileDropped($event)"></fm-map-file-drop-target>
-</aol-map>
-<fm-map-map-search #mapSearch [openedModalName]="openedModalName|async" (onOpenModal)="handleOpenModal($event)" (onCloseModal)="handleCloseModal()" [ngClass]="{'menuVisible':(menuVisible|async)}" (onToggleMenu)="handleToggleMenu($event)" (onSearchCollapse)="handleSearchCollapse($event)" (onSearchExpand)="handleSearchExpand($event)" [collapsed]="searchCollapsed|async" [searchMinified]="(searchMinified | async)" (onSearch)="handleSearch($event)" (onClear)="handleClearSearch($event)" [filterOptions]="queryState|async" [clearEnabled]="clearEnabled|async" [period]="period|async"></fm-map-map-search>
-<fm-side-panel [resizeable]="true" [visible]="(panelVisible|async)" [collapsed]="(panelCollapsed|async)" [collapsable]="false">
-  <div class="panel-wrapper">
-    <div class="panel-top bg-secondary" *ngIf="!(searchMinified | async)">
     </div>
-    <div class="panel-bottom">
-
-      <div *ngIf="!(selectedItem|async)">
-        <fm-map-feature-list-container [features]="(features | async)" [queryState]="(queryState|async)"></fm-map-feature-list-container>
+    <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 [itemLayers]="state.overlayLayers"></fm-map-item-layers>
+    <fm-map-item-layers [itemLayer]="state.selectedItemLayer"></fm-map-item-layers>
+    <aol-layer-vector>
+      <fm-map-item-source-vector [styles]="state.styles" [features]="state.features" (onFeaturesSelected)="handleFeatureClick($event)" (onFeatureHover)="handleFeatureHover($event)" [selectedFeature]="state.selectedFeature" [selectedItem]="state.selectedItem"></fm-map-item-source-vector>
+    </aol-layer-vector>
+    <fm-map-gps-location [position]="state.position" [headingTolerance]="20" [showHeading]="true" [heading]="state.compassHeading"></fm-map-gps-location>
+    <div class="control-container">
+  <!--    <switch2d3d></switch2d3d>-->
+      <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>
+    <fm-map-file-drop-target [parentCode]="state.parentCode" (onFileDropped)="handleFileDropped($event)"></fm-map-file-drop-target>
+  </aol-map>
+  <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-side-panel [resizeable]="true" [visible]="state.panelVisible" [collapsed]="state.panelCollapsed" [collapsable]="false">
+    <div class="panel-wrapper">
+      <div class="panel-top bg-secondary" *ngIf="!(state.searchMinified)">
       </div>
+      <div class="panel-bottom">
 
-      <div *ngIf="(selectedItem | async);let item">
-        <fm-map-selected-item-container [item]="item"></fm-map-selected-item-container>
-      </div>
-      <div *ngIf="(features|async).length == 0" class="no-results  m-2">
-        <div *ngIf="(queryState|async)?.query">Cannot find <span>{{(queryState|async)?.query}}</span></div>
-        <div *ngIf="(queryState|async)?.tags">Cannot find tag <span>{{(queryState|async)?.tags}}</span></div>
+        <div *ngIf="!(state.selectedItem)">
+          <fm-map-feature-list-container [features]="state.features" [selectedFeature]="state.selectedFeature" [queryState]="state.queryState" [clickedFeature]="clickedFeature"></fm-map-feature-list-container>
+        </div>
+
+        <div *ngIf="state.selectedItem;let item">
+          <fm-map-selected-item-container [item]="item" [parentItem]="state.parentItem" [itemLayer]="state.selectedItemLayer" [overlayLayers]="state.overlayLayers"></fm-map-selected-item-container>
+        </div>
+        <div *ngIf="state.features.length == 0" class="no-results  m-2">
+          <div *ngIf="state.queryState.query">Cannot find <span>{{state.queryState?.query}}</span></div>
+          <div *ngIf="state.queryState?.tags">Cannot find tag <span>{{state.queryState?.tags}}</span></div>
+        </div>
       </div>
     </div>
-  </div>
-</fm-side-panel>
-<fm-side-panel [visible]="(menuVisible|async)" class="menu">
-  <div class="container-fluid">
-    <div class="body">
-      <div class="d-flex flex-row">
-        <div class="mt-2 mb-2 flex-grow-1 logo"><router-outlet name="side-panel-logo"></router-outlet></div>
-        <div class="mt-2 mb-2 ml-2"><button type="button" class="btn btn-outline-secondary" (click)="handleToggleMenu($event)"><i class="fa fa-times" aria-hidden="true"></i></button></div>
-      </div>
-      <div class="d-flex flex-column cards"> 
-          <router-outlet name="side-panel-menu"></router-outlet>          
-      </div>      
-  </div>
-  </div>
-</fm-side-panel>
+  </fm-side-panel>
+</ng-container>
+
 

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

@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 
 aol-map { position:absolute;width:100%;height:100%;}
@@ -117,10 +116,6 @@ timespan.menuVisible {
   transition: height 0.5s;
 }
 
-:host ::ng-deep .menu .side-panel {
-  z-index: 100;
-  background-color: rgb(245,245,245);
-}
 
 @media screen and (min-width:44rem) {
   .panel-top {

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

@@ -1,19 +1,24 @@
-import { Component, OnInit, OnDestroy, HostListener, Inject, ViewChild, AfterViewInit } from '@angular/core';
+import { Component, OnInit, OnDestroy, HostListener, ViewChild, AfterViewInit,NgZone } from '@angular/core';
 import { Location } from '@angular/common';
-import { Observable, Subject, Subscription,combineLatest, from } from 'rxjs';
-import { debounce, withLatestFrom, first, combineAll } from 'rxjs/operators';
-import { Router, ActivatedRoute, ParamMap, Event } from '@angular/router';
+import { Observable, Subject, Subscription, from,of  } from 'rxjs';
+import { withLatestFrom, switchMap,skip  } from 'rxjs/operators';
+import { Router, ActivatedRoute, ParamMap } from '@angular/router';
 import { Store } from '@ngrx/store';
 //import { proj,Map } from 'openlayers';
 
 // Map
 import * as mapReducers from '../../reducers/map.reducer';
 import * as mapActions from '../../actions/map.actions';
-import { IMapState,ISelectedFeatures,IItemLayer, ItemLayer,IQueryState,IPeriodState } from '../../models';
+import { IMapState} from '../../models/map.state';
+import { ISelectedFeatures } from '../../models/selected.features';
+import { IItemLayer } from '../../models/item.layer';
+import { IQueryState } from '@farmmaps/common';
+import { IPeriodState } from '../../models/period.state';
+import {IStyles} from '../../models/style.cache';
 import { IDroppedFile } from '../aol/file-drop-target/file-drop-target.component';
-import { IMetaData } from '../meta-data-modal/meta-data-modal.component';
-import { StateSerializerService } from '../../services/state-serializer.service';
+import { StateSerializerService } from '@farmmaps/common';
 import { GeolocationService} from '../../services/geolocation.service';
+import {DeviceOrientationService} from '../../services/device-orientation.service';
 
 // AppCommon
 import { ResumableFileUploadService, ItemTypeService } from '@farmmaps/common';
@@ -24,8 +29,8 @@ import {commonActions} from '@farmmaps/common';
 import {Feature} from 'ol';
 import {Extent,createEmpty,extend } from 'ol/extent';
 import {transform} from 'ol/proj';
-import { query } from '@angular/animations';
 import { tassign } from 'tassign';
+import * as style from 'ol/style';
 
 
 @Component({
@@ -36,41 +41,87 @@ import { tassign } from 'tassign';
 
 export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   title: string = 'Map';
-  public openedModalName: Observable<string>;
-  public itemTypes: Observable<{ [id: string]: IItemType }>;
-  public mapState: Observable<IMapState>;
-  public features: Observable<Array<Feature>>;
-  public overlayLayers: Observable<Array<IItemLayer>>;
-  public selectedOverlayLayer: Observable<IItemLayer>;
-  public selectedItemLayer: Observable<IItemLayer>;
-  public baseLayers: Observable<Array<IItemLayer>>;
-  public selectedBaseLayer: Observable<IItemLayer>;
-  public projection: Observable<string>;
-  public selectedFeatures: Subject<ISelectedFeatures> = new Subject<ISelectedFeatures>();
-  public droppedFile: Subject<IDroppedFile>  = new Subject<IDroppedFile>();
+  public openedModalName$: Observable<string> = this.store.select(commonReducers.selectOpenedModalName);
+  public itemTypes$: Observable<{ [id: string]: IItemType }>;
+  public mapState$: Observable<IMapState> = this.store.select(mapReducers.selectGetMapState);
+  public features$: Observable<Array<Feature>> = this.store.select(mapReducers.selectGetFeatures);
+  public overlayLayers$: Observable<Array<IItemLayer>> = this.store.select(mapReducers.selectGetOverlayLayers);
+  public selectedOverlayLayer$: Observable<IItemLayer> = this.store.select(mapReducers.selectGetSelectedOverlayLayer);
+  public selectedItemLayer$: Observable<IItemLayer> = this.store.select(mapReducers.selectGetSelectedItemLayer);
+  public baseLayers$: Observable<Array<IItemLayer>> = this.store.select(mapReducers.selectGetBaseLayers);
+  public selectedBaseLayer$: Observable<IItemLayer> =  this.store.select(mapReducers.selectGetSelectedBaseLayer);
+  public projection$: Observable<string> = this.store.select(mapReducers.selectGetProjection);
+  public selectedFeatures$: Subject<ISelectedFeatures> = new Subject<ISelectedFeatures>();
+  public droppedFile$: Subject<IDroppedFile>  = new Subject<IDroppedFile>();
   private paramSub: Subscription;
   private itemTypeSub: Subscription;
-  private mapStateSub: Subscription;
+  private stateSub: Subscription;
   private queryStateSub: Subscription;
-  public parentCode: Observable<string>;
-  public panelVisible: Observable<boolean>;
-  public panelCollapsed: Observable<boolean>;
-  public selectedFeature: Observable<Feature>;
-  public selectedItem: Observable<IItem>;
-  public queryState: Observable<IQueryState>;
-  public period: Observable<IPeriodState>;
-  public clearEnabled: Observable<boolean>;
-  public searchCollapsed: Observable<boolean>;
-  public searchMinified: Observable<boolean>;
-  public menuVisible: Observable<boolean>;
-  public query: Observable<IQueryState>;
-  public position: Observable<Position>;
+  private querySub: Subscription;
+  public parentCode$: Observable<string> =this.store.select(mapReducers.selectGetParentCode);
+  public panelVisible$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelVisible);
+  public panelCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelCollapsed);
+  public selectedFeature$: Observable<Feature> = this.store.select(mapReducers.selectGetSelectedFeature);
+  public clickedFeature: Subject<Feature> = new Subject<Feature>();
+  public selectedItem$: Observable<IItem> = this.store.select(mapReducers.selectGetSelectedItem);
+  public parentItem$: Observable<IItem> =this.store.select(mapReducers.selectGetParentItem);
+  public queryState$: Observable<IQueryState> = this.store.select(mapReducers.selectGetQueryState);
+  public state$:Observable<{mapState:IMapState,queryState:IQueryState,setStateCount:number}> = this.store.select(mapReducers.selectGetState);
+  public period$: Observable<IPeriodState> = this.store.select(mapReducers.selectGetPeriod);
+  public clearEnabled$: Observable<boolean> = this.store.select(mapReducers.selectGetClearEnabled);
+  public searchCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetSearchCollapsed);
+  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 compassHeading$: Observable<number> = this.deviceorientationService.getCurrentCompassHeading();
   public baseLayersCollapsed:boolean = true;
   public overlayLayersCollapsed: boolean = true;
-  public extent: Observable<Extent>;
+  public extent$: Observable<Extent> = this.store.select(mapReducers.selectGetExtent);
+  public styles$:Observable<IStyles> = this.store.select(mapReducers.selectGetStyles);
+  private setStateCount$:Observable<number> =  this.store.select(mapReducers.selectgetSetStateCount);
+  private lastUrl = "";
+
   @ViewChild('map') map;
 
-  constructor(private store: Store<mapReducers.State | commonReducers.State>, private route: ActivatedRoute, private router: Router, private uploadService: ResumableFileUploadService, private serializeService: StateSerializerService, public itemTypeService: ItemTypeService, private location: Location, private geolocationService: GeolocationService ) {
+  constructor(private store: Store<mapReducers.State | commonReducers.State>,
+    private route: ActivatedRoute,
+    private router: Router,
+    private uploadService: ResumableFileUploadService,
+    private serializeService: StateSerializerService,
+    public itemTypeService: ItemTypeService,
+    private location: Location,
+    private geolocationService: GeolocationService,
+    private zone: NgZone,
+    private deviceorientationService:DeviceOrientationService) {
+      this.querySub = this.query$.pipe(skip(1), withLatestFrom(this.mapState$),withLatestFrom(this.setStateCount$)).subscribe(([[queryState,mapState],setStateCount]) =>{
+        if(queryState) {
+          let newQueryState = tassign(mapReducers.initialQueryState);
+          console.debug(`Do Query ${setStateCount}`);
+          let urlparts=[];
+          if (queryState.itemCode && queryState.itemCode != "") {
+            if(queryState.itemType && queryState.itemType!= "") {
+              let itemType = this.itemTypeService.itemTypes[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);
+              }
+            }
+          } else {
+            newQueryState= queryState;
+          }
+          if(urlparts.length==0 ) {
+            newQueryState.itemCode = queryState.itemCode;
+            this.zone.run(() => {
+              this.store.dispatch(new mapActions.SetQueryState(newQueryState,false));
+            })
+          } else {
+            this.router.navigate(urlparts);
+          }
+        }
+      });
   }
 
   @HostListener('document:keyup', ['$event'])
@@ -93,11 +144,12 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     this.uploadService.addFiles(droppedFile.files, droppedFile.event, { parentCode:droppedFile.parentCode, geometry:droppedFile.geometry });
   }
 
-  handleFeaturesSelected(feature: Feature) {
-    if (feature) {
-      let newQuery = tassign(mapReducers.initialQueryState, { itemCode: feature.get('code') });
-      this.store.dispatch(new mapActions.DoQuery(newQuery));
-    }
+  handleFeatureClick(feature: Feature) {
+    this.clickedFeature.next(feature);
+  }
+
+  handleFeatureHover(feature: Feature) {
+    this.store.dispatch(new mapActions.SelectFeature(feature));
   }
 
   handleSearch(queryState: IQueryState) {
@@ -105,83 +157,134 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   }
 
   ngOnInit() {
-    this.store.dispatch(new mapActions.Init());
-    this.selectedFeatures.next({x:0,y:0,features:[]});
-    this.mapState = this.store.select(mapReducers.selectGetMapState);
-    this.parentCode = this.store.select(mapReducers.selectGetParentCode);
-    this.features = this.store.select(mapReducers.selectGetFeatures);
-    this.overlayLayers = this.store.select(mapReducers.selectGetOverlayLayers);
-    this.selectedOverlayLayer = this.store.select(mapReducers.selectGetSelectedOverlayLayer);
-    this.baseLayers = this.store.select(mapReducers.selectGetBaseLayers);
-    this.projection = this.store.select(mapReducers.selectGetProjection);
-    this.selectedBaseLayer = this.store.select(mapReducers.selectGetSelectedBaseLayer);
-    this.panelVisible = this.store.select(mapReducers.selectGetPanelVisible);
-    this.panelCollapsed = this.store.select(mapReducers.selectGetPanelCollapsed);
-    this.selectedFeature = this.store.select(mapReducers.selectGetSelectedFeature);
-    this.selectedItem = this.store.select(mapReducers.selectGetSelectedItem);
-    this.queryState = this.store.select(mapReducers.selectGetQueryState);
-    this.clearEnabled = this.store.select(mapReducers.selectGetClearEnabled);
-    this.searchCollapsed = this.store.select(mapReducers.selectGetSearchCollapsed);
-    this.searchMinified = this.store.select(mapReducers.selectGetSearchMinified);
-    this.menuVisible = this.store.select(mapReducers.selectGetMenuVisible);
-    this.openedModalName = this.store.select(commonReducers.selectOpenedModalName);
-    this.query = this.store.select(mapReducers.selectGetQuery);
-    this.extent = this.store.select(mapReducers.selectGetExtent);
-    this.selectedFeatures.next(null);
-    this.selectedItemLayer = this.store.select(mapReducers.selectGetSelectedItemLayer);
-    this.period = this.store.select(mapReducers.selectGetPeriod);
-    this.position = this.geolocationService.getCurrentPosition();
-
-    this.mapState.pipe(withLatestFrom(this.queryState)).subscribe((state) => {
-      this.replaceUrl(state[0], state[1], true);
-    });
-    this.query.pipe(withLatestFrom(this.mapState)).subscribe((state) => {
-      this.replaceUrl(state[1], state[0],false);
-    });
+    console.debug("Init");
+    this.store.dispatch(new mapActions.Clear());
+    this.selectedFeatures$.next({x:0,y:0,features:[]});
+    this.selectedFeatures$.next(null);
   }
 
-  private stateSetCount: number = 0;
-  private lastQueryState: string = this.serializeService.serialize(mapReducers.initialQueryState);
-  private lastMapState: string = "";
-  ngAfterViewInit() {
-    this.paramSub = this.route.paramMap.subscribe((params: ParamMap) => {
-      //console.log("Param sub");
-      var newMapState: IMapState = null;
-      var newQueryState: IQueryState = null;
-      var mapStateChanged = false;
-      var queryStateChanged = false;
-      if (params.has("xCenter") && params.has("yCenter")) {
-        let xCenter = parseFloat(params.get("xCenter"));
-        let yCenter = parseFloat(params.get("yCenter"));
-        let zoom = parseFloat(params.get("zoom"));
-        let rotation = parseFloat(params.get("rotation"));
-        let baseLayer = params.get("baseLayer")?params.get("baseLayer"):"";
-        newMapState = { xCenter: xCenter, yCenter: yCenter, zoom: zoom, rotation: rotation, baseLayerCode: baseLayer }
-        mapStateChanged = this.lastMapState != JSON.stringify(newMapState) && this.stateSetCount == 0;
-        this.lastMapState = JSON.stringify(newMapState);
+  initCustomStyles() {
+    this.store.dispatch(new mapActions.SetStyle('vnd.farmmaps.itemtype.layer',new style.Style({
+      stroke: new style.Stroke({
+        color: 'red',
+        lineDash: [ 5,5],
+        width: 1
+      }),
+      geometry:(feature) =>feature.getGeometry()
+    })));
+    this.store.dispatch(new mapActions.SetStyle('vnd.farmmaps.itemtype.layer_selected',new style.Style({
+      stroke: new style.Stroke({
+        color: 'red',
+        lineDash: [ 5,5],
+        width: 3
+      }),
+      geometry:(feature) =>feature.getGeometry()
+    })));
+  }
+
+  round(value:number,decimals:number):number {
+    let d = Math.pow(10, decimals);
+    return Math.round((value + Number.EPSILON)*d)/d;
+  }
+
+  getMapStateFromUrl(params:ParamMap):IMapState {
+    var hasUrlmapState = params.has("xCenter") && params.has("yCenter");
+    if (hasUrlmapState) {
+      let xCenter = parseFloat(params.get("xCenter"));
+      let yCenter = parseFloat(params.get("yCenter"));
+      let zoom = parseFloat(params.get("zoom"));
+      let rotation = parseFloat(params.get("rotation"));
+      let baseLayer = params.get("baseLayer")?params.get("baseLayer"):"";
+      var newMapState = {zoom: zoom, rotation: rotation, xCenter: xCenter, yCenter: yCenter, baseLayerCode: baseLayer };
+      return newMapState;
+    } else {
+      return null;
+    }
+  }
+
+  normalizeMapState(mapState:IMapState):IMapState {
+    if(!mapState) return null;
+    return {zoom: this.round(mapState.zoom,0),
+      rotation: this.round(mapState.rotation,2),
+      xCenter: this.round(mapState.xCenter,5),
+      yCenter: this.round(mapState.yCenter,5),
+      baseLayerCode: mapState.baseLayerCode };
+  }
+
+  serializeMapState(mapState:IMapState):string {
+    return JSON.stringify(this.normalizeMapState(mapState));
+  }
+
+  getQueryStateFromUrl(params:ParamMap):IQueryState {
+    if (params.has("queryState")) {
+      let queryState = params.get("queryState");
+      var newQueryState = tassign(mapReducers.initialQueryState);
+      if (queryState != "") {
+        newQueryState = this.serializeService.deserialize(queryState);
       }
-      if (params.has("queryState")) {
-        let queryState = params.get("queryState");
-        newQueryState = tassign(mapReducers.initialQueryState);
-        if (queryState != "") {
-          newQueryState = this.serializeService.deserialize(queryState);
-        }
-        queryStateChanged = this.lastQueryState != queryState;
-        this.lastQueryState = queryState;
+      return newQueryState;
+    } else {
+      return null;
+    }
+  }
+
+  ngAfterViewInit() {
+    console.debug("View init");
+    this.initCustomStyles();
+
+    // url to state
+
+    this.paramSub = this.route.paramMap.pipe(withLatestFrom(this.state$),switchMap(([params,state]) => {
+      var newMapState: IMapState = state.mapState;
+      var newQueryState: IQueryState = state.queryState;
+
+      var queryStateChanged = false;
+      var mapStateChanged = false;
+      let urlMapState = this.getMapStateFromUrl(params);
+      if(urlMapState) {
+        newMapState = urlMapState;
+        mapStateChanged = this.serializeMapState(state.mapState) != this.serializeMapState(newMapState);
       }
 
-      if (mapStateChanged && queryStateChanged) {
-        //console.log("Both states");
-        this.store.dispatch(new mapActions.SetState(newMapState, newQueryState));
-      } else if (mapStateChanged) {
-        //console.log("Map state");
-        this.store.dispatch(new mapActions.SetMapState(newMapState));
-      } else if (queryStateChanged) {
-        //console.log("Query state");
-        this.store.dispatch(new mapActions.SetQueryState(newQueryState));
+      let urlQueryState = this.getQueryStateFromUrl(params);
+      if(urlQueryState) {
+        newQueryState = urlQueryState;
+        queryStateChanged = this.serializeService.serialize(state.queryState) !=  this.serializeService.serialize(urlQueryState);
+      }
+
+      if(queryStateChanged && mapStateChanged && state.setStateCount ==0) {
+        return of(new mapActions.SetState(newMapState,newQueryState));
+        window.localStorage.setItem("FarmMapsCommonMap_mapState",this.serializeMapState(newMapState));
+      } else if(queryStateChanged) {
+        return of(new mapActions.SetQueryState(newQueryState));
+      } return of(new mapActions.SetReplaceUrl(true));
+    })).subscribe((action) => {
+      if(action) {
+        this.zone.run(() => {
+          console.debug("Url to state");
+          this.store.dispatch(action);
+        });
       }
-      this.stateSetCount += 1;
     });
+
+    // state to url
+
+    this.stateSub = this.state$.pipe(switchMap((state) => {
+      let newUrl = this.serializeMapState(state.mapState) + "_" + this.serializeService.serialize(state.queryState);
+      if(this.lastUrl!=newUrl && state.setStateCount>0) {
+        this.lastUrl=newUrl;
+        return of(state);
+      }
+      else {
+        return of(null);
+      }
+      })).subscribe((newUrlState) =>{
+        if(newUrlState) {
+          console.debug(`State to url ${newUrlState.setStateCount}`);
+          this.replaceUrl(newUrlState.mapState,newUrlState.queryState,newUrlState.replaceUrl);
+        }
+      });
+
     setTimeout(() => {
       this.map.instance.updateSize();
     }, 500);
@@ -196,7 +299,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   }
 
   handleToggleMenu(event) {
-    this.store.dispatch(new mapActions.ToggleMenu());
+    this.store.dispatch(new commonActions.ToggleMenu());
   }
 
   handleToggleBaseLayers(event:MouseEvent) {
@@ -215,15 +318,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     this.store.dispatch(new mapActions.DoQuery(queryState));
   }
 
-  handleTrijntjeClick(event: MouseEvent, query: any) {
-    event.preventDefault();
-    var queryState = tassign(mapReducers.initialQueryState, query);
-    var mapState = JSON.parse(this.lastMapState);
-    this.router.navigate(["app","trijntje" , mapState.xCenter.toFixed(5), mapState.yCenter.toFixed(5), mapState.zoom, mapState.rotation.toFixed(2), mapState.baseLayerCode, this.serializeService.serialize(queryState)], { replaceUrl: false });
-  }
-
   replaceUrl(mapState: IMapState, queryState: IQueryState, replace: boolean = true) {
-      console.debug(`Replace url : Baselayer(${mapState.baseLayerCode}) Querystate(${this.serializeService.serialize(queryState)})`);
       let parts =["."];
       parts.push(mapState.xCenter.toFixed(5));
       parts.push(mapState.yCenter.toFixed(5));
@@ -232,31 +327,38 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
       if(mapState.baseLayerCode!="") {
         parts.push(mapState.baseLayerCode);
         parts.push( this.serializeService.serialize(queryState));
+        console.debug("Replace url",parts);
         this.router.navigate(parts, { replaceUrl: replace,relativeTo:this.route.parent });
       }
   }
 
   handleOnMoveEnd(event) {
-    var map = event.map;
-    var view = map.getView();
-    var rotation = view.getRotation();
-    var zoom = view.getZoom();
-    var center = transform(view.getCenter(), view.getProjection(), "EPSG:4326");
-    var extent = view.calculateExtent(this.map.instance.getSize());
-    let mapState: IMapState = { xCenter: center[0], yCenter: center[1], zoom: zoom, rotation: rotation, baseLayerCode: null };
-    let state = { mapState: mapState, extent: extent };
-    let source = from([state]);
-    source.pipe(withLatestFrom(this.selectedBaseLayer), withLatestFrom(this.queryState)).subscribe(([[state, baselayer], queryState]) => {
-      if (mapState && baselayer && queryState) {
-        let newMapState = tassign(state.mapState, { baseLayerCode: baselayer.item.code });
-        this.replaceUrl(newMapState, tassign(queryState, { bbox: queryState.bboxFilter ? state.extent : queryState.bbox }));
-        this.store.dispatch(new mapActions.SetViewExtent(state.extent));
-      }
+    console.debug("Move end");
+    this.zone.run(() =>{
+      var map = event.map;
+      var view = map.getView();
+      var rotation = view.getRotation();
+      var zoom = view.getZoom();
+      var center = transform(view.getCenter(), view.getProjection(), "EPSG:4326");
+      var extent = view.calculateExtent(this.map.instance.getSize());
+      let mapState: IMapState = { xCenter: center[0], yCenter: center[1], zoom: zoom, rotation: rotation, baseLayerCode: null };
+      let state = { mapState: mapState, extent: extent };
+      let source = from([state]);
+      source.pipe(withLatestFrom(this.selectedBaseLayer$),withLatestFrom(this.setStateCount$)).subscribe(([[state, baselayer],setStateCount]) => {
+        if (mapState && baselayer) { // do not react on first move
+          let newMapState = tassign(state.mapState, { baseLayerCode: baselayer.item.code });
+          this.store.dispatch(new mapActions.SetMapState(newMapState));
+          this.store.dispatch(new mapActions.SetViewExtent(state.extent));
+        }
+      });
     });
   }
 
   handleOnMouseDown(event: MouseEvent) {
-    this.store.dispatch(new mapActions.CollapseSearch());
+    event.stopPropagation();
+    this.zone.run(() =>{
+      this.store.dispatch(new commonActions.CloseAll());
+    });
   }
 
   handleOnDownload(event) {
@@ -296,8 +398,10 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   }
 
   ngOnDestroy() {
-    this.paramSub.unsubscribe();
+    if (this.paramSub) this.paramSub.unsubscribe();
     if (this.itemTypeSub) this.itemTypeSub.unsubscribe();
-    if (this.mapStateSub) this.mapStateSub.unsubscribe();
-    if (this.queryStateSub) this.queryStateSub.unsubscribe();  }
+    if (this.stateSub) this.stateSub.unsubscribe();
+    if (this.queryStateSub) this.queryStateSub.unsubscribe();
+    if (this.querySub) this.querySub.unsubscribe();
+  }
 }

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

@@ -18,7 +18,7 @@ export class MetaDataModalComponent {
   private modalName: string = 'metaDataModal';
   private modalRef: NgbModalRef;
 
-  @ViewChild('content') _templateModal:ElementRef;
+  @ViewChild('content', { static: true }) _templateModal:ElementRef;
   @Input() droppedFile: IDroppedFile;
   @Input() set modalState(_modalState:any) {;
     if(_modalState == this.modalName) {

projects/common-map/src/fm-map/components/select-period-modal/select-period-modal.component.html

@@ -23,7 +23,7 @@
     </div>
     <div class="modal-footer">
       <button type="submit" class="btn btn-primary" (click)="handleSelect($event)" i18n>Select</button>
-      <button type="button" class="btn btn-secondary" (click)="c('Close click'); onCloseModal.emit()" i18n>Close</button>
+      <button type="button" class="btn btn-secondary" (click)="c('Close click'); onCloseModal.emit()" i18n="@@buttonClose">Close</button>
     </div>
   
 </ng-template>

projects/common-map/src/fm-map/components/select-period-modal/select-period-modal.component.scss

@@ -18,3 +18,8 @@
 .custom-day.faded {
   background-color: rgba(2, 117, 216, 0.5);
 }
+
+ngb-datepicker {
+  overflow: hidden;
+  max-width: calc(100vw - 3em);
+}

projects/common-map/src/fm-map/components/select-period-modal/select-period-modal.component.ts

@@ -29,7 +29,7 @@ export class SelectPeriodModalComponent {
   fromDate: NgbDateStruct;
   toDate: NgbDateStruct;
 
-  @ViewChild('content') _templateModal:ElementRef;
+  @ViewChild('content', { static: true }) _templateModal:ElementRef;
 
   @Input() set modalState(_modalState:any) {;
     if(_modalState == this.modalName) {

projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.scss

@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 
 

projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts

@@ -2,6 +2,7 @@ import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleCh
 import { IItem } from '@farmmaps/common';
 import { AbstractSelectedItemComponent, SelectedItemComponent  } from '../selected-item/selected-item.component';
 import { WidgetHostDirective } from '../widget-host/widget-host.directive';
+import { IItemLayer } from '../../models/item.layer';
 
 
 @Component({
@@ -15,26 +16,62 @@ export class SelectedItemContainerComponent {
   }
 
   @Input() item: IItem;
+  @Input() parentItem: IItem;
+  @Input() itemLayer:IItemLayer;
+  @Input() overlayLayers:Array<IItemLayer>;
 
-  @ViewChild(WidgetHostDirective) widgetHost: WidgetHostDirective; 
+  @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective;
 
   loadComponent() {
-    var componentFactory: ComponentFactory<AbstractSelectedItemComponent> = this.componentFactoryResolver.resolveComponentFactory(SelectedItemComponent); // default
-    for (var i = 0; i < this.selectedItemComponents.length; i++) {
-      if (this.selectedItemComponents[i]['forItemType'] == this.item.itemType) {
-        componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.selectedItemComponents[i]['constructor'] as any);
+    let componentFactory: ComponentFactory<AbstractSelectedItemComponent> = this.componentFactoryResolver.resolveComponentFactory(SelectedItemComponent); // default
+
+    let selected = -1;
+    let maxMatches =0;
+    let showItem = true;
+    for (let i = 0; i < this.selectedItemComponents.length; i++) {
+      let matches=0;
+      let criteria=0;
+      if (this.selectedItemComponents[i]['forItemType'] ) {
+        criteria++;
+        if(this.selectedItemComponents[i]['forItemType'].indexOf(this.item.itemType) >= 0) {
+          matches++;
+        }
+      }
+      if (this.selectedItemComponents[i]['forSourceTask']) {
+        criteria++;
+        if( this.selectedItemComponents[i]['forSourceTask'].indexOf(this.item.sourceTask) >= 0) {
+          matches++;
+        }
+      }
+
+      if(criteria==matches && matches > maxMatches) {
+        selected=i;
+        maxMatches = matches;
       }
     }
+    if (selected >= 0) {
+      componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.selectedItemComponents[selected]['constructor'] as any);
+    }
+
     const viewContainerRef = this.widgetHost.viewContainerRef;
     viewContainerRef.clear();
 
     const componentRef = viewContainerRef.createComponent(componentFactory);
     (<AbstractSelectedItemComponent>componentRef.instance).item = this.item;
+    (<AbstractSelectedItemComponent>componentRef.instance).parentItem = this.parentItem;
+    (<AbstractSelectedItemComponent>componentRef.instance).itemLayer = this.itemLayer;
+    (<AbstractSelectedItemComponent>componentRef.instance).overlayLayers = this.overlayLayers;
   }
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes["item"] && changes["item"].currentValue) {
         this.loadComponent();
     }
+    if (changes["itemLayer"] && changes["itemLayer"].currentValue) {
+      this.loadComponent();
+    }
+    if (changes["overlayLayers"] && changes["overlayLayers"].currentValue) {
+      this.loadComponent();
+    }
   }
 }

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

@@ -3,11 +3,15 @@
   <div class="card border-0">
     <div class="card-body">
       <div><a href="#" (click)="handleBackToList($event)" i18n>Back</a></div>
-      <h4>Cropfield</h4>
-      <h1>{{item.name}}</h1>
-      <div>{{item.data.cropTypeName}}</div>
-      <div><span>{{item.data.startDate|date}}</span> - <span>{{item.data.endDate|date}}</span> </div>
-      <div class="mt-1"><a href="#" (click)="handleOnEdit(item)" i18n><i class="fa fa-pencil" aria-hidden="true" title="Edit"></i> Edit</a></div>
+      <div class="card menu-card">
+        <h1>Cropfield</h1>
+        <h4>{{item.name}}</h4>
+        <div class="card-text"><span>{{areaInHa(item)| number:'1.2-2'}} ha</span>&nbsp;<span>{{item.data.cropTypeName}}</span></div>
+        <div class="card-text"><span>{{item.data.startDate|date}}</span> - <span>{{item.data.endDate|date}}</span> </div>
+        <ul class="p-0 mt-2">
+          <li *ngIf="item.isEditable"><a href="#" (click)="handleOnEdit(item)"><i class="fa fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
+        </ul>
+      </div>
     </div>
     <fm-map-item-list [items]="(items|async)"></fm-map-item-list>
     <fm-map-item-widget-list [item]="item"></fm-map-item-widget-list>

projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.scss

@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 
 .big-icon {
@@ -13,6 +12,10 @@
   font-size: 1rem;
 }
 
+.card-body {
+  padding-bottom: unset;
+}
+
 .spacer {
   display: none;
   height: 4rem;
@@ -23,3 +26,11 @@
     display: block;
   }
 }
+
+.menu-card {
+  margin-left: -7px;
+  padding-left: 7px;
+  margin-right: -7px;
+  padding-right: 7px;
+  margin-bottom: 7px;
+}

projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts

@@ -7,7 +7,10 @@ import { commonReducers, ItemTypeService, IItem, Item, ItemService, FolderServic
 import { Router, ActivatedRoute, ParamMap, Event } from '@angular/router';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
-import { Observable } from 'rxjs';
+import { Observable,of } from 'rxjs';
+import {GeoJSON} from 'ol/format';
+import {getArea} from 'ol/sphere';
+import { withLatestFrom,switchMap,combineLatest } from 'rxjs/operators';
 
 
 @ForItemType("vnd.farmmaps.itemtype.cropfield")
@@ -24,7 +27,37 @@ export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponen
   constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
     super(store, itemTypeService,location,router);
   }
+
+  areaInHa(item:IItem):number {
+    if(!item) return 0;
+    // get area from faeture if 0 calculate from polygon
+    let a = item.data.area;
+    if(a) return a;
+    let format = new GeoJSON();
+    let polygon = format.readGeometry(item.geometry);
+    return getArea(polygon,{projection:"EPSG:4326"}) / 10000;
+  }
+
   ngOnInit() {
-    this.items = this.folderService$.getItems(this.item.code, 0, 1000);
+    var childItems = this.folderService$.getItems(this.item.code, 0, 1000);
+    var atLocationItems = this.itemService$.getItemList(null,null,null,this.item.code,true);
+    this.items =  childItems.pipe(
+      combineLatest(atLocationItems),
+      switchMap(([ci,ali]) => {
+          let retVal:IListItem[] = [];
+          let codes = {};
+          ci.forEach((listItem) => {
+             retVal.push(listItem);
+             codes[listItem.code]=listItem;
+          });
+          ali.forEach((atlocationitem) => {
+             let listItem = atlocationitem as IListItem;
+             let allowedItemTypes = "vnd.farmmaps.itemtype.device.senml"; // this is a hack
+             if(!codes[listItem.code] && allowedItemTypes.indexOf(listItem.itemType) >= 0) {
+               retVal.push(listItem);
+             }
+          });
+          return of(retVal);
+      }));
   }
 }

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

@@ -3,20 +3,30 @@
   <div class="card border-0">
     <div class="card-body">
       <div class="mb-2"><a href="#" (click)="handleBackToList($event)" i18n>Back</a></div>
-      <h1>{{item.name}}</h1>
-      <div class="legend-container" *ngIf="item?.data.layers;let layers">
-        <!--<div *ngIf="layers.length>1">
-          <select (change)="onLayerChanged($event.target.value)">
-            <option *ngFor="let l of layers;let layerIndex = index" [value]="layerIndex">{{l.name}}</option>
-          </select>
-        </div>-->
-        <fm-map-layer-legend [layer]="layers[selectedLayer]" [histogramenabled]="false" histogramunit="ha"></fm-map-layer-legend>
+      <div class="card menu-card">
+        <h2 *ngIf="parentItem">{{parentItem.name}}</h2>
+        <h1>{{item.name}}</h1>
+      </div>
+      <div class="legend-container" *ngIf="item?.data.layers;let layers">
+        <div class="card menu-card">
+          <div *ngIf="layers.length>1">
+            <select (change)="onLayerChanged($event.target.value)">
+              <option *ngFor="let l of layers;" [value]="l.index"  [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option>
+            </select>
+          </div>
+          <fm-map-layer-legend [showTitle]="layers.length == 1"
+            [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
+        </div>
+      </div>
+      <div class="card menu-card">
+        <ul class="p-0 mt-2">
+          <li *ngIf="item.isEditable"><a href="#" class="mt-1 mr-1" (click)="handleOnEdit(item)"><i class="fa fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
+          <ng-container *ngIf="itemTypeService.isLayer(item)">
+            <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)"><i class="fa fa-eye" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
+            <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fa fa-eye" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
+          </ng-container>
+        </ul>
       </div>
-      <ul class="p-0 mt-2">
-        <!--<li><a href="/api/v1/items/{{item.code}}/file" class="mt-1 mr-1" i18n><i class="fa fa-download" aria-hidden="true" title="Download"></i> Download</a></li>-->
-        <li><a href="#" class="mt-1 mr-1" (click)="handleOnEdit(item)" i18n><i class="fa fa-pencil" aria-hidden="true" title="Edit"></i> Edit</a></li>
-        <li *ngIf="itemTypeService.isLayer(item)"><a href="#" (click)="handleAddAsLayer(item)" class="mt-1 mr-1" i18n><i class="fa fa-eye" aria-hidden="true" title="Add as layer"></i> Add as overlay</a></li>
-      </ul>      
     </div>
   </div>
- </div>
+</div>

projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.scss

@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 
 .big-icon {
@@ -31,3 +30,12 @@ li {
     display:block;
   }
 }
+
+.menu-card {
+  margin-left: -7px;
+  padding-left: 7px;
+  margin-right: -7px;
+  padding-right: 7px;
+  margin-bottom: 7px;
+}
+

projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.ts

@@ -1,13 +1,12 @@
-import { Component, Input, Injectable, OnInit } from '@angular/core';
+import { Component, Injectable } from '@angular/core';
 import { Location } from '@angular/common';
-import { Feature } from 'ol';
 import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
-import { commonReducers, ItemTypeService, IItem, Item, ItemService, FolderService, IListItem} from '@farmmaps/common';
-import { Router, ActivatedRoute, ParamMap, Event } from '@angular/router';
+import { commonReducers, ItemTypeService, ItemService, FolderService } from '@farmmaps/common';
+import { Router } from '@angular/router';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
-import { Observable } from 'rxjs';
+import * as mapActions from '../../actions/map.actions';
 
 
 @ForItemType("vnd.farmmaps.itemtype.geotiff.processed")
@@ -22,9 +21,12 @@ export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent
   constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
     super(store, itemTypeService,location,router);
   }
-  public selectedLayer: number = 0;
 
   onLayerChanged(layerIndex: number) {
-    this.selectedLayer = layerIndex;
+    this.store.dispatch(new mapActions.SetLayerIndex(layerIndex));
+  }
+
+  layer(layers:any,layerIndex:number) {
+    return layers.find(l => l.index == layerIndex);
   }
 }

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

@@ -3,20 +3,29 @@
   <div class="card border-0">
     <div class="card-body">
       <div class="mb-2"><a href="#" (click)="handleBackToList($event)" i18n>Back</a></div>
-      <h1>{{item.name}}</h1>
-      <div class="legend-container" *ngIf="item?.data.layers;let layers">
-        <div *ngIf="layers.length>1">
-          <select (change)="onLayerChanged($event.target.value)">
-            <option *ngFor="let l of layers;" [value]="l.index">{{l.name}}</option>
-          </select>
-        </div>
-        <fm-map-layer-legend [showTitle]="layers.length==1" [layer]="layers[selectedLayer]" [histogramenabled]="false" histogramunit="ha"></fm-map-layer-legend>
+      <div class="card menu-card">
+        <h2 *ngIf="parentItem">{{parentItem.name}}</h2>
+        <h1>{{item.name}}</h1>
+      </div>
+      <div class="legend-container" *ngIf="item?.data.layers;let layers">
+        <div class="card menu-card">
+          <div *ngIf="layers.length>1">
+            <select (change)="onLayerChanged($event.target.value)">
+              <option *ngFor="let l of layers;" [value]="l.index" [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option>
+            </select>
+          </div>
+          <fm-map-layer-legend [showTitle]="layers.length==1" [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
+        </div>
+      </div>
+      <div class="card menu-card">
+        <ul class="p-0 mt-2">
+          <li *ngIf="item.isEditable"><a href="#" class="mt-1 mr-1" (click)="handleOnEdit(item)" ><i class="fa fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
+          <ng-container *ngIf="itemTypeService.isLayer(item)">
+            <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)" ><i class="fa fa-eye" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
+            <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)" ><i class="fa fa-eye" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
+          </ng-container>
+        </ul>
       </div>
-      <ul class="p-0 mt-2">
-        <!--<li><a href="/api/v1/items/{{item.code}}/file" class="mt-1 mr-1" i18n><i class="fa fa-download" aria-hidden="true" title="Download"></i> Download</a></li>-->
-        <li><a href="#" class="mt-1 mr-1" (click)="handleOnEdit(item)" i18n><i class="fa fa-pencil" aria-hidden="true" title="Edit"></i> Edit</a></li>
-        <li *ngIf="itemTypeService.isLayer(item)"><a href="#" (click)="handleAddAsLayer(item,selectedLayer)" class="mt-1 mr-1" i18n><i class="fa fa-eye" aria-hidden="true" title="Add as layer"></i> Add as overlay</a></li>
-      </ul>      
     </div>
   </div>
- </div>
+</div>

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

@@ -1,4 +1,3 @@
-@import "../../_theme.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 
 .big-icon {
@@ -39,3 +38,11 @@ li {
     display: block;
   }
 }
+
+.menu-card {
+  margin-left: -7px;
+  padding-left: 7px;
+  margin-right: -7px;
+  padding-right: 7px;
+  margin-bottom: 7px;
+}

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

@@ -26,7 +26,10 @@ export class SelectedItemShapeComponent extends AbstractSelectedItemComponent {
   public selectedLayer: number = 0;
   
   onLayerChanged(layerIndex: number) {
-    this.selectedLayer = layerIndex;
     this.store.dispatch(new mapActions.SetLayerIndex(layerIndex));
   }
+  
+  layer(layers:any,layerIndex:number) {
+    return layers.find(l => l.index == layerIndex);
+  }
 }

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

@@ -0,0 +1,45 @@
+<div class="spacer"></div>
+<div *ngIf="selectedItem();let item">
+  <div class="card border-0">
+    <div class="card-body">
+      <div class="mb-2"><a href="#" (click)="handleBackToList($event)" i18n>Back</a></div>
+      <div class="card menu-card">
+        <h2 *ngIf="parentItem">{{parentItem.name}}</h2>
+        <h1>{{item.name}}</h1>
+      </div>
+      <div class="legend-container" *ngIf="item?.data.layers;let layers">
+        <div class="card menu-card">
+          <h5>Date image: {{item.dataDate | date:'shortDate'}}</h5>
+          <div class="d-flex justify-content-between">
+            <div *ngIf="hasPrevious()">
+              <button type="button" class="btn btn-link p-0" (click)="handlePreviousTemporal($event)">
+                <i class="fa fa-arrow-circle-left" aria-hidden="true" i18n-title title="Previous"></i>&nbsp;{{ previousDate() | date:'shortDate'}}
+              </button>
+            </div>
+            <div *ngIf="hasNext()">
+              <button type="button" class="btn btn-link p-0" (click)="handleNextTemporal($event)">
+                {{ nextDate()| date:'shortDate' }}&nbsp;<i class="fa fa-arrow-circle-right" aria-hidden="true" i18n-title title="Next"></i>
+              </button>
+            </div>
+          </div>
+        </div>
+        <div class="card menu-card pt-2">
+          <div *ngIf="layers.length>1">
+            <select (change)="onLayerChanged($event.target.value)">
+              <option *ngFor="let l of layers;" [value]="l.index"  [selected]="itemLayer.layerIndex == l.index">{{l.name}}</option>
+            </select>
+          </div>
+          <fm-map-layer-legend [showTitle]="layers.length == 1"
+            [layer]="layer(layers,itemLayer.layerIndex)" [histogramenabled]="true"></fm-map-layer-legend>
+        </div>
+      </div>
+      <div class="card menu-card">
+        <ul class="p-0 mt-2">
+          <li *ngIf="item.isEditable"><a href="#" class="mt-1 mr-1" (click)="handleOnEdit(item)"><i class="fa fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
+          <li *ngIf="itemTypeService.isLayer(item)"><a href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)" class="mt-1 mr-1"><i class="fa fa-eye" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
+          <li><a href="#" (click)="handleGoToChart(item)"><i class="fa fa-line-chart" aria-hidden="true" i18m-title title="Show chart"></i>&nbsp;<span i18n>Show chart</span></a></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,41 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+.big-icon {
+  width: 100%;
+  color: white;
+  font-size: 9rem;
+  padding: 3rem;
+  text-align: center;
+}
+
+.card-title {
+  font-size: 1rem;
+}
+
+ul {
+  list-style:none;
+}
+
+li {
+  margin-top:1rem;
+}
+
+.spacer {
+  display:none;
+  height:4rem;
+}
+
+@media screen and (min-width:44rem) {
+  .spacer {
+    display:block;
+  }
+}
+
+.menu-card {
+  margin-left: -7px;
+  padding-left: 7px;
+  margin-right: -7px;
+  padding-right: 7px;
+  margin-bottom: 7px;
+}
+

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

@@ -0,0 +1,80 @@
+import { Component, Injectable } from '@angular/core';
+import { Location } from '@angular/common';
+import { Store } from '@ngrx/store';
+import * as mapReducers from '../../reducers/map.reducer';
+import { commonReducers, ItemTypeService, ItemService, FolderService,IItem } from '@farmmaps/common';
+import { Router } from '@angular/router';
+import { ForItemType } from '../for-item/for-itemtype.decorator';
+import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
+import { ITemporalItemLayer} from '../../models/item.layer';
+import * as mapActions from '../../actions/map.actions';
+
+
+@ForItemType("vnd.farmmaps.itemtype.temporal")
+@Injectable()
+@Component({
+  selector: 'fm-map-selected-item-temporal',
+  templateUrl: './selected-item-temporal.component.html',
+  styleUrls: ['./selected-item-temporal.component.scss']
+})
+export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent {
+
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
+    super(store, itemTypeService,location,router);
+  }
+
+  onLayerChanged(layerIndex: number) {
+    this.store.dispatch(new mapActions.SetLayerIndex(layerIndex));
+  }
+
+  hasNext():boolean {
+    let temporalItemLayer = this.itemLayer as  ITemporalItemLayer;
+    return temporalItemLayer && temporalItemLayer.nextItemLayer != null;
+  }
+
+  nextDate():Date {
+    let temporalItemLayer = this.itemLayer as  ITemporalItemLayer;
+    if(temporalItemLayer.nextItemLayer.item) 
+      return new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataDate)) ;
+    return null;
+  }
+
+  hasPrevious():boolean {
+    let temporalItemLayer = this.itemLayer as  ITemporalItemLayer;
+    return temporalItemLayer && temporalItemLayer.previousItemLayer != null;
+  }
+
+  previousDate():Date {
+    let temporalItemLayer = this.itemLayer as  ITemporalItemLayer;
+    if(temporalItemLayer.previousItemLayer.item) 
+      return new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataDate));
+    return null;
+  }
+
+  handleNextTemporal(event:MouseEvent) {
+    this.store.dispatch(new mapActions.NextTemporal());
+    event.preventDefault();    
+  }
+
+  handlePreviousTemporal(event:MouseEvent) {
+    this.store.dispatch(new mapActions.PreviousTemporal());
+    event.preventDefault();
+  }
+
+  selectedItem():IItem {
+    let temporalItemLayer = this.itemLayer as ITemporalItemLayer;
+    if(temporalItemLayer && temporalItemLayer.selectedItemLayer) {
+       return temporalItemLayer.selectedItemLayer.item;
+    }
+    return null;
+  }  
+
+  layer(layers:any,layerIndex:number) {
+    return layers.find(l => l.index == layerIndex);
+  }
+
+  handleGoToChart(item: IItem) {  
+    this.router.navigate(['/viewer', 'temporal', 'item', item.parentCode, new Date(Date.parse(item.dataDate)).getUTCFullYear()]);
+    return false;
+  }
+}

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

@@ -1,16 +1,24 @@
 <div *ngIf="item;let item">
   <div class="card border-0">
-    <img *ngIf="item.thumbnail" class="card-img-top" [src]="'/api/v1/items/'+item.code+'/thumbnail?v='+item.updated.getTime()" />
+    <img *ngIf="item.thumbnail" class="card-img-top" [src]="getThumbnailUrl(item)" />
     <div *ngIf="!item.thumbnail" class="big-icon" [style.background-color]="itemTypeService.getColor(item.itemType)">
       <i [ngClass]="itemTypeService.getIcon(item.itemType)"></i>
     </div>
+  </div>
+  <div class="card">
     <div class="card-body">
       <div class="mb-2"><a href="#" (click)="handleBackToList($event)" i18n>Back</a></div>
       <h1 class="card-title">{{item.name}}</h1>
-      <a *ngIf="itemTypeService.hasViewer(item)" href="#" (click)="handleOnView(item)" class="btn btn-outline-secondary" i18n><i class="fa fa-eye" aria-hidden="true" title="View"></i> View</a>
-      <a href="/api/v1/items/{{item.code}}/data" class="btn btn-outline-secondary" i18n><i class="fa fa-download" aria-hidden="true" title="Download"></i> Download</a>
-      <a href="#" class="btn btn-outline-secondary" (click)="handleOnEdit(item)" i18n><i class="fa fa-pencil" aria-hidden="true" title="Edit"></i> Edit</a>
-      <a *ngIf="itemTypeService.isLayer(item)" href="#" (click)="handleAddAsLayer(item)" class="btn btn-outline-secondary" i18n><i class="fa fa-eye" aria-hidden="true" title="Add as layer"></i> Add as overlay</a>
+      <div class="card menu-card">
+        <ul class="p-0 mt-2">
+          <li *ngIf="itemTypeService.hasViewer(item)"><a href="#" (click)="handleOnView(item)" class="btn btn-outline-secondary"><i class="fa fa-eye" aria-hidden="true" title="View"></i>&nbsp;<span i18n>View</span></a></li>
+          <li *ngIf="item.isEditable"><a href="#" (click)="handleOnEdit(item)"><i class="fa fa-pencil" aria-hidden="true" title="Edit"></i> <span i18n>Edit</span></a></li>
+          <ng-container *ngIf="itemTypeService.isLayer(item)">
+            <li *ngIf="!getItemLayer(item)"><a href="#" (click)="handleAddAsLayer(item)"><i class="fa fa-eye" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
+            <li  *ngIf="getItemLayer(item)"><a href="#" (click)="handleRemoveLayer(item)"><i class="fa fa-eye" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
+          </ng-container>
+        </ul>
+      </div>            
     </div>
   </div>
- </div>
+</div>

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

@@ -1,4 +1,3 @@
-@import "../../theme.scss";
 @import "~bootstrap/scss/bootstrap.scss";
 
 .big-icon {
@@ -12,3 +11,19 @@
 .card-title {
   font-size: 1rem;
 }
+
+ul {
+  list-style:none;
+}
+
+li {
+  margin-top:1rem;
+}
+
+.menu-card {
+  margin-left: -7px;
+  padding-left: 7px;
+  margin-right: -7px;
+  padding-right: 7px;
+  margin-bottom: 7px;
+}

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

@@ -1,32 +1,38 @@
-import { Component, Input, Injectable } from '@angular/core';
-import { Location } from '@angular/common';
-import { Feature } from 'ol';
-import { Store } from '@ngrx/store';
+import {Component, Injectable, Input, Directive} from '@angular/core';
+import {Location} from '@angular/common';
+import {Store} from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
-import { commonReducers,ItemTypeService, IItem, Item } from '@farmmaps/common';
+import {AppConfig, commonReducers, IItem, ItemTypeService} from '@farmmaps/common';
 import * as mapActions from '../../actions/map.actions';
-import { Router, ActivatedRoute, ParamMap, Event } from '@angular/router';
+import {Router} from '@angular/router';
+import { IItemLayer } from '../../models/item.layer';
 
 
 @Injectable()
+@Directive()
 export abstract class AbstractSelectedItemComponent {
-  @Input() item: IItem
-  constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, private location: Location, private router: Router) {
+  @Input() item: IItem;
+  @Input() parentItem: IItem;
+  @Input() itemLayer: IItemLayer;
+  @Input() overlayLayers: Array<IItemLayer>;
+  constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, private location: Location, public router: Router) {
   }
 
   handleOnView(item: IItem) {
-    var itemType = this.itemTypeService.itemTypes[item.itemType];
-    if (itemType) {
-      if (itemType.viewer) {
-        let url = `/viewer/${itemType.viewer}/item/${item.code}`;
-        this.router.navigate([url]);
-      }
+    if (this.itemTypeService.hasViewer(item)) {
+      let viewer = this.itemTypeService.itemTypes[item.itemType].viewer;
+      let url = `/viewer/${viewer}/item/${item.code}`;
+      this.router.navigate([url]);
     }
     return false;
   }
 
   handleOnEdit(item: IItem) {
-    let url = `/editor/property/item/${item.code}`;
+    var editor = "property";
+    if(this.itemTypeService.hasEditor(item)) {
+      editor = this.itemTypeService.itemTypes[item.itemType].editor;
+    }
+    let url = `/editor/${editor}/item/${item.code}`
     this.router.navigate([url]);
     return false;
   }
@@ -36,10 +42,26 @@ export abstract class AbstractSelectedItemComponent {
     return false;
   }
 
+  handleRemoveLayer(item: IItem,layerIndex:number = -1) {
+    let itemLayer = this.getItemLayer(item,layerIndex);
+    if(itemLayer) {
+      this.store.dispatch(new mapActions.RemoveLayer(itemLayer));
+    }
+    return false;
+  }
+
+  getItemLayer(item:IItem,layerIndex:number = -1):IItemLayer {
+    let li = layerIndex==-1?0:layerIndex;
+    let selected = this.overlayLayers.filter(ol => ol.item.code == item.code && ol.layerIndex == li);
+    if(selected.length==0) return null;
+    return selected[0];
+  }
+
   handleBackToList(event: MouseEvent) {
     event.preventDefault();
     this.location.back();
   }
+
 }
 
 @Injectable()
@@ -50,7 +72,11 @@ export abstract class AbstractSelectedItemComponent {
 })
 export class SelectedItemComponent extends AbstractSelectedItemComponent {
 
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router) {
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, public config:AppConfig) {
     super(store, itemTypeService,location,router);
   }
+
+  getThumbnailUrl(item:IItem):string {
+    return this.config.getConfig('apiEndPoint') +'/api/v1/items/'+item.code+'/thumbnail?v=' + Date.parse(item.updated);
+  }
 }

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

@@ -1,6 +1,6 @@
 <div [ngSwitch]="stage">
-  <h6 *ngSwitchCase="StageEnum.DevelopmentPreAlpha" style="color:darkred" [ngbTooltip]="info" i18n><b>Stage:Pre-alpha</b></h6>
-  <h6 *ngSwitchCase="StageEnum.DevelopmentAlpha" style="color:red" [ngbTooltip]="info" i18n><b>Stage:Alpha</b></h6>
-  <h6 *ngSwitchCase="StageEnum.DevelopmentBeta" style="color:orange" [ngbTooltip]="info" i18n><b>Stage:Beta</b></h6>
-  <h6 *ngSwitchCase="StageEnum.ReleaseCandidate" style="color:green" [ngbTooltip]="info" i18n><b>Stage:RC</b></h6>
+  <h6 *ngSwitchCase="StageEnum.DevelopmentPreAlpha" style="color:darkred" [ngbTooltip]="info"><b><span i18n>Stage:Pre-alpha</span></b></h6>
+  <h6 *ngSwitchCase="StageEnum.DevelopmentAlpha" style="color:red" [ngbTooltip]="info"><b><span i18n>Stage:Alpha</span></b></h6>
+  <h6 *ngSwitchCase="StageEnum.DevelopmentBeta" style="color:orange" [ngbTooltip]="info" ><b><span i18n>Stage:Beta</span></b></h6>
+  <h6 *ngSwitchCase="StageEnum.ReleaseCandidate" style="color:green" [ngbTooltip]="info" ><b><span i18n>Stage:RC</span></b></h6>
 </div>

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

@@ -1,15 +1,14 @@
-import { Injectable, Inject } from '@angular/core';
-import { Router } from '@angular/router';
+import { Injectable } from '@angular/core';
 
 import { Store, Action } from '@ngrx/store';
 import { Effect, Actions,ofType } from '@ngrx/effects';
 
-import { Observable ,  of } from 'rxjs';
-import { withLatestFrom, switchMap, map, catchError, mergeMap, delay} from 'rxjs/operators';
+import { Observable , of, interval } from 'rxjs';
+import { withLatestFrom, switchMap, map, catchError, mergeMap,delayWhen } from 'rxjs/operators';
 
-import {GeoJSON} from 'ol/format';
+import {GeoJSON,WKT} from 'ol/format';
 import {Feature} from 'ol';
-import { getCenter, Extent, createEmpty, extend} from 'ol/extent';
+import { getCenter,createEmpty,extend } from 'ol/extent';
 import {Point} from 'ol/geom'
 
 
@@ -19,16 +18,28 @@ import {commonReducers} from '@farmmaps/common';
 
 import {commonActions} from '@farmmaps/common';
 
-import { IListItem, IItem } from '@farmmaps/common';
+import { IItem } from '@farmmaps/common';
 import { FolderService, ItemService } from '@farmmaps/common';
 import { tassign } from 'tassign';
 
+import {FeatureIconService} from '../services/feature-icon.service';
+
+import * as style from 'ol/style';
+
+import { ItemTypeService,IQueryState } from '@farmmaps/common';
+
+
 @Injectable()
 export class MapEffects {
-  private _format: GeoJSON;
+  private _geojsonFormat: GeoJSON;
+  private _wktFormat: WKT;
 
-  private toPointFeature(feature: any): Feature {
-    var f = this._format.readFeature(feature);
+  private toPointFeature(updateEvent:commonActions.DeviceUpdateEvent): Feature {
+    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;
@@ -39,10 +50,41 @@ export class MapEffects {
     ofType(mapActions.INIT),
     withLatestFrom(this.store$.select(commonReducers.selectGetRootItems)),
     switchMap(([action, rootItems]) => {
+      let actions=[];
       for (let rootItem of rootItems) {
-        if (rootItem.itemType == "UPLOADS_FOLDER") return of(new mapActions.SetParent(rootItem.code));
+        if (rootItem.itemType == "UPLOADS_FOLDER") actions.push(new mapActions.SetParent(rootItem.code));
       }
-      return [];
+      // initialize default feature styles
+      actions.push(new mapActions.SetStyle('file',new style.Style({
+        image: new style.Icon({
+            anchor: [0.5, 1],
+            scale: 0.05,
+          src: this.featureIconService$.getIconImageDataUrl("fa fa-file-o")
+        }),
+        stroke: new style.Stroke({
+          color: 'red',
+          width: 1
+        }),
+        fill: new style.Fill({
+          color: 'rgba(0, 0, 255, 0.1)'
+        })
+      })));
+      actions.push(new mapActions.SetStyle('selected',new style.Style({
+        image: new style.Icon({
+          anchor: [0.5, 1],
+          scale: 0.08,
+          src: this.featureIconService$.getIconImageDataUrl(null)
+        }),
+        stroke: new style.Stroke({
+          color: 'red',
+          width: 3
+        }),
+        fill: new style.Fill({
+          color: 'rgba(0, 0, 255, 0.1)'
+        })
+      })));
+
+      return actions;
     }
     ));
 
@@ -70,59 +112,75 @@ export class MapEffects {
   @Effect()
   startSearch$: Observable<Action> = this.actions$.pipe(
     ofType(mapActions.STARTSEARCH),
-    switchMap((action: mapActions.StartSearch) => {
-      console.debug("Start search");
-      var startDate = action.queryState.startDate;
-      var endDate = action.queryState.endDate;    
-      var newAction;
-      if (action.queryState.itemCode || action.queryState.parentCode || action.queryState.itemType || action.queryState.query || action.queryState.tags) {
-        newAction= this.itemService$.getFeatures(action.queryState.bbox, "EPSG:3857", action.queryState.query, action.queryState.tags, startDate, endDate, action.queryState.itemType, action.queryState.parentCode).pipe(
+    withLatestFrom(this.store$.select(mapReducers.selectgetSetStateCount)),
+    switchMap(([action,setStateCount]) => {
+      let a = action as mapActions.StartSearch;
+      var startDate = a.queryState.startDate;
+      var endDate = a.queryState.endDate;
+      var newAction:Observable<Action>;
+      if (a.queryState.itemCode || a.queryState.parentCode || a.queryState.itemType || a.queryState.query || a.queryState.tags) {
+        newAction= this.itemService$.getFeatures(a.queryState.bbox, "EPSG:3857", a.queryState.query, a.queryState.tags, startDate, endDate, a.queryState.itemType, a.queryState.parentCode).pipe(
           switchMap((features: any) => {
             for (let f of features.features) {
               if (f.properties && f.properties["code"]) {
                 f.id = f.properties["code"];
               }
             }
-            return of(new mapActions.StartSearchSuccess(this._format.readFeatures(features), action.queryState));
+            return of(new mapActions.StartSearchSuccess(this._geojsonFormat.readFeatures(features), a.queryState,setStateCount));
           }
           ),
           catchError(error => of(new commonActions.Fail(error))));
       } else {
-        newAction=  of(new commonActions.Escape(true,false));
+        return [];
       }
       return newAction;
     }));
 
 
   @Effect()
-  startSearchSucces$: Observable<Action> = this.actions$.pipe(
+  zoomToExtent$: Observable<Action> = this.actions$.pipe(
+    ofType(mapActions.STARTSEARCHSUCCESS),
+    delayWhen(action => (action as mapActions.StartSearchSuccess).setStateCount == 1 ? interval(500):interval(0)),
+    mergeMap((action: mapActions.StartSearchSuccess) => {
+      let actions =[];
+      actions.push(new commonActions.SetMenuVisible(false));
+      let extent = createEmpty();
+      if (!action.query.bboxFilter) {
+         if (extent) {
+          for (let f of action.features) {
+            extend(extent, (f as Feature).getGeometry().getExtent());
+          }
+        }
+        actions.push(new mapActions.SetExtent(extent));
+      }
+      return actions;
+    }));
+
+  @Effect()
+  hideMenu$: Observable<Action> = this.actions$.pipe(
     ofType(mapActions.STARTSEARCHSUCCESS),
     mergeMap((action: mapActions.StartSearchSuccess) => {
-      if (action.query.bboxFilter) {
-        return [];
-      } else { 
-      var extent = createEmpty();
-
-      if (extent) {
-        for (let f of action.features) {
-          extend(extent, (f as Feature).getGeometry().getExtent());
-        }
-      }
-      //return [];
-      return of(new mapActions.SetExtent(extent));
-    }
+      return of(new commonActions.SetMenuVisible(false));
     }));
 
   @Effect()
   selectItem$: Observable<Action> = this.actions$.pipe(
     ofType(mapActions.SELECTITEM),
     withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItem)),
-      switchMap(([action, selectedItem]) => {
+    withLatestFrom(this.store$.select(mapReducers.getSetStateCount)),
+      switchMap(([[action, selectedItem],setStateCount]) => {
         let a = action as mapActions.SelectItem;
         let itemCode = selectedItem ? selectedItem.code : "";
-        if (a.itemCode != itemCode) {
+        if (a.itemCode != itemCode || setStateCount == 1) {
           return this.itemService$.getItem(a.itemCode).pipe(
-            map((item: IItem) => new mapActions.SelectItemSuccess(item)),
+            switchMap(child => {
+              return this.itemService$.getItem(child.parentCode)
+                .pipe(map(parent => {
+                    return {child, parent};
+                  })
+                );
+            }),
+            map(data => new mapActions.SelectItemSuccess(data.child, data.parent)),
             catchError(error => of(new commonActions.Fail(error))))
         } else {
           return [];
@@ -135,49 +193,54 @@ export class MapEffects {
     ofType(mapActions.SELECTITEMSUCCESS),
     switchMap((action:mapActions.SelectItemSuccess) => {
       return this.itemService$.getFeature(action.item.code, "EPSG:3857").pipe(
-        map((feature: IItem) => new mapActions.AddFeatureSuccess(this._format.readFeature(feature) )),
+        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))));
     }
     ));
 
+    @Effect()
+    selectItemSuccessTemporal$: Observable<Action> = this.actions$.pipe(
+      ofType(mapActions.SELECTITEMSUCCESS),
+      switchMap((action:mapActions.SelectItemSuccess) => {
+        if(action.item.itemType == "vnd.farmmaps.itemtype.temporal") {
+          return this.itemService$.getChildItemList(action.item.code,null).pipe(
+            map(items => new mapActions.SelectTemporalItemsSuccess(
+              items.sort((a, b) =>
+                 -(Date.parse(b.dataDate) - Date.parse(a.dataDate))
+              )
+            )),
+            catchError(error => of(new commonActions.Fail(error))));
+        } else {
+           return [];
+        }
+      }
+      ));
+
   @Effect()
   uploadedItemClick$: Observable<Action> = this.actions$.pipe(
       ofType(commonActions.UPLOADEDFILECLICK),
       switchMap((action: commonActions.UploadedFileClick) => of(new mapActions.DoQuery(tassign(mapReducers.initialState.query, {itemCode:action.itemCode})))
     ));
 
-  //@Effect()
-  //itemAdded$: Observable<Action> = this.actions$.pipe(
-  //  ofType(commonActions.ITEMADDEDEVENT),
-  //  withLatestFrom(this.store$.select(mapReducers.selectGetParentCode)),
-  //  mergeMap(([action, parentCode]) => {
-  //    let itemAddedAction = action as commonActions.ItemAddedEvent;
-  //    if (parentCode && itemAddedAction.attributes["parentCode"] == parentCode) {
-  //      return this.itemService$.getFeature(itemAddedAction.itemCode,"EPSG:3857").pipe(
-  //        map((feature: Feature) => new mapActions.AddFeatureSuccess(this.toPointFeature(feature))),
-  //        catchError(error => of(new commonActions.Fail(error))))
-  //    } else
-  //      return [
-  //      ];
-  //  }));
-
   @Effect()
   featureUpdate$: Observable<Action> = this.actions$.pipe(
-    ofType(commonActions.ITEMCHANGEDEVENT),
+    ofType(commonActions.DEVICEUPDATEEVENT),
     withLatestFrom(this.store$.select(mapReducers.selectGetFeatures)),
     mergeMap(([action, features]) => {
-      let itemChangedAction = action as commonActions.ItemChangedEvent;
+      let deviceUpdateEventAction = action as commonActions.DeviceUpdateEvent;
       var feature: Feature = null;
       for (let f of features) {
-        if (f.get("code") == itemChangedAction.itemCode) {
+        if (f.getId() == deviceUpdateEventAction.itemCode) {
           feature = f;
           break;
         }
       }
       if (feature) {
-        return this.itemService$.getFeature(itemChangedAction.itemCode, "EPSG:3857").pipe(
-          map((feature: any) => new mapActions.UpdateFeatureSuccess(this.toPointFeature(feature))),
-          catchError(error => of(new commonActions.Fail(error))));
+        return of(new mapActions.UpdateFeatureSuccess(this.toPointFeature(deviceUpdateEventAction)));
       } else {
         return [];
       }
@@ -191,40 +254,54 @@ export class MapEffects {
       let itemChangedAction = action as commonActions.ItemChangedEvent;
       if (selectedItem && selectedItem.code == itemChangedAction.itemCode) {
         return this.itemService$.getItem(itemChangedAction.itemCode).pipe(
-          map((item: IItem) => new mapActions.SelectItemSuccess(item)),
+          switchMap(child => {
+            return this.itemService$.getItem(child.parentCode)
+              .pipe(map(parent => {
+                  return {child, parent};
+                })
+              );
+          }),
+          map(data => new mapActions.SelectItemSuccess(data.child, data.parent)),
           catchError(error => of(new commonActions.Fail(error))));
       } else {
         return [];
       }
     }));
 
+  getActionFromQueryState(queryState:IQueryState, inSearch:boolean):Observable<Action>|[] {
+    if(!inSearch && (queryState.itemType || queryState.parentCode || queryState.itemCode || queryState.query || queryState.tags)) {
+      var newAction:Action;
+      if (queryState.itemCode && queryState.itemCode != "") {
+        newAction= new mapActions.SelectItem(queryState.itemCode);
+      } else {
+        newAction= new mapActions.StartSearch(queryState);
+      }
+      return of(newAction);
+    } else {
+      return of(new commonActions.Escape(true,false));
+    }
+  }
+
   @Effect()
   setQueryState$: Observable<Action> = this.actions$.pipe(
     ofType(mapActions.SETQUERYSTATE),
-    switchMap((action: mapActions.SetQueryState) => {
-        var newAction:Action;
-        if (action.queryState.itemCode && action.queryState.itemCode != "") {
-          newAction= new mapActions.SelectItem(action.queryState.itemCode);
-        } else {
-          newAction= new mapActions.StartSearch(action.queryState);
-        }
-        return of(newAction);
+    withLatestFrom(this.store$.select(mapReducers.selectGetInSearch)),
+    switchMap(([action,inSearch]) => {
+      let a = action as mapActions.SetQueryState;
+       return this.getActionFromQueryState(a.queryState,inSearch);
       }));
 
   @Effect()
   setState$: Observable<Action> = this.actions$.pipe(
     ofType(mapActions.SETSTATE),
-    switchMap((action: mapActions.SetState) => {
-      var newAction:Action;
-      if (action.queryState.itemCode && action.queryState.itemCode != "") {
-        newAction=  new mapActions.SelectItem(action.queryState.itemCode);
-      } else {
-        newAction=  new mapActions.StartSearch(action.queryState);
-      }
-      return of(newAction);
+    withLatestFrom(this.store$.select(mapReducers.selectGetInSearch)),
+    switchMap(([action,inSearch]) => {
+      let a = action as mapActions.SetState;
+      return this.getActionFromQueryState(a.queryState,inSearch);
     }));
 
-  constructor(private actions$: Actions, private store$: Store<mapReducers.State>, private folderService$: FolderService, private itemService$: ItemService) {
-    this._format = new GeoJSON();
+    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();
   }
 }

projects/common-map/src/fm-map/models/color.map.ts

@@ -1,3 +1,5 @@
+import { IDataLayer } from '@farmmaps/common';
+
 export interface IColor {
   red: number,
   green: number,
@@ -7,7 +9,8 @@ export interface IColor {
 
 export interface IColorEntry {
    value: number,
-   color: IColor
+   color: IColor,
+   label: string
 }
 
 export interface IHistogramEntry {
@@ -21,7 +24,8 @@ export interface IHistogram {
   mean: number,
   stddev: number,
   classes: number,
-  entries: IHistogramEntry[]
+  entries: IHistogramEntry[],
+  confidence?: number;
 }
 
 export interface IGradientstop {
@@ -30,9 +34,10 @@ export interface IGradientstop {
 }
 
 export interface IColorMap {
-   gradient: IGradientstop[],
-   noValue: IColorEntry,
-   entries: IColorEntry[]
+  gradient: IGradientstop[],
+  noValue: IColorEntry,
+  entries: IColorEntry[],
+  colormapType: string
 }
 
 export interface IBand {
@@ -42,7 +47,8 @@ export interface IBand {
 
 export interface IRenderer {
   band:IBand,
-  colorMap: IColorMap
+  colorMap: IColorMap,
+  renderType:string
 }
 
 export interface IRenderoutput {
@@ -60,10 +66,7 @@ export interface IRenderoutputImage {
   extent: [number,number,number,number]
 }
 
-export interface ILayer {
-  name: string,
-  unit: string,
-  index: number,
+export interface ILayer extends IDataLayer {
   renderer: IRenderer,
   rendering: IRenderoutput
 }

projects/common-map/src/fm-map/models/index.ts

@@ -1,7 +0,0 @@
-export * from './map.state';
-export * from './selected.features';
-export * from './item.layer'
-export * from './layer.data'
-export * from './color.map';
-export * from './query.state';
-export * from './period.state';

projects/common-map/src/fm-map/models/item.layer.ts

@@ -1,4 +1,4 @@
-import { IItem } from '@farmmaps/common';
+import { IItem,IListItem } from '@farmmaps/common';
 import {Layer} from 'ol/layer';
 
 export interface IItemLayer  {
@@ -20,7 +20,31 @@ export class ItemLayer implements IItemLayer {
   public opacity: number = 1;
   public layerIndex: number = -1;
 
-  constructor(item:IItem) {
+  constructor(item:IItem,opacity:number = 1, visible:boolean = true,layerIndex:number=-1) {
     this.item = item;
+    this.opacity = opacity;
+    this.visible = visible;
+    this.layerIndex = layerIndex;
   }
 }
+
+export interface ITemporalItemLayer extends IItemLayer {
+  previousItemLayer: IItemLayer,
+  selectedItemLayer: IItemLayer,
+  nextItemLayer: IItemLayer,
+  temporalItems: IItem[],
+}
+
+export class TemporalItemLayer extends ItemLayer implements ITemporalItemLayer {
+  public previousItemLayer:IItemLayer = null;
+  public selectedItemLayer:IItemLayer =null;
+  public nextItemLayer:IItemLayer = null;
+  public temporalItems:IItem[] = [];
+
+  constructor(item:IItem,opacity:number = 1, visible:boolean = true) {
+   super(item,opacity,visible)
+  }
+}
+
+
+

projects/common-map/src/fm-map/models/style.cache.ts

@@ -0,0 +1,5 @@
+import {Style,Feature} from 'ol';
+
+export interface IStyles{
+  [id: string]: Style | (Feature);
+};

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

@@ -1,12 +1,17 @@
 import { tassign } from 'tassign';
 import { IItem,Item } from '@farmmaps/common';
-import { IItemLayer,ItemLayer, IMapState,IQueryState,IPeriodState} from '../models'
+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 { IStyles} from '../models/style.cache';
 import * as mapActions from '../actions/map.actions';
 import {commonActions} from '@farmmaps/common';
 import { createSelector, createFeatureSelector } from '@ngrx/store';
 
 import {Feature} from 'ol';
 
+
 import { ROUTER_NAVIGATION, RouterNavigationAction } from '@ngrx/router-store';
 
 import { MODULE_NAME } from '../module-name';
@@ -39,17 +44,22 @@ export interface State {
   panelCollapsed: boolean,
   selectedFeature: Feature,
   selectedItem:IItem,
+  parentItem:IItem,
   clearEnabled: boolean,
   searchCollapsed: boolean,
   searchMinified: boolean,
-  menuVisible: boolean,
   extent: number[],
   baseLayers: Array<IItemLayer>
   overlayLayers: Array<IItemLayer>,
   selectedItemLayer: IItemLayer,
   projection: string,
   selectedBaseLayer: IItemLayer,
-  selectedOverlayLayer: IItemLayer
+  selectedOverlayLayer: IItemLayer,
+  styles:IStyles,
+  showLayerSwitcher:boolean,
+  setStateCount:number,
+  inSearch:boolean,
+  replaceUrl:boolean
 }
 
 export const initialState: State = {
@@ -66,24 +76,29 @@ export const initialState: State = {
   },
   viewExtent:[],
   queryState: tassign(initialQueryState),
-  query: tassign(initialQueryState),
+  query: null,
   parentCode: null,
   features: [],
   panelVisible: false,
   panelCollapsed: false,
   selectedFeature: null,
   selectedItem: null,
+  parentItem: null,
   clearEnabled: false,
   searchCollapsed: true,
   searchMinified:false,
-  menuVisible: true,
   extent: null,
   baseLayers: [],
   overlayLayers: [],
   projection: "EPSG:3857",
   selectedBaseLayer: null,
   selectedOverlayLayer: null,
-  selectedItemLayer: null
+  selectedItemLayer: null,
+  styles: {},
+  showLayerSwitcher: false,
+  setStateCount: 0,
+  inSearch:false,
+  replaceUrl:true
 }
 
 export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State {
@@ -95,16 +110,16 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
     case mapActions.SETMAPSTATE: {
       let a = action as mapActions.SetMapState;
       return tassign(state, {
-        mapState: a.mapState
+        mapState: a.mapState,setStateCount: state.setStateCount+1
       });
     }
     case mapActions.SETQUERYSTATE: {
       let a = action as mapActions.SetQueryState;
-      return tassign(state, { queryState: tassign(a.queryState )});
+      return tassign(state, { queryState: tassign(a.queryState ),setStateCount: state.setStateCount+1,replaceUrl:a.replaceUrl});
     }
     case mapActions.SETSTATE: {
       let a = action as mapActions.SetState;
-      return tassign(state, { mapState: tassign(a.mapState), queryState: tassign(a.queryState)});
+      return tassign(state, { mapState: tassign(a.mapState), queryState: tassign(a.queryState),setStateCount: state.setStateCount+1});
     }
     case mapActions.SETVIEWEXTENT: {
       let a = action as mapActions.SetViewExtent;
@@ -119,10 +134,8 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
     case mapActions.STARTSEARCHSUCCESS: {
       let a = action as mapActions.StartSearchSuccess;
       return tassign(state, {
-        panelVisible: true,
-        clearEnabled: true,
-        searchMinified: true,
-        features: a.features
+        features: a.features,
+        inSearch:false
       });
     }
     case mapActions.SELECTFEATURE: {
@@ -132,11 +145,14 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       });
     }
     case mapActions.SELECTITEM: {
+      let a = action as mapActions.SelectItem;
+      let itemCode = state.selectedItem ? state.selectedItem.code : "";
+      let inSearch = (a.itemCode != itemCode || state.setStateCount == 1)
       return tassign(state, {
         selectedItem: null,
-        searchMinified:false,
         selectedItemLayer: null,
-        features:[]
+        features:[],
+        inSearch:inSearch
       });
     }
     case mapActions.SELECTITEMSUCCESS: {
@@ -144,9 +160,14 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       var itemLayer = null;
       if (a.item && "vnd.farmmaps.itemtype.layer,vnd.farmmaps.itemtype.shape.processed,vnd.farmmaps.itemtype.geotiff.processed".indexOf(a.item.itemType) >=0 ) {
         itemLayer = new ItemLayer(a.item);
+        itemLayer.layerIndex =  a.item.data.layers?a.item.data.layers[0].index:-1;
+      } else if (a.item && a.item.itemType == "vnd.farmmaps.itemtype.temporal") {
+        itemLayer = new TemporalItemLayer(a.item);
       }
       return tassign(state, {
+        inSearch:false,
         selectedItem: a.item,
+        parentItem: a.parentItem,
         selectedItemLayer: itemLayer,
         panelVisible: a.item != null,
         clearEnabled: a.item != null,
@@ -155,17 +176,103 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
         queryState: tassign(state.queryState, {itemCode:a.item ? a.item.code:null})
       });
     }
+    case mapActions.SELECTTEMPORALITEMSSUCCESS:{
+      let a = action as mapActions.SelectTemporalItemsSuccess;
+      let selectedItemLayer=tassign(state.selectedItemLayer) as TemporalItemLayer;
+      let layerIndex=-1;
+      selectedItemLayer.temporalItems = a.temporalItems;
+      if(a.temporalItems.length>0) {
+        let item = a.temporalItems[a.temporalItems.length-1];
+        layerIndex = item.data.layers[0].index;
+        selectedItemLayer.selectedItemLayer = new ItemLayer(item,1,true,layerIndex);
+      } else {
+        selectedItemLayer.selectedItemLayer = null;
+      }
+      selectedItemLayer.previousItemLayer = a.temporalItems.length>1?new ItemLayer(a.temporalItems[a.temporalItems.length-2],0,true,layerIndex):null;
+      selectedItemLayer.nextItemLayer = null;
+      if(selectedItemLayer.selectedItemLayer) {
+        let layerIndex = selectedItemLayer.selectedItemLayer.item.data.layers[0].index;
+        selectedItemLayer.layerIndex = layerIndex;
+      }
+
+      return tassign(state,{selectedItemLayer:tassign(state.selectedItemLayer,selectedItemLayer as ItemLayer)});
+    }
+    case mapActions.NEXTTEMPORAL: {
+      let temporalLayer = state.selectedItemLayer as ITemporalItemLayer;
+      if(temporalLayer.temporalItems && temporalLayer.temporalItems.length>0) {
+        let index = temporalLayer.temporalItems.indexOf(temporalLayer.selectedItemLayer.item);
+        if(index ==  (temporalLayer.temporalItems.length-1)) {
+          return state;
+        } else {
+          temporalLayer.previousItemLayer = temporalLayer.selectedItemLayer;
+          if( temporalLayer.previousItemLayer)  {
+            temporalLayer.previousItemLayer.opacity=0;
+            temporalLayer.previousItemLayer.layerIndex = temporalLayer.layerIndex;
+          }
+          temporalLayer.selectedItemLayer = temporalLayer.nextItemLayer;
+          if( temporalLayer.selectedItemLayer)  {
+            temporalLayer.selectedItemLayer.opacity=1;
+            temporalLayer.selectedItemLayer.layerIndex=temporalLayer.layerIndex;
+          }
+          temporalLayer.nextItemLayer = index+2 < temporalLayer.temporalItems.length ? new ItemLayer(temporalLayer.temporalItems[index+2],0,true,temporalLayer.layerIndex):null;
+          if( temporalLayer.nextItemLayer)  {
+            temporalLayer.nextItemLayer.opacity=0;
+            temporalLayer.nextItemLayer.layerIndex = temporalLayer.layerIndex;
+          }
+          return tassign(state,{selectedItemLayer:tassign(state.selectedItemLayer,temporalLayer as ItemLayer)});
+        }
+      } else {
+        return state;
+      }
+    }
+    case mapActions.PREVIOUSTEMPORAL: {
+      let temporalLayer = state.selectedItemLayer as ITemporalItemLayer;
+      if(temporalLayer.temporalItems && temporalLayer.temporalItems.length>0) {
+        let index = temporalLayer.temporalItems.indexOf(temporalLayer.selectedItemLayer.item);
+        if(index ==  0) {
+          return state;
+        } else {
+          temporalLayer.nextItemLayer = temporalLayer.selectedItemLayer;
+          if( temporalLayer.nextItemLayer)  {
+            temporalLayer.nextItemLayer.opacity=0;
+            temporalLayer.nextItemLayer.layerIndex = temporalLayer.layerIndex;
+          }
+          temporalLayer.selectedItemLayer = temporalLayer.previousItemLayer;
+          if( temporalLayer.selectedItemLayer) {
+            temporalLayer.selectedItemLayer.opacity=1;
+            temporalLayer.selectedItemLayer.layerIndex = temporalLayer.layerIndex;
+          }
+          temporalLayer.previousItemLayer = index-2 >=0? new ItemLayer(temporalLayer.temporalItems[index-2],0,true,temporalLayer.layerIndex):null;
+          if( temporalLayer.previousItemLayer)  {
+            temporalLayer.previousItemLayer.opacity=0;
+            temporalLayer.previousItemLayer.layerIndex = temporalLayer.layerIndex;
+          }
+          return tassign(state,{selectedItemLayer:tassign(state.selectedItemLayer,temporalLayer as ItemLayer)});
+        }
+      } else {
+        return state;
+      }
+    }
+    case mapActions.SELECTTEMPORAL:{
+      //todo implement
+    }
     case mapActions.STARTSEARCH: {
       let a = action as mapActions.StartSearch;
+      let panelVisible = a.queryState.itemCode!=null ||a.queryState.itemType!=null||a.queryState.parentCode!=null || a.queryState.query != null || a.queryState.tags != null;
       return tassign(state, {
         selectedItem: null,
+        features:[],
         selectedItemLayer:null,
-        queryState: tassign(a.queryState),
-        searchCollapsed: false,
-        searchMinified: true,
-        menuVisible:false
+        searchCollapsed: !panelVisible,
+        panelVisible: panelVisible,
+        clearEnabled: panelVisible,
+        searchMinified: panelVisible,
+        inSearch:panelVisible
       });
     }
+    case commonActions.FAIL:{
+      return tassign(state,{inSearch:false});
+    }
     case mapActions.DOQUERY: {
       let a = action as mapActions.DoQuery;
       return tassign(state, {
@@ -178,7 +285,6 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       return tassign(state, {
         panelVisible: true,
         selectedFeature: a.feature,
-        menuVisible: false,
         extent: a.feature.getGeometry().getExtent(),
         searchCollapsed: false,
         clearEnabled:true,
@@ -190,7 +296,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       let features: any[] = [];
       var index = -1;
       for (var i = 0; i < state.features.length; i++) {
-        if (state.features[i].get("code") == a.feature.get("code")) {
+        if (state.features[i].getId() == a.feature.getId()) {
           features.push(a.feature);
         } else {
           features.push(state.features[i]);
@@ -204,8 +310,8 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
     case mapActions.COLLAPSESEARCH: {
       return tassign(state, { searchCollapsed: state.panelVisible ? false: true});
     }
-    case mapActions.TOGGLEMENU: {
-      return tassign(state, { menuVisible: !state.menuVisible });
+    case commonActions.CLOSEALL: {
+      return tassign(state, { searchCollapsed: state.panelVisible ? false: true,showLayerSwitcher:false});
     }
     case mapActions.SETEXTENT: {
       let a = action as mapActions.SetExtent;
@@ -216,8 +322,14 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       let itemLayers = state.overlayLayers.slice(0);
       let itemLayer = new ItemLayer(a.item);
       itemLayer.layerIndex = a.layerIndex == -1 ? 0 : a.layerIndex;
-      itemLayers.push(itemLayer);
-      return tassign(state, { overlayLayers: itemLayers, selectedOverlayLayer: itemLayer });
+      let existing = itemLayers.filter(il => il.item.code == itemLayer.item.code && il.layerIndex == itemLayer.layerIndex);
+      if(existing.length==0) {
+        itemLayers.push(itemLayer);
+        return tassign(state, { overlayLayers: itemLayers, selectedOverlayLayer: itemLayer });
+      } else {
+        return state;
+      }
+
     }
     case mapActions.REMOVELAYER: {
       let a = action as mapActions.RemoveLayer;
@@ -248,8 +360,35 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
     case mapActions.SETLAYERINDEX: {
       let a = action as mapActions.SetLayerIndex;
       if (a.itemLayer == null) {
-        var newItemlayer = new ItemLayer(state.selectedItemLayer.item);
-        newItemlayer.layerIndex = a.layerIndex;
+        if(state.selectedItemLayer.item.itemType == "vnd.farmmaps.itemtype.temporal") {
+          var newItemlayer = tassign(state.selectedItemLayer,{layerIndex:a.layerIndex});
+          let tl = newItemlayer as ITemporalItemLayer;
+          if(tl.previousItemLayer) {
+            let nl = new ItemLayer(tl.previousItemLayer.item);
+            nl.opacity = tl.previousItemLayer.opacity;
+            nl.visible = tl.previousItemLayer.visible;
+            nl.layerIndex = a.layerIndex;
+            tl.previousItemLayer = nl;
+          }
+          if(tl.selectedItemLayer) {
+            let nl = new ItemLayer(tl.selectedItemLayer.item);
+            nl.opacity = tl.selectedItemLayer.opacity;
+            nl.visible = tl.selectedItemLayer.visible;
+            nl.layerIndex = a.layerIndex;
+            tl.selectedItemLayer = nl;
+          }
+          if(tl.nextItemLayer) {
+            let nl = new ItemLayer(tl.nextItemLayer.item);
+            nl.opacity = tl.nextItemLayer.opacity;
+            nl.visible = tl.nextItemLayer.visible;
+            nl.layerIndex = a.layerIndex;
+            tl.nextItemLayer = nl;
+          }
+        } else {
+          var newItemlayer = new ItemLayer(state.selectedItemLayer.item);
+          newItemlayer.layerIndex = a.layerIndex;
+
+        }
         return tassign(state, { selectedItemLayer: newItemlayer})
       } else {
         let newLayers = state.overlayLayers.slice(0);
@@ -268,9 +407,9 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       }
       var selectedBaseLayer: IItemLayer = null;
       var mapState = tassign(state.mapState);
-      console.debug(`Base layerload: ${mapState.baseLayerCode}`)
-      if (baseLayers.length > 0 && mapState.baseLayerCode != "") {
-        selectedBaseLayer = baseLayers.filter(layer => layer.item.code === mapState.baseLayerCode)[0];
+      let sb = baseLayers.filter(layer => layer.item.code === mapState.baseLayerCode)[0];
+      if (baseLayers.length > 0 && mapState.baseLayerCode != "" && sb) {
+        selectedBaseLayer = sb;
         selectedBaseLayer.visible = true;
       } else if (baseLayers.length > 0) {
         selectedBaseLayer = baseLayers[0];
@@ -307,14 +446,31 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
           clearEnabled: false,
           searchCollapsed: true,
           searchMinified: false,
-          menuVisible:false,
           features: [],
-          query:initialState.query
+          query:initialState.query,
+          showLayerSwitcher: false
         });
       } else {
         return tassign(state, {});
       }
     }
+    case mapActions.SETSTYLE:{
+      let a = action as mapActions.SetStyle;
+      let styles = tassign(state.styles);
+      styles[a.itemType] = a.style;
+      return tassign(state,{styles:styles});
+    }
+    case mapActions.SHOWLAYERSWITCHER:{
+      let a = action as mapActions.ShowLayerSwitcher;
+      return tassign(state,{showLayerSwitcher:a.show});
+    }
+    case mapActions.SETREPLACEURL: {
+      let a= action as mapActions.SetReplaceUrl;
+      return tassign(state,{replaceUrl:a.replaceUrl});
+    }
+    case mapActions.CLEAR: {
+      return tassign(state,{setStateCount:0});
+    }
     default: {
       return state;
     }
@@ -328,11 +484,11 @@ export const getPanelVisible = (state: State) => state.panelVisible;
 export const getPanelCollapsed = (state: State) => state.panelCollapsed;
 export const getSelectedFeature = (state: State) => state.selectedFeature;
 export const getSelectedItem = (state: State) => state.selectedItem;
+export const getParentItem = (state: State) => state.parentItem;
 export const getQueryState = (state: State) => state.queryState;
 export const getClearEnabled = (state: State) => state.clearEnabled;
 export const getSearchCollapsed = (state: State) => state.searchCollapsed;
 export const getSearchMinified = (state: State) => state.searchMinified;
-export const getMenuVisible = (state: State) => state.menuVisible;
 export const getExtent = (state: State) => state.extent;
 export const getOverlayLayers = (state: State) => state.overlayLayers;
 export const getBaseLayers = (state: State) => state.baseLayers;
@@ -342,6 +498,11 @@ export const getSelectedOverlayLayer = (state: State) => state.selectedOverlayLa
 export const getQuery = (state: State) => state.query;
 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 getSetStateCount = (state:State) => state.setStateCount;
+export const getInSearch = (state:State) => state.inSearch;
+export const getState = (state:State) => {return {mapState:state.mapState,queryState:state.queryState,setStateCount:state.setStateCount,replaceUrl:state.replaceUrl};}
 
 export const selectMapState = createFeatureSelector<State>(MODULE_NAME);
 export const selectGetMapState= createSelector(selectMapState, getMapState);
@@ -351,11 +512,11 @@ export const selectGetPanelVisible = createSelector(selectMapState, getPanelVisi
 export const selectGetPanelCollapsed = createSelector(selectMapState, getPanelCollapsed);
 export const selectGetSelectedFeature = createSelector(selectMapState, getSelectedFeature);
 export const selectGetSelectedItem = createSelector(selectMapState, getSelectedItem);
+export const selectGetParentItem = createSelector(selectMapState, getParentItem);
 export const selectGetQueryState = createSelector(selectMapState, getQueryState);
 export const selectGetClearEnabled = createSelector(selectMapState, getClearEnabled);
 export const selectGetSearchCollapsed = createSelector(selectMapState, getSearchCollapsed);
 export const selectGetSearchMinified = createSelector(selectMapState, getSearchMinified);
-export const selectGetMenuVisible = createSelector(selectMapState, getMenuVisible);
 export const selectGetExtent = createSelector(selectMapState, getExtent);
 export const selectGetOverlayLayers = createSelector(selectMapState, getOverlayLayers);
 export const selectGetBaseLayers = createSelector(selectMapState, getBaseLayers);
@@ -365,5 +526,10 @@ export const selectGetSelectedOverlayLayer = createSelector(selectMapState, getS
 export const selectGetQuery = createSelector(selectMapState, getQuery);
 export const selectGetSelectedItemLayer = createSelector(selectMapState, getSelectedItemLayer);
 export const selectGetPeriod = createSelector(selectMapState, getPeriod);
+export const selectGetStyles = createSelector(selectMapState, getStyles);
+export const selectGetShowLayerSwitcher = createSelector(selectMapState,getShowLayerSwitcher);
+export const selectgetSetStateCount = createSelector(selectMapState,getSetStateCount);
+export const selectGetInSearch = createSelector(selectMapState,getInSearch);
+export const selectGetState = createSelector(selectMapState,getState);
 
 

projects/common-map/src/fm-map/services/device-orientation.service.ts

@@ -0,0 +1,51 @@
+import { Injectable } from '@angular/core';
+import { Observer, Observable } from 'rxjs';
+
+
+@Injectable()
+export class DeviceOrientationService {
+
+  compassHeading(alpha, beta, gamma):number {
+
+    // Convert degrees to radians
+    var alphaRad = alpha * (Math.PI / 180);
+    var betaRad = beta * (Math.PI / 180);
+    var gammaRad = gamma * (Math.PI / 180);
+  
+    // Calculate equation components
+    var cA = Math.cos(alphaRad);
+    var sA = Math.sin(alphaRad);
+    var cB = Math.cos(betaRad);
+    var sB = Math.sin(betaRad);
+    var cG = Math.cos(gammaRad);
+    var sG = Math.sin(gammaRad);
+  
+    // Calculate A, B, C rotation components
+    var rA = - cA * sG - sA * sB * cG;
+    var rB = - sA * sG + cA * sB * cG;
+    var rC = - cB * cG;
+  
+    // Calculate compass heading
+    var compassHeading = Math.atan(rA / rB);
+  
+    // Convert from half unit circle to whole unit circle
+    if(rB < 0) {
+      compassHeading += Math.PI;
+    }else if(rA < 0) {
+      compassHeading += 2 * Math.PI;
+    }
+    return compassHeading * (180/Math.PI);
+  }
+
+  getCurrentCompassHeading(): Observable<number> {
+    return Observable.create((observer: Observer<number>) => {  
+        window.addEventListener("deviceorientation", (event:DeviceOrientationEvent)=>{
+          let heading = this.compassHeading(event.alpha,event.beta,event.gamma);
+          if(!Number.isNaN(heading)) {
+            observer.next(heading);
+          }
+        } );
+    });
+  }
+
+}

projects/common-map/src/fm-map/services/feature-icon.service.ts

@@ -0,0 +1,41 @@
+import { Injectable} from '@angular/core';
+import { Feature } from 'ol';
+import { Point } from 'ol/geom';
+import * as extent from 'ol/extent';
+
+
+@Injectable()
+export class FeatureIconService {      
+    
+      getIconImageDataUrl(iconClass:string, backgroundColor: string = "#c80a6e",color:string = "#ffffff"): string {
+        var canvas = document.createElement('canvas');
+        canvas.width = 365;
+        canvas.height = 560;
+        var ctx = canvas.getContext('2d');
+        ctx.lineWidth = 6;
+        ctx.fillStyle = backgroundColor;
+        ctx.strokeStyle = "#000000";
+        var path = new Path2D("m182.9 551.7c0 0.1 0.2 0.3 0.2 0.3s175.2-269 175.2-357.4c0-130.1-88.8-186.7-175.4-186.9-86.6 0.2-175.4 56.8-175.4 186.9 0 88.4 175.3 357.4 175.3 357.4z");
+        ctx.fill(path)
+    
+        var iconCharacter = "";
+        if (iconClass != null) {
+          var element = document.createElement("i");
+          element.style.display = "none";
+          element.className = iconClass;
+          document.body.appendChild(element);
+          iconCharacter = getComputedStyle(element, "::before").content.replace(/"/g, '');
+          let iconFont = "200px " +getComputedStyle(element, "::before").fontFamily
+          document.body.removeChild(element);
+          ctx.strokeStyle = color;
+          ctx.fillStyle = color;
+          ctx.lineWidth = 15;
+          ctx.font = iconFont;
+          var ts = ctx.measureText(iconCharacter);
+          ctx.fillText(iconCharacter, 182.9 - (ts.width / 2), 250);
+          ctx.strokeText(iconCharacter, 182.9 - (ts.width / 2), 250);
+        }
+    
+        return canvas.toDataURL();
+      }
+}

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Observer, Observable } from 'rxjs';
+import { Observer, Observable,BehaviorSubject } from 'rxjs';
 
 /**
  * GeolocationService class.
@@ -9,31 +9,26 @@ import { Observer, Observable } from 'rxjs';
 @Injectable()
 export class GeolocationService {
 
-  /**
-   * Tries HTML5 geolocation.
-   *
-   * Wraps the Geolocation API into an observable.
-   *
-   * @return An observable of Position
-   */
-  getCurrentPosition(): Observable<Position> {
-    return Observable.create((observer: Observer<Position>) => {
-      // Invokes getCurrentPosition method of Geolocation API.
-      navigator.geolocation.watchPosition(
-        (position: Position) => {
-          observer.next(position);
-        },
-        (error: PositionError) => {
-          console.debug('Geolocation service: ' + error.message);
-          observer.error(error);
-        },
-        {
-          enableHighAccuracy: true,
-          timeout: 5000,
-          maximumAge: 0
-        }
-      );
-    });
+  private positionObserver$:BehaviorSubject<Position>  = new BehaviorSubject<Position>(null);
+
+  constructor() {
+    navigator.geolocation.watchPosition(
+      (position: Position) => {
+        this.positionObserver$.next(position);
+      },
+      (error: PositionError) => {
+        console.debug('Geolocation service: ' + error.message);
+      },
+      {
+        enableHighAccuracy: true,
+        timeout: 5000,
+        maximumAge: 0
+      }
+    );
   }
 
+
+  getCurrentPosition(): Observable<Position> {
+    return this.positionObserver$;
+  }
 }

projects/common-map/tsconfig.lib.json

@@ -18,12 +18,12 @@
     ]
   },
   "angularCompilerOptions": {
-    "annotateForClosureCompiler": true,
     "skipTemplateCodegen": true,
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true,
-    "enableResourceInlining": true
+    "enableResourceInlining": true,
+    "enableIvy": false
   },
   "exclude": [
     "src/test.ts",

projects/common/package-lock.json

@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "angular-oauth2-oidc": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/angular-oauth2-oidc/-/angular-oauth2-oidc-5.0.2.tgz",
-      "integrity": "sha512-jtOv4IWEjSFfBHVE4seWGWT/ZfWJ95QJ1JaFhVVGJEF64ibGuPwV3ztwTOUl98QHi/Yg4PXXDAisb31JnIbxBw==",
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/angular-oauth2-oidc/-/angular-oauth2-oidc-8.0.4.tgz",
+      "integrity": "sha512-7/3niJBqD7rnElcW+SudE36g7zMWChW4gSq7NpJSzDA4aQadBgvg0hn317MfPm9tpYGrpE3G/z2NMnbzek4TMA==",
       "requires": {
         "jsrsasign": "^8.0.12",
         "tslib": "^1.9.0"
@@ -19,9 +19,9 @@
       "integrity": "sha1-Iqu5ZW00owuVMENnIINeicLlwxY="
     },
     "ngx-uploadx": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/ngx-uploadx/-/ngx-uploadx-3.1.3.tgz",
-      "integrity": "sha512-RX3uEaqMTpjTv5mtdnTQYsDOED3Qg5V3OBU5ohOyL35uL+dllF7I0y+kojJprm9thzHNAWih1DLeTlVWZKo+hQ==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/ngx-uploadx/-/ngx-uploadx-3.3.2.tgz",
+      "integrity": "sha512-gRdXXq2cRU9HE6dj65qay9GV8NRC7n8y5LtMzJWqsfu2k3CHMQxo2TqZwA9/l/PqJ76RoO7sTPy1OenFQ+krkQ==",
       "requires": {
         "tslib": "^1.9.0"
       }