Select better threshold for mobile detection

# Conflicts:
#	projects/common/src/fm/common-service.module.ts

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

Jenkinsfile.develop

@@ -1,47 +1,47 @@
-pipeline {
-  agent any
-  environment {
-     PACKAGE_VERSION_PREFIX=sh(script: 'jq .version package.json |sed "s/\\"//g"', returnStdout: true).trim()
-     PACKAGE_VERSION="${PACKAGE_VERSION_PREFIX + '-prerelease.' + env.BUILD_NUMBER}"
-  }
-  stages {
-    stage('npm install'){
-      steps {
-        sh '''npm install
-        cd projects/common
-        npm install
-        cd ../common-map
-        npm install
-        '''
-      }
-    }
-    stage('build'){
-      steps {
-        sh '''ng build common
-        ng build common-map'''
-      }
-    }
-    stage('npm publish'){
-      steps {
-        sh '''cd dist/common
-        npm version ${PACKAGE_VERSION}
-        npm publish
-        cd ../common-map
-        npm version ${PACKAGE_VERSION}
-        npm publish'''
-      }
-    }
-
-  }
-  post {
-    always {
-      emailext (
-        body: '${DEFAULT_CONTENT}',
-        mimeType: 'text/html',
-        replyTo: '${DEFAULT_REPLYTO}',
-        subject: '${DEFAULT_SUBJECT}',
-        to: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])
-      )
-    }
-  }
+pipeline {
+  agent any
+  environment {
+     PACKAGE_VERSION_PREFIX=sh(script: 'jq .version package.json |sed "s/\\"//g"', returnStdout: true).trim()
+     PACKAGE_VERSION="${PACKAGE_VERSION_PREFIX + '-prerelease.' + env.BUILD_NUMBER}"
+  }
+  stages {
+    stage('npm install'){
+      steps {
+        sh '''npm install
+        cd projects/common
+        npm install
+        cd ../common-map
+        npm install
+        '''
+      }
+    }
+    stage('build'){
+      steps {
+        sh '''ng build common
+        ng build common-map'''
+      }
+    }
+    stage('npm publish'){
+      steps {
+        sh '''cd dist/common
+        npm version ${PACKAGE_VERSION}
+        npm publish
+        cd ../common-map
+        npm version ${PACKAGE_VERSION}
+        npm publish'''
+      }
+    }
+
+  }
+  post {
+    always {
+      emailext (
+        body: '${DEFAULT_CONTENT}',
+        mimeType: 'text/html',
+        replyTo: '${DEFAULT_REPLYTO}',
+        subject: '${DEFAULT_SUBJECT}',
+        to: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])
+      )
+    }
+  }
 }

README.md

@@ -1,59 +1,59 @@
-# Farmmaps viewer
-
-This is a sample FarmMaps client in Angular 7.x.
-
-
-## Quick start
-
-Use one of the two options below to get started.
-
-## Option 1, Using docker
-
-*Dependencies*  
-
-* docker desktop
-
-*Setup*
-
-```
-docker pull node:10.16.0
-docker run -t -i --entrypoint /bin/bash -p 4200:4200 node:10.16.0
-```
-
-Inside the running container 
-```
-git clone https://git.akkerweb.nl/FarmMaps/FarmMapsLib.git
-cd FarmMapsLib
-npm config set @farmmaps:registry https://repository.akkerweb.nl/repository/npm-group/
-npm install -g @angular/cli
-npm install
-ng serve --host 0.0.0.0
-```
-*Go*
-
-Point your browser to http://localhost:4200
-
-## Option 2, Using local machine
-
-*Dependencies*
-
-* npm 6.9.0
-* nodejs 10.16.0
-* git
-
-*Setup*
-
-```
-git clone https://git.akkerweb.nl/FarmMaps/FarmMapsLib.git
-cd FarmMapsLib
-npm config set @farmmaps:registry https://repository.akkerweb.nl/repository/npm-group/
-npm install -g @angular/cli
-npm install
-ng serve
-```
-*Go*
-
-Point your browser to http://localhost:4200
-
-
-
+# Farmmaps viewer
+
+This is a sample FarmMaps client in Angular 7.x.
+
+
+## Quick start
+
+Use one of the two options below to get started.
+
+## Option 1, Using docker
+
+*Dependencies*  
+
+* docker desktop
+
+*Setup*
+
+```
+docker pull node:12.13.1
+docker run -t -i --entrypoint /bin/bash -p 4200:4200 node:12.13.1
+```
+
+Inside the running container 
+```
+git clone https://git.akkerweb.nl/FarmMaps/FarmMapsLib.git
+cd FarmMapsLib
+npm config set @farmmaps:registry https://repository.akkerweb.nl/repository/npm-group/
+npm install -g @angular/cli
+npm install
+ng serve --host 0.0.0.0
+```
+*Go*
+
+Point your browser to http://localhost:4200
+
+## Option 2, Using local machine
+
+*Dependencies*
+
+* npm 6.9.0
+* nodejs 10.16.0
+* git
+
+*Setup*
+
+```
+git clone https://git.akkerweb.nl/FarmMaps/FarmMapsLib.git
+cd FarmMapsLib
+npm config set @farmmaps:registry https://repository.akkerweb.nl/repository/npm-group/
+npm install -g @angular/cli
+npm install
+ng serve
+```
+*Go*
+
+Point your browser to http://localhost:4200
+
+
+

angular.json

@@ -66,7 +66,7 @@
                 {
                   "type": "initial",
                   "maximumWarning": "2mb",
-                  "maximumError": "5mb"
+                  "maximumError": "7mb"
                 }
               ]
             }

browserslist

@@ -1,11 +1,11 @@
-# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
-# For additional information regarding the format and rule options, please see:
-# https://github.com/browserslist/browserslist#queries
-#
-# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
-
-> 0.5%
-last 2 versions
-Firefox ESR
-not dead
+# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+#
+# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
+
+> 0.5%
+last 2 versions
+Firefox ESR
+not dead
 not IE 9-11

package.json

@@ -11,40 +11,40 @@
   },
   "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",
+    "@angular/animations": "~8.2.14",
+    "@angular/common": "~8.2.14",
+    "@angular/compiler": "~8.2.14",
+    "@angular/core": "~8.2.14",
+    "@angular/forms": "~8.2.14",
+    "@angular/platform-browser": "~8.2.14",
+    "@angular/platform-browser-dynamic": "~8.2.14",
+    "@angular/router": "~8.2.14",
     "@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",
+    "@farmmaps/common": ">=0.0.1-prerelease.183 <0.0.1",
+    "@farmmaps/common-map": ">=0.0.1-prerelease.183 <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",
+    "@ngrx/effects": "^8.6.0",
+    "@ngrx/router-store": "^8.6.0",
+    "@ngrx/store": "^8.6.0",
+    "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",
     "resumablejs": "^1.1.0",
-    "rxjs": "~6.3.3",
+    "rxjs": "^6.5.4",
     "tassign": "^1.0.0",
-    "zone.js": "~0.8.26"
+    "zone.js": "~0.9.1"
   },
   "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.803.23",
+    "@angular-devkit/build-ng-packagr": "^0.803.25",
+    "@angular/cli": "^8.3.25",
+    "@angular/compiler-cli": "~8.2.14",
+    "@angular/language-service": "~8.2.14",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.3",
-    "codelyzer": "~4.5.0",
+    "@types/node": "~8.9.4",
+    "codelyzer": "^5.2.1",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "~4.0.0",
@@ -52,12 +52,12 @@
     "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",
+    "ng-packagr": "^5.4.0",
+    "protractor": "^5.4.3",
     "ts-node": "~7.0.0",
-    "tsickle": ">=0.34.0",
+    "tsickle": "^0.37.0",
     "tslib": "^1.9.0",
     "tslint": "~5.11.0",
-    "typescript": "~3.2.2"
+    "typescript": "~3.5.3"
   }
 }

projects/common-map/package-lock.json

@@ -4,68 +4,42 @@
   "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"
-      }
+    "@openlayers/pepjs": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@openlayers/pepjs/-/pepjs-0.5.3.tgz",
+      "integrity": "sha512-Bgvi5c14BS0FJWyYWWFstNEnXsB30nK8Jt8hkAAdqr7E0gDdBBWVDglF3Ub19wTxvgJ/CVHyTY6VuCtnyRzglg=="
     },
     "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==",
+      "version": "1.0.0-next.13",
+      "resolved": "https://registry.npmjs.org/ngx-openlayers/-/ngx-openlayers-1.0.0-next.13.tgz",
+      "integrity": "sha512-6y724s5JV6n1oxEhryxP3wcbwzpierj9RLiMLXInfKOG3l5IO1AtPNkeK9+mKctVDUVm5URIfzzZH02Ld+bvSQ==",
       "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==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/ol/-/ol-6.1.1.tgz",
+      "integrity": "sha512-0dL3i3eJqgOpqIjDKEY3grkeQnjAYfV5L/JCxhOu4SxiaizRwFrFgeas6LILRoxKa03jhQFbut2r2bbgcLGQeA==",
       "requires": {
-        "pbf": "3.1.0",
+        "@openlayers/pepjs": "^0.5.3",
+        "pbf": "3.2.1",
         "pixelworks": "1.1.0",
-        "rbush": "2.0.2"
+        "rbush": "^3.0.1"
       }
     },
     "pbf": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.1.0.tgz",
-      "integrity": "sha512-/hYJmIsTmh7fMkHAWWXJ5b8IKLWdjdlAFb3IHkRBn1XUhIYBChVGfVwmHEAV3UfXTxsP/AKfYTXTS/dCPxJd5w==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz",
+      "integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==",
       "requires": {
-        "ieee754": "^1.1.6",
-        "resolve-protobuf-schema": "^2.0.0"
+        "ieee754": "^1.1.12",
+        "resolve-protobuf-schema": "^2.1.0"
       }
     },
     "pixelworks": {
@@ -79,16 +53,16 @@
       "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=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz",
+      "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw=="
     },
     "rbush": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/rbush/-/rbush-2.0.2.tgz",
-      "integrity": "sha512-XBOuALcTm+O/H8G90b6pzu6nX6v2zCKiFG4BJho8a+bY6AER6t8uQUZdi5bomQc0AprCWhEGa7ncAbbRap0bRA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/rbush/-/rbush-3.0.1.tgz",
+      "integrity": "sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w==",
       "requires": {
-        "quickselect": "^1.0.1"
+        "quickselect": "^2.0.0"
       }
     },
     "resolve-protobuf-schema": {

projects/common-map/package.json

@@ -5,16 +5,16 @@
     "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
   },
   "dependencies": {
-    "ngx-openlayers": "1.0.0-next.9",
-    "ol": "^5.3.3"
+    "ngx-openlayers": "1.0.0-next.13",
+    "ol": "6.1.1"
   },
   "peerDependencies": {
-    "@angular/core": "^7.2.0",
+    "@angular/core": "^8.2.0",
     "ngrx-store-localstorage": "^8.0.0",
-    "@ngrx/effects": "^7.2",
-    "@ngrx/router-store": "^7.2",
-    "@ngrx/store": "^7.2",
+    "@ngrx/effects": "^8.2",
+    "@ngrx/router-store": "^8.2",
+    "@ngrx/store": "^8.2",
     "tassign": "^1.0.0",
-    "@farmmaps/common": ">=0.0.1-prerelease.56 <0.0.1"
+    "@farmmaps/common": ">=0.0.1-prerelease.181 <0.0.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,241 +1,249 @@
-import { Action } from '@ngrx/store';
-
-import { IMapState,IItemLayer,IQueryState } from '../models';
-import { IItem } from '@farmmaps/common';
-import { Feature } from 'ol';
-import { Extent } from 'ol/extent';
-
-export const SETSTATE = '[Map] SetState';
-export const SETMAPSTATE = '[Map] MapState';
-export const SETVIEWEXTENT = '[Map] SetViewExtent';
-export const INIT = '[Map] Init';
-export const SETPARENT = '[Map] SetParent';
-export const STARTSEARCH = '[Map] StartSearch';
-export const STARTSEARCHSUCCESS = '[Map] StartSearchSuccess';
-export const SELECTFEATURE = '[Map] SelectFeature';
-export const SELECTITEM = '[Map] SelectItem';
-export const SELECTITEMSUCCESS = '[Map] SelectItemSuccess';
-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';
-export const ADDLAYER = '[Map] AddLayer';
-export const SETVISIBILITY = '[Map] SetVisibility';
-export const SETOPACITY = '[Map] SetOpacity';
-export const SETLAYERINDEX = '[Map] SetLayerIndex';
-export const REMOVELAYER = '[Map] RemoveLayer';
-export const LOADBASELAYERS = '[Map] LoadLayers';
-export const LOADBASELAYERSSUCCESS = '[Map] LoadLayersSuccess';
-export const SELECTBASELAYER = '[Map] SelectBaseLayers';
-export const SELECTOVERLAYLAYER = '[Map] SelectOverlayLayers';
-export const ZOOMTOEXTENT = '[Map] ZoomToExtent';
-export const DOQUERY = '[Map] DoQuery';
-
-export class SetState implements Action {
-  readonly type = SETSTATE;
-
-  constructor(public mapState: IMapState,public queryState:IQueryState) { }
-}
-
-export class SetMapState implements Action {
-  readonly type = SETMAPSTATE;
-
-  constructor(public mapState: IMapState) { }
-}
-
-export class SetViewExtent implements Action {
-  readonly type = SETVIEWEXTENT;
-
-  constructor(public extent:number[]) { }
-}
-
-export class Init implements Action {
-  readonly type = INIT;
-
-  constructor() { }
-}
-
-export class SetParent implements Action {
-  readonly type = SETPARENT;
-
-  constructor(public parentCode:string) { }
-}
-
-export class StartSearch implements Action {
-  readonly type = STARTSEARCH;
-
-  constructor(public queryState: IQueryState) { }
-}
-
-export class StartSearchSuccess implements Action {
-  readonly type = STARTSEARCHSUCCESS;
-
-  constructor(public features: Array<Feature>, public query:IQueryState) { }
-}
-
-export class SelectFeature implements Action {
-  readonly type = SELECTFEATURE;
-
-  constructor(public feature:Feature) { }
-}
-
-export class SelectItem implements Action {
-  readonly type = SELECTITEM;
-
-  constructor(public itemCode:string) { }
-}
-
-export class SelectItemSuccess implements Action {
-  readonly type = SELECTITEMSUCCESS;
-
-  constructor(public item: IItem) { }
-}
-
-export class AddFeatureSuccess implements Action {
-  readonly type = ADDFEATURESUCCESS;
-
-  constructor(public feature: Feature) { }
-}
-
-export class UpdateFeatureSuccess implements Action {
-  readonly type = UPDATEFEATURESUCCESS;
-
-  constructor(public feature: Feature) { }
-}
-
-export class ExpandSearch implements Action {
-  readonly type = EXPANDSEARCH;
-
-  constructor() { }
-}
-
-export class CollapseSearch implements Action {
-  readonly type = COLLAPSESEARCH;
-
-  constructor() { }
-}
-
-export class ToggleMenu implements Action {
-  readonly type = TOGGLEMENU;
-
-  constructor() { }
-}
-
-export class SetExtent implements Action {
-  readonly type = SETEXTENT;
-
-  constructor(public extent:number[]) { }
-}
-
-export class SetQueryState implements Action {
-  readonly type = SETQUERYSTATE;
-
-  constructor(public queryState: IQueryState) { }
-}
-
-export class SetTimeSpan implements Action {
-    readonly type = SETTIMESPAN;
-
-    constructor(public startDate: Date, public endDate: Date) { }
-}
-
-export class AddLayer implements Action {
-  readonly type = ADDLAYER;
-
-  constructor(public item:IItem,public layerIndex=-1) { }
-}
-
-export class SetVisibility implements Action {
-  readonly type = SETVISIBILITY;
-
-  constructor(public itemLayer:IItemLayer,public visibility:boolean) { }
-}
-
-export class SetOpacity implements Action {
-  readonly type = SETOPACITY;
-
-  constructor(public itemLayer: IItemLayer, public opacity: number) { }
-}
-
-export class SetLayerIndex implements Action {
-  readonly type = SETLAYERINDEX;
-
-  constructor(public layerIndex: number, public itemLayer: IItemLayer = null) { }
-}
-
-export class RemoveLayer implements Action {
-  readonly type = REMOVELAYER;
-
-  constructor(public itemLayer: IItemLayer) { }
-}
-
-export class LoadBaseLayers implements Action {
-  readonly type = LOADBASELAYERS;
-
-  constructor(public projection: string) { }
-}
-
-export class LoadBaseLayersSuccess implements Action {
-  readonly type = LOADBASELAYERSSUCCESS;
-
-  constructor(public items: IItem[] ) { }
-}
-
-export class SelectBaseLayer implements Action {
-  readonly type = SELECTBASELAYER;
-
-  constructor(public itemLayer: IItemLayer) { }
-}
-
-export class SelectOverlayLayer implements Action {
-  readonly type = SELECTOVERLAYLAYER;
-
-  constructor(public itemLayer: IItemLayer) { }
-}
-
-export class ZoomToExtent implements Action {
-  readonly type = ZOOMTOEXTENT;
-
-  constructor(public itemLayer: IItemLayer) { }
-}
-
-export class DoQuery implements Action {
-  readonly type = DOQUERY;
-
-  constructor(public query:IQueryState) { }
-}
-
-export type Actions = SetMapState
-  | Init
-  | SetParent
-  | StartSearch
-  | StartSearchSuccess
-  | SelectFeature
-  | SelectItem
-  | SelectItemSuccess
-  | AddFeatureSuccess
-  | UpdateFeatureSuccess
-  | ExpandSearch
-  | CollapseSearch
-  | ToggleMenu
-  | SetExtent
-  | SetQueryState
-  | SetTimeSpan
-  | AddLayer
-  | RemoveLayer
-  | SetVisibility
-  | SetOpacity
-  | SetLayerIndex
-  | LoadBaseLayers
-  | LoadBaseLayersSuccess
-  | SelectBaseLayer
-  | SelectOverlayLayer
-  | ZoomToExtent
-  | SetState
-  | SetViewExtent
-  | DoQuery;
-
+import { Action } from '@ngrx/store';
+
+import { IMapState } from '../models/map.state';
+import { IItemLayer } from '../models/item.layer';
+import { IQueryState } from '@farmmaps/common';
+import { IItem } from '@farmmaps/common';
+import { Feature,Style } from 'ol';
+
+export const SETSTATE = '[Map] SetState';
+export const SETMAPSTATE = '[Map] MapState';
+export const SETVIEWEXTENT = '[Map] SetViewExtent';
+export const INIT = '[Map] Init';
+export const SETPARENT = '[Map] SetParent';
+export const STARTSEARCH = '[Map] StartSearch';
+export const STARTSEARCHSUCCESS = '[Map] StartSearchSuccess';
+export const SELECTFEATURE = '[Map] SelectFeature';
+export const SELECTITEM = '[Map] SelectItem';
+export const SELECTITEMSUCCESS = '[Map] SelectItemSuccess';
+export const ADDFEATURESUCCESS = '[Map] AddFeatureSuccess';
+export const UPDATEFEATURESUCCESS = '[Map] UpdateFeatureSuccess';
+export const EXPANDSEARCH = '[Map] ExpandSearch';
+export const COLLAPSESEARCH = '[Map] CollapseSearch';
+export const SETEXTENT = '[Map] SetExtent';
+export const SETQUERYSTATE = '[Map] SetQueryState';
+export const SETTIMESPAN = '[Map] SetTimeSpan';
+export const ADDLAYER = '[Map] AddLayer';
+export const SETVISIBILITY = '[Map] SetVisibility';
+export const SETOPACITY = '[Map] SetOpacity';
+export const SETLAYERINDEX = '[Map] SetLayerIndex';
+export const REMOVELAYER = '[Map] RemoveLayer';
+export const LOADBASELAYERS = '[Map] LoadLayers';
+export const LOADBASELAYERSSUCCESS = '[Map] LoadLayersSuccess';
+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 class SetState implements Action {
+  readonly type = SETSTATE;
+
+  constructor(public mapState: IMapState,public queryState:IQueryState) { }
+}
+
+export class SetMapState implements Action {
+  readonly type = SETMAPSTATE;
+
+  constructor(public mapState: IMapState) { }
+}
+
+export class SetViewExtent implements Action {
+  readonly type = SETVIEWEXTENT;
+
+  constructor(public extent:number[]) { }
+}
+
+export class Init implements Action {
+  readonly type = INIT;
+
+  constructor() { }
+}
+
+export class SetParent implements Action {
+  readonly type = SETPARENT;
+
+  constructor(public parentCode:string) { }
+}
+
+export class StartSearch implements Action {
+  readonly type = STARTSEARCH;
+
+  constructor(public queryState: IQueryState) { }
+}
+
+export class StartSearchSuccess implements Action {
+  readonly type = STARTSEARCHSUCCESS;
+
+  constructor(public features: Array<Feature>, public query:IQueryState) { }
+}
+
+export class SelectFeature implements Action {
+  readonly type = SELECTFEATURE;
+
+  constructor(public feature:Feature) { }
+}
+
+export class SelectItem implements Action {
+  readonly type = SELECTITEM;
+
+  constructor(public itemCode:string) { }
+}
+
+export class SelectItemSuccess implements Action {
+  readonly type = SELECTITEMSUCCESS;
+
+  constructor(public item: IItem) { }
+}
+
+export class AddFeatureSuccess implements Action {
+  readonly type = ADDFEATURESUCCESS;
+
+  constructor(public feature: Feature) { }
+}
+
+export class UpdateFeatureSuccess implements Action {
+  readonly type = UPDATEFEATURESUCCESS;
+
+  constructor(public feature: Feature) { }
+}
+
+export class ExpandSearch implements Action {
+  readonly type = EXPANDSEARCH;
+
+  constructor() { }
+}
+
+export class CollapseSearch implements Action {
+  readonly type = COLLAPSESEARCH;
+
+  constructor() { }
+}
+
+export class SetExtent implements Action {
+  readonly type = SETEXTENT;
+
+  constructor(public extent:number[]) { }
+}
+
+export class SetQueryState implements Action {
+  readonly type = SETQUERYSTATE;
+
+  constructor(public queryState: IQueryState) { }
+}
+
+export class SetTimeSpan implements Action {
+    readonly type = SETTIMESPAN;
+
+    constructor(public startDate: Date, public endDate: Date) { }
+}
+
+export class AddLayer implements Action {
+  readonly type = ADDLAYER;
+
+  constructor(public item:IItem,public layerIndex=-1) { }
+}
+
+export class SetVisibility implements Action {
+  readonly type = SETVISIBILITY;
+
+  constructor(public itemLayer:IItemLayer,public visibility:boolean) { }
+}
+
+export class SetOpacity implements Action {
+  readonly type = SETOPACITY;
+
+  constructor(public itemLayer: IItemLayer, public opacity: number) { }
+}
+
+export class SetLayerIndex implements Action {
+  readonly type = SETLAYERINDEX;
+
+  constructor(public layerIndex: number, public itemLayer: IItemLayer = null) { }
+}
+
+export class RemoveLayer implements Action {
+  readonly type = REMOVELAYER;
+
+  constructor(public itemLayer: IItemLayer) { }
+}
+
+export class LoadBaseLayers implements Action {
+  readonly type = LOADBASELAYERS;
+
+  constructor(public projection: string) { }
+}
+
+export class LoadBaseLayersSuccess implements Action {
+  readonly type = LOADBASELAYERSSUCCESS;
+
+  constructor(public items: IItem[] ) { }
+}
+
+export class SelectBaseLayer implements Action {
+  readonly type = SELECTBASELAYER;
+
+  constructor(public itemLayer: IItemLayer) { }
+}
+
+export class SelectOverlayLayer implements Action {
+  readonly type = SELECTOVERLAYLAYER;
+
+  constructor(public itemLayer: IItemLayer) { }
+}
+
+export class ZoomToExtent implements Action {
+  readonly type = ZOOMTOEXTENT;
+
+  constructor(public itemLayer: IItemLayer) { }
+}
+
+export class DoQuery implements Action {
+  readonly type = DOQUERY;
+
+  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 type Actions = SetMapState
+  | Init
+  | SetParent
+  | StartSearch
+  | StartSearchSuccess
+  | SelectFeature
+  | SelectItem
+  | SelectItemSuccess
+  | AddFeatureSuccess
+  | UpdateFeatureSuccess
+  | ExpandSearch
+  | CollapseSearch
+  | SetExtent
+  | SetQueryState
+  | SetTimeSpan
+  | AddLayer
+  | RemoveLayer
+  | SetVisibility
+  | SetOpacity
+  | SetLayerIndex
+  | LoadBaseLayers
+  | LoadBaseLayersSuccess
+  | SelectBaseLayer
+  | SelectOverlayLayer
+  | ZoomToExtent
+  | SetState
+  | SetViewExtent
+  | DoQuery
+  | SetStyle
+  | ShowLayerSwitcher;
+

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

@@ -1,29 +1,29 @@
-import { NgModule } from '@angular/core';
-import { RouterModule } from '@angular/router';
-import { MapComponent } from './components/map/map.component';
-import { AuthGuard } from '@farmmaps/common';
-
-const routes = [
-    {
-    path: '', canActivateChild: [AuthGuard], children: [
-            {
-                path: '',
-                component: MapComponent
-            }
-        ]
-    },
-    {
-      path: ':xCenter/:yCenter/:zoom/:rotation/:baseLayer/:queryState', canActivateChild: [AuthGuard], children: [
-            {
-                path: '',
-                component: MapComponent
-            }
-        ]
-  }
-];
-
-@NgModule({
-    imports: [RouterModule.forChild(routes)],
-    exports: [RouterModule]
-})
-export class MapRoutingModule { }
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { MapComponent } from './components/map/map.component';
+import { AuthGuard } from '@farmmaps/common';
+
+const routes = [
+    {
+    path: '', children: [
+            {
+                path: '',
+                component: MapComponent
+            }
+        ]
+    },
+    {
+      path: ':xCenter/:yCenter/:zoom/:rotation/:baseLayer/:queryState', children: [
+            {
+                path: '',
+                component: MapComponent
+            }
+        ]
+  }
+];
+
+@NgModule({
+    imports: [RouterModule.forChild(routes)],
+    exports: [RouterModule]
+})
+export class MapRoutingModule { }

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';
@@ -46,7 +45,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 +52,40 @@ 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 { 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 +93,6 @@ export {
   mapActions,
   ZoomToExtentComponent,
   ItemVectorSourceComponent,
-  ItemFeaturesSourceComponent,
   ItemLayersComponent,
   FileDropTargetComponent,
   MapComponent,
@@ -104,19 +123,21 @@ export {
   ItemWidgetListComponent,
   WidgetStatusComponent,
   GpsLocation,
+  PanToLocation,
+  LayerSwitcher,
   AbstractFeatureListComponent,
   AbstractFeatureListFeatureComponent,
   AbstractSelectedItemComponent,
   AbstractItemWidgetComponent,
   AbstractItemListItemComponent,
   AbstractItemListComponent,
-  StateSerializerService,
+  FeatureIconService,
   GeolocationService,
+  DeviceOrientationService,
   IMapState,
   ISelectedFeatures,
   IItemLayer,
   ItemLayer,
-  IQueryState,
   IPeriodState,
   ForChild,
   ForItemType,
@@ -128,7 +149,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 +159,6 @@ export {
   declarations: [
     ZoomToExtentComponent,
     ItemVectorSourceComponent,
-    ItemFeaturesSourceComponent,
     ItemLayersComponent,
     FileDropTargetComponent,
     MapComponent,
@@ -169,6 +189,8 @@ export {
     ItemWidgetListComponent,
     WidgetStatusComponent,
     GpsLocation,
+    PanToLocation,
+    LayerSwitcher
   ],
   entryComponents: [
     FeatureListComponent,
@@ -186,12 +208,13 @@ export {
   ],
   exports: [
        ItemVectorSourceComponent,
-       ItemFeaturesSourceComponent,
        ItemLayersComponent,
        FileDropTargetComponent,
        MetaDataModalComponent,
        MapComponent,
        GpsLocation,
+       PanToLocation,
+       LayerSwitcher,
        FeatureListFeatureComponent,
        FeatureListFeatureCropfieldComponent,
        FeatureListFeatureCroppingschemeComponent,
@@ -221,13 +244,15 @@ export {
   ]
 })
 
+
 export class AppCommonMapModule {
   static forRoot(): ModuleWithProviders {
     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 },

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

@@ -1,68 +1,70 @@
-import { Component, OnInit, Input, ViewChild, ElementRef, OnChanges, SimpleChanges } from '@angular/core';
-import { MapComponent } from 'ngx-openlayers';
-import Overlay from 'ol/Overlay';
-import { fromLonLat, toLonLat } from 'ol/proj';
-
-
-@Component({
-  selector: 'fm-map-gps-location',
-  templateUrl: './gps-location.component.html',
-  styleUrls: ['./gps-location.component.scss']
-})
-export class GpsLocation  implements OnInit,OnChanges{
-
-  @Input() enable:boolean;
-  public instance: Overlay;
-  @Input() position: Position;
-  @Input() location: number[]=[0,0];
-  @Input() locationTolerance: number = 0;
-  @Input() showHeading: boolean = false;
-  @Input() heading: number = 0;
-  @Input() headingTolerance: number = 0;
-  public locTolerancePixels: number = 0;
-  public path: string = "";
-  public rotate: string = "";
-  private resolution: number = 0;
-  @ViewChild('location') locationElement: ElementRef;
-
-  constructor(private map: MapComponent) {
-    
-  }
-
-  recalcLocationTolerance() {
-    this.locTolerancePixels = this.resolution >0? this.locationTolerance / this.resolution:0;
-  }
-
-  ngOnInit() {
-    this.instance = new Overlay({
-      stopEvent:false,
-      positioning: 'center-center',
-      position: fromLonLat( this.location),
-      element: this.locationElement.nativeElement
-    });
-    var x = Math.tan(this.headingTolerance * Math.PI / 180)*40;
-    var y = Math.cos(this.headingTolerance * Math.PI / 180) * 40;
-    var y1 = Math.round(500 - y);
-    var x1 = Math.round(500 - x);
-    var y2 = Math.round(y1);
-    var x2 = Math.round(500 + x);
-    this.path = "M " + x2 + " " + y2 + " A 45 45,0,0,0, " + x1 + " " + y1 + " L 493 500 L 507 500 Z";
-    this.rotate = "rotate(" + Math.round(this.heading) + " 500 500)";
-    this.locTolerancePixels = this.locationTolerance;
-    this.map.instance.addOverlay(this.instance);
-    this.map.instance.getView().on('change:resolution', (evt) => {
-      this.resolution = evt.target.get('resolution');
-      this.recalcLocationTolerance();
-    });
-  }
-
-  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;
-    }
-  }
-}
+import { Component, OnInit, Input, ViewChild, ElementRef, OnChanges, SimpleChanges } from '@angular/core';
+import { MapComponent } from 'ngx-openlayers';
+import Overlay from 'ol/Overlay';
+import { fromLonLat, toLonLat } from 'ol/proj';
+
+
+@Component({
+  selector: 'fm-map-gps-location',
+  templateUrl: './gps-location.component.html',
+  styleUrls: ['./gps-location.component.scss']
+})
+export class GpsLocation  implements OnInit,OnChanges{
+
+  @Input() enable:boolean;
+  public instance: Overlay;
+  @Input() position: Position;
+  @Input() location: number[]=[0,0];
+  @Input() locationTolerance: number = 0;
+  @Input() showHeading: boolean = false;
+  @Input() heading: number = 0;
+  @Input() headingTolerance: number = 0;
+  public locTolerancePixels: number = 0;
+  public path: string = "";
+  public rotate: string = "";
+  private resolution: number = 0;
+  @ViewChild('location', { static: true }) locationElement: ElementRef;
+
+  constructor(private map: MapComponent) {
+    
+  }
+
+  recalcLocationTolerance() {
+    this.locTolerancePixels = this.resolution >0? this.locationTolerance / this.resolution:0;
+  }
+
+  ngOnInit() {
+    this.instance = new Overlay({
+      stopEvent:false,
+      positioning: 'center-center',
+      position: fromLonLat( this.location),
+      element: this.locationElement.nativeElement
+    });
+    var x = Math.tan(this.headingTolerance * Math.PI / 180)*40;
+    var y = Math.cos(this.headingTolerance * Math.PI / 180) * 40;
+    var y1 = Math.round(500 - y);
+    var x1 = Math.round(500 - x);
+    var y2 = Math.round(y1);
+    var x2 = Math.round(500 + x);
+    this.path = "M " + x2 + " " + y2 + " A 45 45,0,0,0, " + x1 + " " + y1 + " L 493 500 L 507 500 Z";
+    this.rotate = "rotate(" + Math.round(this.heading) + " 500 500)";
+    this.locTolerancePixels = this.locationTolerance;
+    this.map.instance.addOverlay(this.instance);
+    this.map.instance.getView().on('change:resolution', (evt) => {
+      this.resolution = evt.target.get('resolution');
+      this.recalcLocationTolerance();
+    });
+  }
+
+  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();
+    }
+    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,276 +1,279 @@
-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 {Extent} from 'ol/extent';
-import Projection from 'ol/proj/Projection';
-import * as proj from 'ol/proj';
-import * as loadingstrategy from 'ol/loadingstrategy';
-import * as style from 'ol/style';
-import {Tile,Layer,Image} from 'ol/layer';
-import {XYZ,ImageStatic,OSM,BingMaps,TileWMS,TileArcGISRest} from 'ol/source';
-import {Vector as VectorSource} from 'ol/source';
-import { Vector as VectorLayer } from 'ol/layer';
-import VectorTileSource from 'ol/source/VectorTile';
-import VectorTileLayer from 'ol/layer/VectorTile';
-import {GeoJSON,MVT} from 'ol/format';
-import { from } from 'rxjs';
-
-@Component({
-  selector: 'fm-map-item-layers',
-  template: `<ng-content></ng-content>`,
-  providers: [
-    { provide: LayerGroupComponent, useExisting: forwardRef(() => ItemLayersComponent) }
-  ]
-})
-
-export class ItemLayersComponent extends LayerGroupComponent implements OnChanges, OnInit {
-  @Input() itemLayers: IItemLayer[];
-  @Input() itemLayer: IItemLayer;
-  private _apiEndPoint: string;
-
-  constructor(private itemService: ItemService, @Host() private map: MapComponent, public appConfig: AppConfig) {
-    super(map);
-    this._apiEndPoint = appConfig.getConfig("apiEndPoint");
-  }
-
-  private styleCache = {}
-
-  componentToHex(c) {
-    var hex = c.toString(16);
-    return hex.length == 1 ? "0" + hex : hex;
-  }
-
-   rgbaToHex(r, g, b,a) {
-     return "#" + this.componentToHex(r) + this.componentToHex(g) + this.componentToHex(b) + this.componentToHex(a);
-  }
-
-  getColorFromGradient(layer: ILayer,  feature): style.Style {
-    var value = feature.get(layer.name);
-    var gradient: IGradientstop[] = layer.renderer.colorMap.gradient;
-    var histogram: IHistogram = layer.renderer.band.histogram;
-    var index = (value - histogram.min) / histogram.max;
-    var min = gradient[0];
-    var max = gradient[gradient.length - 1];
-    for (var n = 0; n < gradient.length; n++) {
-      var s = gradient[n];
-      if (s.relativestop <= index && min.relativestop < s.relativestop && n < gradient.length - 1) min = s;
-      if (s.relativestop >= index && max.relativestop > s.relativestop && n > 0) max = s;
-    }
-    var i = index - min.relativestop;
-    var size = max.relativestop - min.relativestop;
-    var alpha = Math.round( min.color.alpha + ((max.color.alpha - min.color.alpha) * i / size));
-    var red = Math.round(min.color.red + ((max.color.red - min.color.red) * i / size));
-    var green = Math.round(min.color.green + ((max.color.green - min.color.green) * i / size));
-    var blue = Math.round(min.color.blue + ((max.color.blue - min.color.blue) * i / size));
-
-    return new style.Style(
-      {
-        image: new style.Circle({
-          fill: new style.Fill({
-            color: this.rgbaToHex(red,green,blue,alpha)
-          }),
-          radius: 3
-        }),
-        fill: new style.Fill({
-          color: this.rgbaToHex(red, green, blue, alpha)
-        }),
-        stroke: new style.Stroke({
-          color: this.rgbaToHex(red, green, blue, alpha),
-          width: 1.25
-        }),
-      });
-  }
-
-  createLayer(itemLayer: IItemLayer): Layer {
-    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()}` });
-      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 == "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"));
-                }
-              }
-              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
-                    }),
-                    stroke: new style.Stroke({
-                      color: color,
-                      width: 1.25
-                    }),
-                    radius: 5
-                  }),
-                }
-              )
-            }
-            return this.styleCache[key];
-          }
-        });
-      }      
-    } 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;
-        }
-      }
-    }
-    if (layer) {
-      let geometry = new GeoJSON().readGeometry(itemLayer.item.geometry);
-      let extent = geometry ? proj.transformExtent(geometry.getExtent(), 'EPSG:4326', 'EPSG:3857') : null;
-      if (extent) layer.setExtent(extent);
-    }
-
-    return layer;
-  }
-
-  ngOnInit() {
-    super.ngOnInit();
-    this.updateLayers(this.itemLayers);
-  }
-
-  updateLayers(itemLayers: IItemLayer[]) {
-    if (itemLayers) {
-      var olLayers = this.instance.getLayers();
-      itemLayers.forEach((itemLayer, index) => {
-
-        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);
-        }
-        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);
-        }
-      }
-    }   
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    if (this.instance) {
-      if (changes['itemLayers']) {
-        var itemLayers = changes['itemLayers'].currentValue as IItemLayer[];
-        this.updateLayers(itemLayers);
-      }
-      if (changes['itemLayer']) {
-        var itemLayer = changes['itemLayer'].currentValue as IItemLayer;
-        if(itemLayer) {
-          this.updateLayers([itemLayer]);
-        } else {
-          this.updateLayers([]);
-        }
-      }
-    }
-  }
-}
+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} 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';
+import * as loadingstrategy from 'ol/loadingstrategy';
+import * as style from 'ol/style';
+import {Tile,Layer,Image} from 'ol/layer';
+import {XYZ,ImageStatic,OSM,BingMaps,TileWMS,TileArcGISRest} from 'ol/source';
+import {Vector as VectorSource} from 'ol/source';
+import { Vector as VectorLayer } from 'ol/layer';
+import VectorTileSource from 'ol/source/VectorTile';
+import VectorTileLayer from 'ol/layer/VectorTile';
+import {GeoJSON,MVT} from 'ol/format';
+import { from } from 'rxjs';
+
+@Component({
+  selector: 'fm-map-item-layers',
+  template: `<ng-content></ng-content>`,
+  providers: [
+    { provide: LayerGroupComponent, useExisting: forwardRef(() => ItemLayersComponent) }
+  ]
+})
+
+export class ItemLayersComponent extends LayerGroupComponent implements OnChanges, OnInit {
+  @Input() itemLayers: IItemLayer[];
+  @Input() itemLayer: IItemLayer;
+  private _apiEndPoint: string;
+
+  constructor(private itemService: ItemService, @Host() private map: MapComponent, public appConfig: AppConfig) {
+    super(map);
+    this._apiEndPoint = appConfig.getConfig("apiEndPoint");
+  }
+
+  private styleCache = {}
+
+  componentToHex(c) {
+    var hex = c.toString(16);
+    return hex.length == 1 ? "0" + hex : hex;
+  }
+
+   rgbaToHex(r, g, b,a) {
+     return "#" + this.componentToHex(r) + this.componentToHex(g) + this.componentToHex(b) + this.componentToHex(a);
+  }
+
+  getColorFromGradient(layer: ILayer,  feature): style.Style {
+    var value = feature.get(layer.name);
+    var gradient: IGradientstop[] = layer.renderer.colorMap.gradient;
+    var histogram: IHistogram = layer.renderer.band.histogram;
+    var index = (value - histogram.min) / histogram.max;
+    var min = gradient[0];
+    var max = gradient[gradient.length - 1];
+    for (var n = 0; n < gradient.length; n++) {
+      var s = gradient[n];
+      if (s.relativestop <= index && min.relativestop < s.relativestop && n < gradient.length - 1) min = s;
+      if (s.relativestop >= index && max.relativestop > s.relativestop && n > 0) max = s;
+    }
+    var i = index - min.relativestop;
+    var size = max.relativestop - min.relativestop;
+    var alpha = Math.round( min.color.alpha + ((max.color.alpha - min.color.alpha) * i / size));
+    var red = Math.round(min.color.red + ((max.color.red - min.color.red) * i / size));
+    var green = Math.round(min.color.green + ((max.color.green - min.color.green) * i / size));
+    var blue = Math.round(min.color.blue + ((max.color.blue - min.color.blue) * i / size));
+
+    return new style.Style(
+      {
+        image: new style.Circle({
+          fill: new style.Fill({
+            color: this.rgbaToHex(red,green,blue,alpha)
+          }),
+          radius: 3
+        }),
+        fill: new style.Fill({
+          color: this.rgbaToHex(red, green, blue, alpha)
+        }),
+        stroke: new style.Stroke({
+          color: this.rgbaToHex(red, green, blue, alpha),
+          width: 1.25
+        }),
+      });
+  }
+
+  createLayer(itemLayer: IItemLayer): Layer {
+    var layer: Layer = null;   
+    var layerIndex = -1;
+    if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.geotiff.processed') {
+      layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : itemLayer.item.data.layers[0].index;
+      let source = new XYZ({ maxZoom: 19, minZoom: 1, url: `${this._apiEndPoint}/api/v1/items/${itemLayer.item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${itemLayer.item.updated.getTime()}` });
+      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/${layerIndex}/{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/${layerIndex}?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;
+      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);
+          }
+        })
+      } 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/${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"));
+                }
+              }
+              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
+                    }),
+                    stroke: new style.Stroke({
+                      color: color,
+                      width: 1.25
+                    }),
+                    radius: 5
+                  }),
+                }
+              )
+            }
+            return this.styleCache[key];
+          }
+        });
+      }
+    } 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;
+        }
+      }
+    }
+    if (layer) {
+      let geometry = new GeoJSON().readGeometry(itemLayer.item.geometry);
+      let extent = geometry ? proj.transformExtent(geometry.getExtent(), 'EPSG:4326', 'EPSG:3857') : null;
+      if (extent) layer.setExtent(extent);
+    }
+
+    return layer;
+  }
+
+  ngOnInit() {
+    super.ngOnInit();
+    this.updateLayers(this.itemLayers);
+  }
+
+  updateLayers(itemLayers: IItemLayer[]) {
+    if (itemLayers) {
+      var olLayers = this.instance.getLayers();
+      itemLayers.forEach((itemLayer, index) => {
+
+        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);
+        }
+        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);
+        }
+      }
+    }
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    if (this.instance) {
+      if (changes['itemLayers']) {
+        var itemLayers = changes['itemLayers'].currentValue as IItemLayer[];
+        this.updateLayers(itemLayers);
+      }
+      if (changes['itemLayer']) {
+        var itemLayer = changes['itemLayer'].currentValue as IItemLayer;
+        if(itemLayer) {
+          this.updateLayers([itemLayer]);
+        } else {
+          this.updateLayers([]);
+        }
+      }
+    }
+  }
+}

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

@@ -1,207 +1,183 @@
-import { Component, Host, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges, forwardRef, Inject, InjectionToken } from '@angular/core';
-import { LayerVectorComponent, SourceVectorComponent, MapComponent } from 'ngx-openlayers';
-import { ItemService,ItemTypeService,IItem, IItemType } from '@farmmaps/common';
-
-import { Feature } from 'ol';
-import { Point } from 'ol/geom';
-import { MapBrowserEvent } from 'ol';
-import * as style from 'ol/style';
-import * as color from 'ol/color';
-import * as loadingstrategy from 'ol/loadingstrategy';
-import * as condition from 'ol/events/condition';
-import * as extent from 'ol/extent';
-import {Vector,Cluster} from 'ol/source';
-import {Layer} from 'ol/layer';
-import {GeoJSON} from 'ol/format';
-import {Select} from 'ol/interaction';
- 
-@Component({
-  selector: 'fm-map-item-source-vector',
-  template: `<ng-content></ng-content>`,
-  providers: [
-    { provide: SourceVectorComponent , useExisting: forwardRef(() => ItemVectorSourceComponent) }
-  ]
-})
-export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnChanges {
-  instance: Vector;
-  private _format: GeoJSON;
-  private _select: Select;
-  private _hoverSelect: Select;
-  private _iconScale: number = 0.05;
-  @Input() features: Array<Feature>;
-  @Input() selectedFeature: Feature;
-  @Input() selectedItem: IItem;
-  @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)
-    })
-    };
-
-  constructor(@Host() private layer: LayerVectorComponent, private itemService: ItemService, @Host() private map: MapComponent, private itemTypeService: ItemTypeService) {
-    super(layer);
-    this._format = new GeoJSON();
-  }
-
-  geometry(feature: Feature) {
-    let view = this.map.instance.getView();
-    let resolution = view.getResolution();
-    var geometry = feature.getGeometry();
-    let e = geometry.getExtent();
-    //var size = Math.max((e[2] - e[0]) / resolution, (e[3] - e[1]) / resolution);
-    if (resolution > 12) {
-      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);
-    }
-
-    return canvas.toDataURL();
-  }
-
-  ngOnInit() {
-    this.strategy = loadingstrategy.bbox;
-    this.format = new GeoJSON();
-    this._select = new Select({
-      style: (feature) => {        
-        return this.styleCache['selected'];
-      },
-      hitTolerance: 10,
-      layers: [this.layer.instance as Layer]
-    });
-    this._hoverSelect = new Select({
-      style: (feature) => {
-        return this.styleCache['selected'];
-      },
-      hitTolerance: 10,
-      condition: (e: MapBrowserEvent) => {
-        return e.type == 'pointermove';
-      },
-      layers: [this.layer.instance as Layer]
-    });
-    this.map.instance.addInteraction(this._select);
-    this.map.instance.addInteraction(this._hoverSelect);      
-    this._select.on('select', (e) => {
-      if (e.selected.length > 0 && e.selected[0]) {
-        this.onFeaturesSelected.emit(e.selected[0]);
-      } else {
-        this.onFeaturesSelected.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.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({
-              image: itemType.icon ? new style.Icon({
-                  anchor: [0.5, 1],
-                  scale: 0.05,
-                  src: this.getIconImageDataUrl(itemType.icon)
-                }):null,
-              stroke: new style.Stroke({
-                color: 'red',
-                width: 1
-              }),
-              fill: new style.Fill({
-                color: fillColor
-              }),
-              geometry: (feature) => this.geometry(feature)
-            });                   
-        } else {
-          key = 'file';
-        }
-      } 
-      var styleEntry = this.styleCache[key];
-      return styleEntry;
-    });
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    if (changes["features"] && this.instance) {
-      this.instance.clear(true);
-      this._select.getFeatures().clear();
-      this.instance.addFeatures(changes["features"].currentValue);
-    }
-
-    if (changes["selectedFeature"] && this.instance) {
-      var features = this._select.getFeatures();
-      var feature = changes["selectedFeature"].currentValue
-      //this.instance.clear(false);
-      //this.instance.addFeatures(features.getArray());
-      features.clear();
-      if (feature) {
-        //this.instance.removeFeature(feature);
-        features.push(feature)
-      }    
-    }
-    if (changes["selectedItem"] && this.instance) {
-      var item = changes["selectedItem"].currentValue
-      if (item) {
-        this.map.instance.removeInteraction(this._hoverSelect);  
-      } else {
-        this.map.instance.addInteraction(this._hoverSelect);  
-      }
-    }
-  }
-}
+import { Component, Host, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges, forwardRef, Inject, InjectionToken } from '@angular/core';
+import { LayerVectorComponent, SourceVectorComponent, MapComponent } from 'ngx-openlayers';
+import { ItemService,ItemTypeService,IItem, IItemType } from '@farmmaps/common';
+
+import { Feature } from 'ol';
+import { Point } from 'ol/geom';
+import { MapBrowserEvent } from 'ol';
+import * as style from 'ol/style';
+import * as color from 'ol/color';
+import * as loadingstrategy from 'ol/loadingstrategy';
+import * as condition from 'ol/events/condition';
+import * as extent from 'ol/extent';
+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',
+  template: `<ng-content></ng-content>`,
+  providers: [
+    { provide: SourceVectorComponent , useExisting: forwardRef(() => ItemVectorSourceComponent) }
+  ]
+})
+export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnChanges {
+  instance: Vector;
+  private _format: GeoJSON;
+  private _select: Select;
+  private _hoverSelect: Select;
+  private _iconScale: number = 0.05;
+  @Input() features: Array<Feature>;
+  @Input() selectedFeature: Feature;
+  @Input() selectedItem: IItem;
+  @Input() styles:IStyles;
+  @Output() onFeaturesSelected: EventEmitter<Feature> = new EventEmitter<Feature>();
+  private stylesCache:IStyles = {};
+
+  constructor(@Host() private layer: LayerVectorComponent, private itemService: ItemService, @Host() private map: MapComponent, private itemTypeService: ItemTypeService,private featureIconService$:FeatureIconService) {
+    super(layer);
+    this._format = new GeoJSON();
+  }  
+
+  geometry(feature: Feature) {
+    let view = this.map.instance.getView();
+    let resolution = view.getResolution();
+    var geometry = feature.getGeometry();
+    let e = geometry.getExtent();
+    //var size = Math.max((e[2] - e[0]) / resolution, (e[3] - e[1]) / resolution);
+    if (resolution > 12) {
+      geometry = new Point(extent.getCenter(e));
+    }
+    return geometry;
+   }
+
+  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"];
+    }    
+    if(evaluatedStyle && evaluatedStyle.geometry_ == null) {
+      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.getSelectedStyle(feature);
+      },
+      hitTolerance: 10,
+      layers: [this.layer.instance as Layer]
+    });
+    this._hoverSelect = new Select({
+      style: (feature) => {
+        return this.getSelectedStyle(feature);
+      },
+      hitTolerance: 10,
+      condition: (e: MapBrowserEvent) => {
+        return e.type == 'pointermove';
+      },
+      layers: [this.layer.instance as Layer]
+    });
+    this.map.instance.addInteraction(this._select);
+    this.map.instance.addInteraction(this._hoverSelect);      
+    this._select.on('select', (e) => {
+      if (e.selected.length > 0 && e.selected[0]) {
+        this.onFeaturesSelected.emit(e.selected[0]);
+      } else {
+        this.onFeaturesSelected.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.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.stylesCache[key] = new style.Style({
+              image: itemType.icon ? new style.Icon({
+                  anchor: [0.5, 1],
+                  scale: 0.05,
+                  src: this.featureIconService$.getIconImageDataUrl(itemType.icon)
+                }):null,
+              stroke: new style.Stroke({
+                color: 'red',
+                width: 1
+              }),
+              fill: new style.Fill({
+                color: fillColor
+              }),
+              geometry:(feature) => this.geometry(feature)
+            });                   
+        } else {
+          key = 'file';
+        }
+      } 
+      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;
+    });
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    if (changes["features"] && this.instance) {
+      this.instance.clear(true);
+      this._select.getFeatures().clear();
+      this.instance.addFeatures(changes["features"].currentValue);
+    }
+
+    if (changes["selectedFeature"] && this.instance) {
+      var features = this._select.getFeatures();
+      var feature = changes["selectedFeature"].currentValue
+      //this.instance.clear(false);
+      //this.instance.addFeatures(features.getArray());
+      features.clear();
+      if (feature) {
+        //this.instance.removeFeature(feature);
+        features.push(feature)
+      }    
+    }
+    if (changes["selectedItem"] && this.instance) {
+      var item = changes["selectedItem"].currentValue
+      if (item) {
+        this.map.instance.removeInteraction(this._hoverSelect);  
+      } else {
+        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.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',

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

@@ -1,53 +1,39 @@
-import { Component, Host, Input, OnInit, ChangeDetectorRef  } from '@angular/core';
-import { ViewComponent, MapComponent } from 'ngx-openlayers';
-
-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;
-    }
-`]
-})
-export class RotationResetComponent implements OnInit {
-  view: View;
-
-  public Rotation() {
-    let rotation =  this.view ? this.view.getRotation() : 0;
-    return `rotate(${rotation}rad)`;
-  }
-
-  public IsNorth() {
-    return this.view ? this.view.getRotation() == 0 : true;
-  }
-
-  ngOnInit(): void {
-    this.view = this.map.instance.getView();
-    this.view.on('change:rotation', () => {
-      this.changeDetectorRef$.detectChanges();
-    });
-  }
-
-  constructor( @Host() private map: MapComponent, private changeDetectorRef$: ChangeDetectorRef ) {
-  }
-
-  handleClick(event:Event) {
-    this.view.animate({ rotation: 0 });
-    event.preventDefault();
-  }
-}
+import { Component, Host, Input, OnInit, ChangeDetectorRef  } from '@angular/core';
+import { ViewComponent, MapComponent } from 'ngx-openlayers';
+
+import {View} from 'ol';
+
+
+
+@Component({
+  selector: 'fm-map-rotation-reset',
+  templateUrl: './rotation-reset.component.html',
+  styleUrls: ['./rotation-reset.component.scss']
+})
+export class RotationResetComponent implements OnInit {
+  view: View;
+
+  public Rotation() {
+    let rotation =  this.view ? this.view.getRotation() : 0;
+    return `rotate(${rotation}rad)`;
+  }
+
+  public IsNorth() {
+    return this.view ? this.view.getRotation() == 0 : true;
+  }
+
+  ngOnInit(): void {
+    this.view = this.map.instance.getView();
+    this.view.on('change:rotation', () => {
+      this.changeDetectorRef$.detectChanges();
+    });
+  }
+
+  constructor( @Host() private map: MapComponent, private changeDetectorRef$: ChangeDetectorRef ) {
+  }
+
+  handleClick(event:Event) {
+    this.view.animate({ rotation: 0 });
+    event.preventDefault();
+  }
+}

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

@@ -1,39 +1,39 @@
-import { Component, Host, Input, OnInit, OnChanges, SimpleChanges, forwardRef } from '@angular/core';
-import { ViewComponent, MapComponent } from 'ngx-openlayers';
-
- 
-@Component({
-  selector: 'fm-map-zoom-to-extent',
-  template: `<ng-content></ng-content>`
-})
-export class ZoomToExtentComponent implements OnChanges {
-  view: ViewComponent;
-  map: MapComponent;
-  @Input() extent: number[];
-  @Input() animate: boolean = false;
-
-  constructor(@Host() view: ViewComponent, @Host() map: MapComponent) {
-    this.view = view;
-    this.map = map;
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    if (this.extent) {
-      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;
-      this.view.instance.fit(this.extent, options);
-    }
-  }
-}
+import { Component, Host, Input, OnInit, OnChanges, SimpleChanges, forwardRef } from '@angular/core';
+import { ViewComponent, MapComponent } from 'ngx-openlayers';
+
+ 
+@Component({
+  selector: 'fm-map-zoom-to-extent',
+  template: `<ng-content></ng-content>`
+})
+export class ZoomToExtentComponent implements OnChanges {
+  view: ViewComponent;
+  map: MapComponent;
+  @Input() extent: number[];
+  @Input() animate: boolean = false;
+
+  constructor(@Host() view: ViewComponent, @Host() map: MapComponent) {
+    this.view = view;
+    this.map = map;
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    if (this.extent) {
+      var options = { padding: [0, 0, 0, 0],minResolution:1 };
+      let size = this.map.instance.getSize();
+      let rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
+      let threshold = 40 * 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;
+      this.view.instance.fit(this.extent, options);
+    }
+  }
+}

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

@@ -1,19 +1,18 @@
-@import "../../_theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
-.row {
-  border-bottom: 1px solid gray('500');
-  user-select: none;
-}
-
-.row:hover {
-  background-color: gray('100');
-}
-
-@media screen and (min-width: 44rem)  {
-  .feature-list-container {
-    margin-top: 4rem;
-  }
-}
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
+.row {
+  border-bottom: 1px solid gray('500');
+  user-select: none;
+}
+
+.row:hover {
+  background-color: gray('100');
+}
+
+@media screen and (min-width: 44rem)  {
+  .feature-list-container {
+    margin-top: 4rem;
+  }
+}

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

@@ -1,59 +1,59 @@
-import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject, Type} 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 * as mapReducers from '../../reducers/map.reducer';
-import * as mapActions from '../../actions/map.actions';
-import { Store } from '@ngrx/store';
-
-
-@Component({
-  selector: 'fm-map-feature-list-container',
-  templateUrl: './feature-list-container.component.html',
-  styleUrls: ['./feature-list-container.component.scss']
-})
-export class FeatureListContainerComponent {
-
-  constructor(private store: Store<mapReducers.State>,private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractFeatureListComponent) public featureLists: AbstractFeatureListComponent[] ) {
-  }
-
-  @Input() features: Array<Feature>
-  @Input() queryState: IQueryState;
-
-  @ViewChild(WidgetHostDirective) widgetHost: WidgetHostDirective; 
-
-  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;
-      }
-    }
-    if (selected >= 0) {
-      componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.featureLists[i]['constructor'] as any);
-      if (this.featureLists[selected]['collapseSearch'] === true) {
-        this.store.dispatch(new mapActions.CollapseSearch());
-      }
-    }
-    const viewContainerRef = this.widgetHost.viewContainerRef;
-    viewContainerRef.clear();
-
-    const componentRef = viewContainerRef.createComponent(componentFactory);
-    (<AbstractFeatureListComponent>componentRef.instance).features = this.features;
-    (<AbstractFeatureListComponent>componentRef.instance).queryState = this.queryState;
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    if (changes["features"] && changes["features"].currentValue) {
-      if (this.queryState) {
-        this.loadComponent(this.queryState);
-      }
-    }
-  }
-}
+import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject, Type} 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 '@farmmaps/common';
+import * as mapReducers from '../../reducers/map.reducer';
+import * as mapActions from '../../actions/map.actions';
+import { Store } from '@ngrx/store';
+
+
+@Component({
+  selector: 'fm-map-feature-list-container',
+  templateUrl: './feature-list-container.component.html',
+  styleUrls: ['./feature-list-container.component.scss']
+})
+export class FeatureListContainerComponent {
+
+  constructor(private store: Store<mapReducers.State>,private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractFeatureListComponent) public featureLists: AbstractFeatureListComponent[] ) {
+  }
+
+  @Input() features: Array<Feature>
+  @Input() queryState: IQueryState;
+
+  @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; 
+
+  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;
+      }
+    }
+    if (selected >= 0) {
+      componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.featureLists[i]['constructor'] as any);
+      if (this.featureLists[selected]['collapseSearch'] === true) {
+        this.store.dispatch(new mapActions.CollapseSearch());
+      }
+    }
+    const viewContainerRef = this.widgetHost.viewContainerRef;
+    viewContainerRef.clear();
+
+    const componentRef = viewContainerRef.createComponent(componentFactory);
+    (<AbstractFeatureListComponent>componentRef.instance).features = this.features;
+    (<AbstractFeatureListComponent>componentRef.instance).queryState = this.queryState;
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    if (changes["features"] && changes["features"].currentValue) {
+      if (this.queryState) {
+        this.loadComponent(this.queryState);
+      }
+    }
+  }
+}

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

@@ -1,14 +1,14 @@
-<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)">
-          <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
+<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 pl-3 pr-3" *ngFor="let feature of features" (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>
+    </div>
+  </div>
+</div>

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

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

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

@@ -1,13 +1,13 @@
-<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="farms">
-        <div class="row m-0" *ngFor="let feature of features" (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>
-    </div>
-  </div>
-</div>
+<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="farms">
+        <div class="row m-0 pl-3 pr-3" *ngFor="let feature of features" (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>
+    </div>
+  </div>
+</div>

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

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

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

@@ -1,43 +1,43 @@
-import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject, Type} from '@angular/core';
-import { Feature } from 'ol';
-import { AbstractFeatureListFeatureComponent,FeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component';
-import { WidgetHostDirective } from '../widget-host/widget-host.directive';
-
-
-@Component({
-  selector: 'fm-map-feature-list-feature-container',
-  template: `
-              <div>
-                 <ng-template fm-map-widget-host></ng-template>
-              </div>
-            `
-})
-export class FeatureListFeatureContainerComponent {
-
-  constructor(private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractFeatureListFeatureComponent) public featureLists: AbstractFeatureListFeatureComponent[] ) {
-  }
-
-  @Input() feature: Feature;
-
-  @ViewChild(WidgetHostDirective) 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);
-      }
-    }    
-    const viewContainerRef = this.widgetHost.viewContainerRef;
-    viewContainerRef.clear();
-
-    const componentRef = viewContainerRef.createComponent(componentFactory);
-    (<AbstractFeatureListFeatureComponent>componentRef.instance).feature = this.feature;
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    if (changes["feature"] && changes["feature"].currentValue) {
-        this.loadComponent();
-    }
-  }
-}
+import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject, Type} from '@angular/core';
+import { Feature } from 'ol';
+import { AbstractFeatureListFeatureComponent,FeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component';
+import { WidgetHostDirective } from '../widget-host/widget-host.directive';
+
+
+@Component({
+  selector: 'fm-map-feature-list-feature-container',
+  template: `
+              <div>
+                 <ng-template fm-map-widget-host></ng-template>
+              </div>
+            `
+})
+export class FeatureListFeatureContainerComponent {
+
+  constructor(private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractFeatureListFeatureComponent) public featureLists: AbstractFeatureListFeatureComponent[] ) {
+  }
+
+  @Input() feature: Feature;
+
+  @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);
+      }
+    }    
+    const viewContainerRef = this.widgetHost.viewContainerRef;
+    viewContainerRef.clear();
+
+    const componentRef = viewContainerRef.createComponent(componentFactory);
+    (<AbstractFeatureListFeatureComponent>componentRef.instance).feature = this.feature;
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    if (changes["feature"] && changes["feature"].currentValue) {
+        this.loadComponent();
+    }
+  }
+}

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

@@ -1,30 +1,29 @@
-@import "../../_theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
-.card-title {
-  font-size: 1rem;
-  white-space: nowrap;
-  overflow: hidden;
-  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;
-}
-
-.col {
-  overflow: hidden;
-}
-
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
+.card-title {
+  font-size: 1rem;
+  white-space: nowrap;
+  overflow: hidden;
+  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;
+}
+
+.col {
+  overflow: hidden;
+}
+

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

@@ -1,30 +1,29 @@
-@import "../../_theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
-.card-title {
-  font-size: 1rem;
-  white-space: nowrap;
-  overflow: hidden;
-  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;
-}
-
-.col {
-  overflow: hidden;
-}
-
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
+.card-title {
+  font-size: 1rem;
+  white-space: nowrap;
+  overflow: hidden;
+  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;
+}
+
+.col {
+  overflow: hidden;
+}
+

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

@@ -1,30 +1,29 @@
-@import "../../_theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
-.card-title {
-  font-size: 1rem;
-  white-space: nowrap;
-  overflow: hidden;
-  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;
-}
-
-.col {
-  overflow: hidden;
-}
-
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
+.card-title {
+  font-size: 1rem;
+  white-space: nowrap;
+  overflow: hidden;
+  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;
+}
+
+.col {
+  overflow: hidden;
+}
+

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)">
-    <fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
-  </div>
-</div>
+<div *ngIf="features;let features">
+  <a href="#" (click)="handleBackClick($event)">Go back</a>
+  <div class="row m-0 pl-3 pr-3" *ngFor="let feature of features" (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,16 +1,15 @@
-@import "../../_theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-feature-list-feature-container {
-  width: 100%;
-  pointer-events: none;
-}
-
-.row {
-  border-bottom: 1px solid gray('500');
-  user-select: none;
-}
-
-.row:hover {
-  background-color: gray('100');
-}
+@import "~bootstrap/scss/bootstrap.scss";
+
+fm-map-feature-list-feature-container {
+  width: 100%;
+  pointer-events: none;
+}
+
+.row {
+  border-bottom: 1px solid gray('500');
+  user-select: none;
+}
+
+.row:hover {
+  background-color: gray('100');
+}

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

@@ -1,52 +1,52 @@
-import { Component, Input, 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 } 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()
-export abstract class AbstractFeatureListComponent {
-  @Input() features: Array<Feature>;
-  @Input() queryState: IQueryState;
-  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));
-  }
-
-  handleFeatureMouseEnter(feature) {
-    this.store.dispatch(new mapActions.SelectFeature(feature));
-  }
-
-  handleFeatureMouseLeave(feature) {
-    this.store.dispatch(new mapActions.SelectFeature(null));
-  }
-
-  handleBackClick(event: MouseEvent) {
-    event.preventDefault();
-    this.location.back();
-  }
-}
-
-@Injectable()
-@Component({
-  selector: 'fm-map-feature-list',
-  templateUrl: './feature-list.component.html',
-  styleUrls: ['./feature-list.component.scss']
-})
-export class FeatureListComponent extends AbstractFeatureListComponent {
-
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService,location:Location) {
-    super(store, itemTypeService,location);
-  }
-}
+import { Component, Input, 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 } 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 '@farmmaps/common';
+
+
+@Injectable()
+export abstract class AbstractFeatureListComponent {
+  @Input() features: Array<Feature>;
+  @Input() queryState: IQueryState;
+  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));
+  }
+
+  handleFeatureMouseEnter(feature) {
+    this.store.dispatch(new mapActions.SelectFeature(feature));
+  }
+
+  handleFeatureMouseLeave(feature) {
+    this.store.dispatch(new mapActions.SelectFeature(null));
+  }
+
+  handleBackClick(event: MouseEvent) {
+    event.preventDefault();
+    this.location.back();
+  }
+}
+
+@Injectable()
+@Component({
+  selector: 'fm-map-feature-list',
+  templateUrl: './feature-list.component.html',
+  styleUrls: ['./feature-list.component.scss']
+})
+export class FeatureListComponent extends AbstractFeatureListComponent {
+
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService,location:Location) {
+    super(store, itemTypeService,location);
+  }
+}

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

@@ -1,47 +1,47 @@
-import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject, Type} from '@angular/core';
-import { AbstractItemListItemComponent,ItemListItemComponent } from '../item-list-item/item-list-item.component';
-import { WidgetHostDirective } from '../widget-host/widget-host.directive';
-import { IItem, IListItem } from '@farmmaps/common';
-
-
-@Component({
-  selector: 'fm-map-item-list-item-container',
-  template: `
-              <div style="height:100%">
-                 <ng-template fm-map-widget-host></ng-template>
-              </div>
-            `
-})
-export class ItemListItemContainerComponent {
-
-  constructor(private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractItemListItemComponent) public itemComponentList: AbstractItemListItemComponent[] ) {
-  }
-
-  @Input() item: IListItem;
-
-  @ViewChild(WidgetHostDirective) 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);
-      }
-    }    
-    const viewContainerRef = this.widgetHost.viewContainerRef;
-    viewContainerRef.clear();
-
-    const componentRef = viewContainerRef.createComponent(componentFactory);
-    (<AbstractItemListItemComponent>componentRef.instance).item = this.item;
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    if (changes["item"] && changes["item"].currentValue) {
-        this.loadComponent();
-    }
-  }
-}
+import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject, Type} from '@angular/core';
+import { AbstractItemListItemComponent,ItemListItemComponent } from '../item-list-item/item-list-item.component';
+import { WidgetHostDirective } from '../widget-host/widget-host.directive';
+import { IItem, IListItem } from '@farmmaps/common';
+
+
+@Component({
+  selector: 'fm-map-item-list-item-container',
+  template: `
+              <div style="height:100%">
+                 <ng-template fm-map-widget-host></ng-template>
+              </div>
+            `
+})
+export class ItemListItemContainerComponent {
+
+  constructor(private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractItemListItemComponent) public itemComponentList: AbstractItemListItemComponent[] ) {
+  }
+
+  @Input() item: IListItem;
+
+  @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);
+      }
+    }    
+    const viewContainerRef = this.widgetHost.viewContainerRef;
+    viewContainerRef.clear();
+
+    const componentRef = viewContainerRef.createComponent(componentFactory);
+    (<AbstractItemListItemComponent>componentRef.instance).item = this.item;
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    if (changes["item"] && changes["item"].currentValue) {
+        this.loadComponent();
+    }
+  }
+}

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

@@ -1,27 +1,26 @@
-@import "../../_theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-.widget {
-  padding:0.8rem;
-  height:100%;
-  width:100%;
-  color:#ffffff;
-  position:relative;
-}
-
-.icon {
-  display:block;
-   font-size:6rem;
-   text-align:center;
-}
-.title {
-  display:block;
-  position:absolute;
-  width:calc(100% - 1.6rem );
-  padding-top:0.5rem;
-  bottom:0.8rem;
-  height:2rem;
-  overflow:hidden;
-  white-space:nowrap;
-  text-overflow:ellipsis;
-}
+@import "~bootstrap/scss/bootstrap.scss";
+
+.widget {
+  padding:0.8rem;
+  height:100%;
+  width:100%;
+  color:#ffffff;
+  position:relative;
+}
+
+.icon {
+  display:block;
+   font-size:6rem;
+   text-align:center;
+}
+.title {
+  display:block;
+  position:absolute;
+  width:calc(100% - 1.6rem );
+  padding-top:0.5rem;
+  bottom:0.8rem;
+  height:2rem;
+  overflow:hidden;
+  white-space:nowrap;
+  text-overflow:ellipsis;
+}

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,14 +1,10 @@
 import { Component, Input, 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,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()

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,42 +1,41 @@
-@import "../../_theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-.widget-container {
-  overflow:auto;
-  margin-bottom:1rem;
-}
-
-.widget {
-  position:relative;
-  border: 1px solid gray('500');
-  user-select: none;
-  display:inline-block;
-  width:50%;
-  overflow:hidden;
-  float:left;
-}
-
-.widget:after {
-  content: "";
-  display: block;
-  padding-bottom: 100%;
-}
-
-.content {
-  position:absolute;
-  width:100%;
-  height:100%;
-}
-
-.widget:hover {
-  background-color: gray('100');
-}
-
-.widget-container {
-  padding:1rem;
-}
-
-.item-container {
-  display:block;
-  height:100%;
-}
+@import "~bootstrap/scss/bootstrap.scss";
+
+.widget-container {
+  overflow:auto;
+  margin-bottom:1rem;
+}
+
+.widget {
+  position:relative;
+  border: 1px solid gray('500');
+  user-select: none;
+  display:inline-block;
+  width:50%;
+  overflow:hidden;
+  float:left;
+}
+
+.widget:after {
+  content: "";
+  display: block;
+  padding-bottom: 100%;
+}
+
+.content {
+  position:absolute;
+  width:100%;
+  height:100%;
+}
+
+.widget:hover {
+  background-color: gray('100');
+}
+
+.widget-container {
+  padding:1rem;
+}
+
+.item-container {
+  display:block;
+  height:100%;
+}

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" i18n>
+        Layers
+        <i class="float-right fa fa-close" (click)="close($event)"></i>
+      </div>
+      <ul class="navbar-nav">
+        <li class="nav-item py-0">
+          <span i18n><i class="fa fa-map-o" aria-hidden="true"></i> Base maps</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 i18n><i class="fa fa-map-o" aria-hidden="true"></i> Overlays</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,75 @@
+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) {
+    this.store.dispatch(new mapActions.ShowLayerSwitcher(true));
+  }
+
+  close(event:Event) {
+    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,39 +1,41 @@
-<table class="container" *ngIf="layer">
-  <tr>
-    <td colspan="2">
-      <div class="title">
-        <h4 *ngIf="showTitle">{{layer.name}}</h4>
-        <b *ngIf="layer.unit">({{layer.unit}})</b>
-      </div>
-    </td>
-    <td colspan="2">
-      <div class="title" *ngIf="histogramenabled">
-        <h4>{{histogram}}</h4>
-        <b *ngIf="histogramunit">({{histogramunit}})</b>
-      </div>
-    </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="histogram-items">
-      <div *ngIf="histogramenabled" [style.background-color]="getHex(selectedColorMap.noValue)" [style.width]="getPart(selectedColorMap, entry)">
-      </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>-->
-</table>
-
-
-
-
-
+<table class="container" *ngIf="showLegend()">
+  <tr>
+    <td colspan="2">
+      <div class="title">
+        <h4 *ngIf="showTitle">{{layer.name}}</h4>
+        <b *ngIf="layer.unit">({{layer.unit}})</b>
+      </div>
+    </td>
+    <td colspan="2">
+      <div class="title" *ngIf="histogramenabled">
+        <h4>{{histogram}}</h4>
+        <b *ngIf="histogramunit">({{histogramunit}})</b>
+      </div>
+    </td>
+  </tr>
+  <tr *ngFor="let entry of layer.renderer.colorMap.entries; let i = index ">
+    <td class="legend-items"><span [style.background-color]="getHex(entry.color)" class="color"></span></td>
+    <td class="legend-items-text"><span *ngIf="!entry.label">{{entry.value | number:'1.0-2'}} {{legendunit}}</span><span *ngIf="entry.label">{{entry.label}}</span></td>    
+    <td class="histogram-items">
+      <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 *ngIf="layer.renderer.colorMap.entries.length > 0">
+    <td>
+      <i title="Show histogram" class="fa fa-bar-chart fa-rotate-90" (click)="onClickHistoGram()"></i>
+    </td>
+    <td colspan="3"></td>
+  </tr>-->
+</table>
+
+
+
+
+

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

@@ -1,58 +1,67 @@
-
-.container {
-  max-width: 40em;
-  border-spacing: 0.5em;
-  font-family: inherit;
-}
-
-.title {
-  padding: 7px;
-  text-align: center;
-  font-size: 14px;
-  line-height: 28px;
-}
-
-.title > h4 {
-  margin-bottom: 0;
-}
-
-.legend-items {
-  width: 1.5em;
-  height: 1.5em;
-  padding: 0.1em;
-  border-style: none;
-  border-width: 0.05em;
-}
-
-.legend-items div {
-  width:100%;
-  height:100%;
-}
-
-.legend-items-text {
-  max-width: 20em;
-  padding-left: 0.5em;
-  text-align: left;
-}
-
-.histogram-items {
-  width: 5em;
-  padding-left: 1em;
-}
-
-  .histogram-items > div {
-    height: 1em;
-    border-style: solid;
-    border-width: 0.05em;
-    vertical-align: middle;
-  }
-
-.histogram-items-text {
-  max-width: 20em;
-  font-size: 14pt;
-  padding-left: 1em;
-  text-align: left;
-}
-
-
-
+
+.container {
+  max-width: 40em;
+  border-spacing: 0.5em;
+  font-family: inherit;
+}
+
+.title {
+  padding: 7px;
+  text-align: center;
+  font-size: 14px;
+  line-height: 28px;
+}
+
+.title > h4 {
+  margin-bottom: 0;
+}
+
+span.color {
+  display:inline-block;
+  width: 1.5em;
+  height: 1.5em;
+}
+
+.legend-items {
+  padding: 0.1em;
+  border-style: none;
+  border-width: 0.05em;
+}
+
+.legend-items div {
+  width:100%;
+  height:100%;
+}
+
+.legend-items-text {
+  max-width: 20em;
+  padding-left: 0.5em;
+  text-align: left;
+}
+
+.histogram-items {
+  width: 100%;
+  padding-left: 1em;
+}
+
+
+.histogram-items-text {
+  max-width: 20em;
+  font-size: 14pt;
+  padding-left: 1em;
+  text-align: left;
+}
+
+.bar {
+  display:inline-block;
+  height: 1em;
+  vertical-align: middle;
+}
+
+.bar-label {
+  margin-left:0.3em;
+  font-size:0.7em;
+}
+
+
+

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

@@ -1,66 +1,83 @@
-import { Component, OnInit, Input,AfterViewInit } from '@angular/core';
-import { IColorMap, IColor, IColorEntry,ILayer } from '../../models';
-
-
-@Component({
-  selector: 'fm-map-layer-legend',
-  templateUrl: './legend.component.html',
-  styleUrls: ['./legend.component.scss']
-})
-export class LegendComponent implements OnInit,AfterViewInit {
-
-  constructor()  {
-
-  }
-
-  ngOnInit() {
-  }
-
-  ngAfterViewInit() {
-  }
-
-  @Input()
-  layer: ILayer;
-
-  @Input()
-  legend: string;
-
-  @Input()
-  histogram: string;
-
-  @Input()
-  showTitle: boolean = true;
-
-  @Input()
-  histogramenabled: boolean;
-
-  @Input()
-  legendunit: string;
-
-  @Input()
-  histogramunit: string;
-
-
-  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 {
-    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) + "%";
-
-    return part;
-  }
-
-}
-
-
+import { Component, OnInit, Input,AfterViewInit } from '@angular/core';
+import { IColorMap, IColor, IColorEntry,ILayer, IRenderer } from '../../models/color.map';
+
+
+@Component({
+  selector: 'fm-map-layer-legend',
+  templateUrl: './legend.component.html',
+  styleUrls: ['./legend.component.scss']
+})
+export class LegendComponent implements OnInit,AfterViewInit {
+
+  constructor()  {
+
+  }
+
+  ngOnInit() {
+  }
+
+  ngAfterViewInit() {
+  }
+
+  @Input()
+  layer: ILayer;
+
+  @Input()
+  legend: string;
+
+  @Input()
+  histogram: string;
+
+  @Input()
+  showTitle: boolean = true;
+
+  @Input()
+  histogramenabled: boolean;
+
+  @Input()
+  legendunit: string;
+
+  @Input()
+  histogramunit: string;
+
+
+  onClickHistoGram(): void {
+    this.histogramenabled = !this.histogramenabled;
+  }
+
+
+
+
+  public getHex(color: IColor): string {
+    return '#' + this.componentToHex(color.red) + this.componentToHex(color.green) + this.componentToHex(color.blue);
+  }
+
+  private componentToHex(c: number): string {
+    const hex = c.toString(16);
+    return hex.length === 1 ? `0${hex}` : hex;
+  }
+
+  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 = 75 / max;
+    let part = (renderer.band.histogram.entries[index].freqency * scale) + "%";
+
+    return part;
+  }
+
+  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";
+  }
+}
+
+

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

@@ -1,33 +1,36 @@
-<ng-template #rt let-r="result" let-t="term">
-  <i class="fa fa-search" aria-hidden="true" style="width:2rem"></i>
-  <ngb-highlight [result]="formatter(r)" [term]="t"></ngb-highlight> 
-</ng-template>
-
-<div class="map-search collapsed" [ngClass]="{'collapsed':collapsedLocal,searchcollapsed:searchMinifiedLocal}" (click)="$event.stopPropagation()">
-  <div class="card p-2">
-    <form class="form" (ngSubmit)="handleSearch($event)">
-      <div class="input-group">
-        <div class="input-group-prepend">
-          <button type="button" class="btn btn-outline-secondary" (click)="handleToggleMenu($event)"><i class="fa fa-bars" aria-hidden="true"></i></button>
-        </div>
-        <input #searchText class="form-control" type="text" (focus)="handleFocus($event)" [ngModel]="searchTextLocal" name="searchTextLocal" (ngModelChange)="handleChange($event)" [ngbTypeahead]="search" [resultTemplate]="rt" [inputFormatter]="formatter" (selectItem)="handleSelect($event)" placeholder="Search" i18n-placeholder />
-        <div class="input-group-append">
-          <button type="submit" class="btn btn-outline-secondary" [disabled]="disabled"><i class="fa fa-search"></i></button>
-          <button type="button" class="clear btn btn-outline-secondary" [disabled]="!clearEnabled" (click)="handleClearClick($event)"><i class="fa fa-remove"></i></button>
-        </div>
-      </div>
-      <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>
-        </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>
-        </div>    
-      </div>
-    </form>
-    <ng-content></ng-content>
-  </div>
-</div>
-<fm-map-select-period-modal [modalState]="openedModalName" (onCloseModal)="handleCloseModal()" (onSelect)="handleSelectPeriod($event)" [startDate]="startDate" [endDate]="endDate"></fm-map-select-period-modal>
+<ng-template #rt let-r="result" let-t="term">
+  <i class="fa fa-search" aria-hidden="true" style="width:2rem"></i>
+  <ngb-highlight [result]="formatter(r)" [term]="t"></ngb-highlight> 
+</ng-template>
+
+<div class="map-search collapsed" [ngClass]="{'collapsed':collapsedLocal,searchcollapsed:searchMinifiedLocal}" (click)="$event.stopPropagation()">
+  <div class="card p-2">
+    <form class="form" (ngSubmit)="handleSearch($event)">
+      <div class="input-group">
+        <div class="input-group-prepend">
+          <button type="button" class="btn btn-outline-secondary" (click)="handleToggleMenu($event)"><i class="fa fa-bars" aria-hidden="true"></i></button>
+        </div>
+        <input #searchText class="form-control" type="text" (focus)="handleFocus($event)" [ngModel]="searchTextLocal" name="searchTextLocal" (ngModelChange)="handleChange($event)" [ngbTypeahead]="search" [resultTemplate]="rt" [inputFormatter]="formatter" (selectItem)="handleSelect($event)" placeholder="Search" i18n-placeholder />
+        <div class="input-group-append">
+          <button type="submit" class="btn btn-outline-secondary" [disabled]="disabled"><i class="fa fa-search"></i></button>
+          <button type="button" class="clear btn btn-outline-secondary" [disabled]="!clearEnabled" (click)="handleClearClick($event)"><i class="fa fa-remove"></i></button>
+        </div>
+      </div>
+      <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>
+        </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>
+        </div>    
+      </div>
+      <div class="shortcuts">
+        <router-outlet name="map-search"></router-outlet>
+      </div>
+    </form>
+    <ng-content></ng-content>
+  </div>  
+</div>
+<fm-map-select-period-modal [modalState]="openedModalName" (onCloseModal)="handleCloseModal()" (onSelect)="handleSelectPeriod($event)" [startDate]="startDate" [endDate]="endDate"></fm-map-select-period-modal>

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

@@ -1,94 +1,122 @@
-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;
-  box-shadow: 0 0 20px rgba(0, 0, 0, 0.3);
-  z-index:3;
-}
-
-.input-group {
-  flex-wrap:nowrap;
-}
-
-.disabled {
-  color:lighten(#000000,80%);
-}
-
-:host ::ng-deep ngb-typeahead-window.dropdown-menu {
-  width: 20rem;
-  left:-2.5rem !important;
-}
-
-:host ::ng-deep button.dropdown-item {
-  overflow:hidden;
-  text-overflow:ellipsis;
-  padding: 0.375rem 0.75rem;
-}
-
-div.map-search input[type=text] {
-  transition: width 0.3s ease-out;
-}
-
-div.map-search button {
-  transition: width 0.3s ease-out;
-}
-
-div.map-search.collapsed {
-  max-height:3.5rem;
-  max-width:10rem;
-}
-
-div.map-search.searchcollapsed {
-  max-height: 3.5rem;
-  max-width: 6rem;
-}
-
-div.map-search div.options {
-  padding-top: 0.5rem;
-  line-height: 1.5rem;
-  overflow: hidden;
-  transition: max-height 0.3s ease-in-out;
-  max-height:4.5rem;
-}
-
-div.map-search.collapsed div.options, div.map-search.searchcollapsed div.options {
-  max-height: 0;
-  padding:0;
-}
-
-div.map-search button {
-  overflow: hidden;
-}
-
-div.map-search.collapsed input[type=text] {
-  border-top-right-radius: 0.25rem;
-  border-bottom-right-radius: 0.25rem;
-}
-
-div.map-search.searchcollapsed input[type=text] {
-  display: none;
-}
-
-div.map-search.collapsed button.clear, div.map-search.collapsed button[type="submit"] {
-  width: 0;
-  padding: 0;
-  border-color:transparent;
-}
-
-div.map-search.searchcollapsed button[type="submit"] {
-  width: 0;
-  padding: 0;
-  border-color: transparent;
-}
-
-.options label {
-  white-space:nowrap;
-}
-
-
-
-
+@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;
+  min-width: calc(100vw - 1rem);
+  box-shadow: 0 0 20px rgba(0, 0, 0, 0.3);
+  z-index:3;
+}
+
+.input-group {
+  flex-wrap:nowrap;
+}
+
+.disabled {
+  color:lighten(#000000,80%);
+}
+
+:host ::ng-deep ngb-typeahead-window.dropdown-menu {
+  width: 20rem;
+  left:-2.5rem !important;
+}
+
+:host ::ng-deep button.dropdown-item {
+  overflow:hidden;
+  text-overflow:ellipsis;
+  padding: 0.375rem 0.75rem;
+}
+
+div.map-search input[type=text] {
+  transition: width 0.3s ease-out;
+}
+
+div.map-search button {
+  transition: width 0.3s ease-out;
+}
+
+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 {
+  padding-top: 0.5rem;
+  line-height: 1.5rem;
+  overflow: hidden;
+  transition: max-height 0.3s ease-in-out;
+  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;
+}
+
+div.map-search.collapsed input[type=text] {
+  border-top-right-radius: 0.25rem;
+  border-bottom-right-radius: 0.25rem;
+}
+
+div.map-search.searchcollapsed input[type=text] {
+  display: none;
+}
+
+div.map-search.collapsed button.clear, div.map-search.collapsed button[type="submit"] {
+  width: 0;
+  padding: 0;
+  border-color:transparent;
+}
+
+div.map-search.searchcollapsed button[type="submit"] {
+  width: 0;
+  padding: 0;
+  border-color: transparent;
+}
+
+.options label {
+  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

@@ -1,178 +1,178 @@
-import { Component, Input, Output, OnInit, EventEmitter, SimpleChanges, OnChanges, ViewChild } from '@angular/core';
-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 { tassign } from 'tassign';
-
-@Component({
-  selector: 'fm-map-map-search',
-  templateUrl: './map-search.component.html',
-  styleUrls: ['./map-search.component.scss']
-})
-export class MapSearchComponent {
-
-  @ViewChild('searchText') searchText;
-  @Input() clearEnabled: boolean
-  @Input() set collapsed(collapsed: boolean) {
-    this.collapsedLocal = collapsed;
-    if (collapsed) this.searchText.nativeElement.blur();
-  }
-  @Input() set searchMinified(minified: boolean) {
-    this.searchMinifiedLocal = minified;
-  }
-  @Input() period: IPeriodState
-  @Output() onSearch = new EventEmitter<IQueryState>();
-  @Output() onClear = new EventEmitter<any>();
-  @Output() onSearchCollapse = new EventEmitter<any>();
-  @Output() onSearchExpand = new EventEmitter<any>();
-  @Output() onToggleMenu = new EventEmitter<any>();
-  @Output() onOpenModal = new EventEmitter<string>();
-  @Output() onCloseModal = new EventEmitter<any>();
-  @Input() openedModalName: string;
-  @Input() set filterOptions(filterOptions: IQueryState) {
-    if (filterOptions && filterOptions.query && filterOptions.query.length > 0) {
-      this.disabled = false;
-    } else {
-      this.disabled = true;
-    }       
-    this.filterOptionsLocal = tassign(this.filterOptionsLocal, { tags: filterOptions.tags, query: filterOptions.query,bbox:filterOptions.bbox });
-    if (filterOptions.tags) {
-      this.searchTextLocal = { name: filterOptions.tags };
-    } else {
-      this.searchTextLocal = { name: filterOptions.query };
-    }
-    if (this.dateFilter) {
-      this.filterOptionsLocal.startDate = this.startDate;
-      this.filterOptionsLocal.endDate = this.endDate;
-    }
-  }
-
-  public collapsedLocal: boolean = true;
-  public searchMinifiedLocal: boolean = false;
-  public filterOptionsLocal: IQueryState;
-  private extent: number[];
-  public searchTextLocal: any;
-  public searchTextLocalOutput: string; 
-  public dateFilter: boolean = true;
-  public startDate: Date = new Date(new Date(Date.now()).getFullYear(), new Date(Date.now()).getMonth() - 3, 1);
-  public endDate: Date = new Date(Date.now());
-  public startEndCaption: string = this.timespanService.getCaption(this.startDate, this.endDate, 4);
-
-  searching = false;
-  searchFailed = false;
-  hideSearchingWhenUnsubscribed = new Observable(() => () => this.searching = false);
-
-  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:[] };   
-  }
-
-  search = (text$: Observable<string>) =>
-    text$.pipe(
-      debounceTime(300),
-      distinctUntilChanged(),
-      tap(() => this.searching = true),
-      switchMap(term => term.length < 1 ? of([]) :
-        this.typeaheadService.getSearchTypeaheadItems(term).pipe(
-          tap(() => this.searchFailed = false),
-          catchError(() => {
-            this.searchFailed = true;
-            return of([]);
-          })) ),
-      tap(() => this.searching = false),
-      merge(this.hideSearchingWhenUnsubscribed));
-
-  formatter = (x: { name: string }) => x.name;
-
-  handleSearch(event) {
-    this.filterOptionsLocal.tags = null;
-    this.filterOptionsLocal.itemType = null;
-    this.filterOptionsLocal.itemCode = null;
-    this.filterOptionsLocal.parentCode = null;
-    this.filterOptionsLocal.query = this.searchTextLocalOutput;
-    if (this.dateFilter) {
-      this.filterOptionsLocal.startDate = this.startDate;
-      this.filterOptionsLocal.endDate = this.endDate;
-    }
-    this.onSearch.emit(this.filterOptionsLocal);
-  }
-
-  handleOpenSelectPeriodModal(event: MouseEvent) {
-    event.preventDefault();
-    this.onOpenModal.emit('selectPeriodModal');
-  }
-
-  handleCloseModal() {
-    this.onCloseModal.emit({});
-  }
-
-  handleSelect(event) {
-    event.preventDefault();
-    this.filterOptionsLocal.query = null;
-    this.filterOptionsLocal.itemType = null;
-    this.filterOptionsLocal.itemCode = null;
-    this.filterOptionsLocal.parentCode = null;
-    this.filterOptionsLocal.tags = event.item.name;
-    if (this.dateFilter) {
-      this.filterOptionsLocal.startDate = this.startDate;
-      this.filterOptionsLocal.endDate = this.endDate;
-    }
-    this.onSearch.emit(this.filterOptionsLocal);
-    this.searchTextLocal = { name: this.filterOptionsLocal.tags };
-  }
-
-  handleSelectPeriod(event: { startDate: Date, endDate: Date }) {
-    this.startDate = event.startDate;
-    this.endDate = event.endDate;   
-    this.handleCloseModal();
-    this.startEndCaption = this.timespanService.getCaption(event.startDate, event.endDate, 4);
-    this.onSearch.emit(this.filterOptionsLocal);
-  }
-
-  handleChangeEnableDateFilter(enabled) {
-    this.dateFilter = enabled;
-    if (enabled) {
-      this.filterOptionsLocal.startDate = this.startDate;
-      this.filterOptionsLocal.endDate = this.endDate;
-    } else {
-      this.filterOptionsLocal.startDate = null;
-      this.filterOptionsLocal.endDate = null;
-    }
-    if(this.filterOptionsLocal.query || this.filterOptionsLocal.tags)
-      this.onSearch.emit(this.filterOptionsLocal);
-  }
-
-  handleChangeEnableBBOXFilter(enabled) {
-    this.filterOptionsLocal.bboxFilter = enabled;
-    if (this.filterOptionsLocal.query || this.filterOptionsLocal.tags)
-      this.onSearch.emit(this.filterOptionsLocal);
-  }
-
-
-  handleToggleMenu(event) {
-    this.onToggleMenu.emit({});
-  }  
-
-  handleFocus(event) {
-    this.onSearchExpand.emit({});
-  }
-
-  handleChange(event: string) {
-    this.searchTextLocalOutput = event;
-    if (event && event.length == 1) {
-      this.onSearchExpand.emit({});
-    }
-    if (event && event.length > 0)
-      this.disabled = false;
-    else
-      this.disabled = true;
-  }
-
-  handleClearClick(event) {
-    this.onClear.emit({});
-  }
-}
-
+import { Component, Input, Output, OnInit, EventEmitter, SimpleChanges, OnChanges, ViewChild } from '@angular/core';
+import { Observable ,  of } from 'rxjs';
+import { debounceTime,distinctUntilChanged,tap,switchMap,merge,catchError} from 'rxjs/operators';
+import { TypeaheadService, TimespanService } from '@farmmaps/common';
+import { IQueryState } from '@farmmaps/common';
+import { IPeriodState } from '../../models/period.state';
+import { tassign } from 'tassign';
+
+@Component({
+  selector: 'fm-map-map-search',
+  templateUrl: './map-search.component.html',
+  styleUrls: ['./map-search.component.scss']
+})
+export class MapSearchComponent {
+
+  @ViewChild('searchText', { static: true }) searchText;
+  @Input() clearEnabled: boolean
+  @Input() set collapsed(collapsed: boolean) {
+    this.collapsedLocal = collapsed;
+    if (collapsed) this.searchText.nativeElement.blur();
+  }
+  @Input() set searchMinified(minified: boolean) {
+    this.searchMinifiedLocal = minified;
+  }
+  @Input() period: IPeriodState
+  @Output() onSearch = new EventEmitter<IQueryState>();
+  @Output() onClear = new EventEmitter<any>();
+  @Output() onSearchCollapse = new EventEmitter<any>();
+  @Output() onSearchExpand = new EventEmitter<any>();
+  @Output() onToggleMenu = new EventEmitter<any>();
+  @Output() onOpenModal = new EventEmitter<string>();
+  @Output() onCloseModal = new EventEmitter<any>();
+  @Input() openedModalName: string;
+  @Input() set filterOptions(filterOptions: IQueryState) {
+    if (filterOptions && filterOptions.query && filterOptions.query.length > 0) {
+      this.disabled = false;
+    } else {
+      this.disabled = true;
+    }       
+    this.filterOptionsLocal = tassign(this.filterOptionsLocal, { tags: filterOptions.tags, query: filterOptions.query,bbox:filterOptions.bbox });
+    if (filterOptions.tags) {
+      this.searchTextLocal = { name: filterOptions.tags };
+    } else {
+      this.searchTextLocal = { name: filterOptions.query };
+    }
+    if (this.dateFilter) {
+      this.filterOptionsLocal.startDate = this.startDate;
+      this.filterOptionsLocal.endDate = this.endDate;
+    }
+  }
+
+  public collapsedLocal: boolean = true;
+  public searchMinifiedLocal: boolean = false;
+  public filterOptionsLocal: IQueryState;
+  private extent: number[];
+  public searchTextLocal: any;
+  public searchTextLocalOutput: string; 
+  public dateFilter: boolean = true;
+  public startDate: Date = new Date(new Date(Date.now()).getFullYear(), new Date(Date.now()).getMonth() - 3, 1);
+  public endDate: Date = new Date(Date.now());
+  public startEndCaption: string = this.timespanService.getCaption(this.startDate, this.endDate, 4);
+
+  searching = false;
+  searchFailed = false;
+  hideSearchingWhenUnsubscribed = new Observable(() => () => this.searching = false);
+
+  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:[] };   
+  }
+
+  search = (text$: Observable<string>) =>
+    text$.pipe(
+      debounceTime(300),
+      distinctUntilChanged(),
+      tap(() => this.searching = true),
+      switchMap(term => term.length < 1 ? of([]) :
+        this.typeaheadService.getSearchTypeaheadItems(term).pipe(
+          tap(() => this.searchFailed = false),
+          catchError(() => {
+            this.searchFailed = true;
+            return of([]);
+          })) ),
+      tap(() => this.searching = false),
+      merge(this.hideSearchingWhenUnsubscribed));
+
+  formatter = (x: { name: string }) => x.name;
+
+  handleSearch(event) {
+    this.filterOptionsLocal.tags = null;
+    this.filterOptionsLocal.itemType = null;
+    this.filterOptionsLocal.itemCode = null;
+    this.filterOptionsLocal.parentCode = null;
+    this.filterOptionsLocal.query = this.searchTextLocalOutput;
+    if (this.dateFilter) {
+      this.filterOptionsLocal.startDate = this.startDate;
+      this.filterOptionsLocal.endDate = this.endDate;
+    }
+    this.onSearch.emit(this.filterOptionsLocal);
+  }
+
+  handleOpenSelectPeriodModal(event: MouseEvent) {
+    event.preventDefault();
+    this.onOpenModal.emit('selectPeriodModal');
+  }
+
+  handleCloseModal() {
+    this.onCloseModal.emit({});
+  }
+
+  handleSelect(event) {
+    event.preventDefault();
+    this.filterOptionsLocal.query = null;
+    this.filterOptionsLocal.itemType = null;
+    this.filterOptionsLocal.itemCode = null;
+    this.filterOptionsLocal.parentCode = null;
+    this.filterOptionsLocal.tags = event.item.name;
+    if (this.dateFilter) {
+      this.filterOptionsLocal.startDate = this.startDate;
+      this.filterOptionsLocal.endDate = this.endDate;
+    }
+    this.onSearch.emit(this.filterOptionsLocal);
+    this.searchTextLocal = { name: this.filterOptionsLocal.tags };
+  }
+
+  handleSelectPeriod(event: { startDate: Date, endDate: Date }) {
+    this.startDate = event.startDate;
+    this.endDate = event.endDate;   
+    this.handleCloseModal();
+    this.startEndCaption = this.timespanService.getCaption(event.startDate, event.endDate, 4);
+    this.onSearch.emit(this.filterOptionsLocal);
+  }
+
+  handleChangeEnableDateFilter(enabled) {
+    this.dateFilter = enabled;
+    if (enabled) {
+      this.filterOptionsLocal.startDate = this.startDate;
+      this.filterOptionsLocal.endDate = this.endDate;
+    } else {
+      this.filterOptionsLocal.startDate = null;
+      this.filterOptionsLocal.endDate = null;
+    }
+    if(this.filterOptionsLocal.query || this.filterOptionsLocal.tags)
+      this.onSearch.emit(this.filterOptionsLocal);
+  }
+
+  handleChangeEnableBBOXFilter(enabled) {
+    this.filterOptionsLocal.bboxFilter = enabled;
+    if (this.filterOptionsLocal.query || this.filterOptionsLocal.tags)
+      this.onSearch.emit(this.filterOptionsLocal);
+  }
+
+
+  handleToggleMenu(event) {
+    this.onToggleMenu.emit({});
+  }  
+
+  handleFocus(event) {
+    this.onSearchExpand.emit({});
+  }
+
+  handleChange(event: string) {
+    this.searchTextLocalOutput = event;
+    if (event && event.length == 1) {
+      this.onSearchExpand.emit({});
+    }
+    if (event && event.length > 0)
+      this.disabled = false;
+    else
+      this.disabled = true;
+  }
+
+  handleClearClick(event) {
+    this.onClear.emit({});
+  }
+}
+

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

@@ -1,58 +1,71 @@
-<aol-map #map (onMoveEnd)="handleOnMoveEnd($event)" (click)="handleOnMouseDown($event)" [ngClass]="{'panel-visible':(panelVisible|async)}" 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>
-      </div>
-
-      <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>
-    </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>
-
+<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,
+  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]="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)="handleFeaturesSelected($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="!(state.selectedItem)">
+          <fm-map-feature-list-container [features]="state.features" [queryState]="state.queryState"></fm-map-feature-list-container>
+        </div>
+  
+        <div *ngIf="state.selectedItem;let item">
+          <fm-map-selected-item-container [item]="item"></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>
+  </fm-side-panel>
+</ng-container>
+
+

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

@@ -1,171 +1,166 @@
-@import "../../_theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-aol-map { position:absolute;width:100%;height:100%;}
-
-.arrow {
-  top: 3rem;
-}
-
-.popover {
-  max-height:22rem;
-  min-width:15rem;
-}
-
-.popover-body {
-  max-height:19rem;
-  overflow:hidden;
-  overflow-y:auto;
-}
-
-.card-title {
-  font-size:1rem;
-}
-
-.menu-card {
-  margin-left:-7px;
-  padding-left:7px;
-  margin-right:-7px;
-  padding-right:7px;
-  margin-bottom:7px;
-}
-
-.icon-top {
-  font-size: 6rem;
-  text-align: center;
-  height: 9.75rem;
-}
-
-.icon-top i {
-  padding-top: 1.875rem;
-}
-
-.card-title {
-  white-space:nowrap;
-  overflow:hidden;
-  text-overflow:ellipsis;
-}
-
-
-.control-container {
-  position: absolute;
-  right: 1em;
-  bottom: 1em;
-}
-
-switch2d3d {
-  position: absolute;
-  right: 1em;
-  bottom: 1em;
-}
-
-.panel-wrapper {
-  display: flex;
-  flex-direction: column;
-  align-items: stretch;
-  width: 100%;
-  height: 100%;
-}
-
-.panel-top {
-  display: block;
-  height:0;
-}
-
-.panel-bottom {
-  overflow:auto;
-  flex:1;
-}
-
-.no-results {
-  font-weight:bold;
-}
-
-.no-results > span {
-  font-style:italic;
-}
-
-div.header {
-  display:flex;
-  padding-top:1em;
-  margin-bottom:1em;
-}
-
-div.header button {
-  margin-left:1em;
-}
-
-.logo {
-  overflow: hidden;
-  max-height: 2.5em;
-}
-
-timespan {
-  position: absolute;
-  transition: left 0.5s;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  background-color: rgba(255, 255, 255, 0.5);  
-}
-
-timespan.menuVisible {
-  left: 22rem;
-}
-
-:host ::ng-deep .timespan div.clearfix {
-  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 {
-    height: 8.1rem;
-  }
-}
-
-.map {
-  transition: margin-left 0.3s;
-}
-
-.shortcut-icon {
-  display: inline-block;
-  text-align: center;
-  margin: 0.5rem;
-  cursor:pointer;
-}
-
-.shortcut-icon > .icon {
-  width: 3rem;
-  height: 3rem;
-  background-color: #731e64;
-  display: inline-block;
-  text-align: center;
-  line-height: 3rem;
-  color: #ffffff;
-  font-size: 2rem;
-}
-
-.shortcut-icon > .caption {
-  text-align: center;
-  width: 4rem;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  color: theme-color();
-}
-
-.shortcut-icon > .farm-icon {
-  background-color: #731E64;
-}
-
-.shortcut-icon > .trijntje-icon {
-  background-color: #FAA33F;
-}
-
-/*.panel-visible {
-  margin-left:22rem;
-}*/
+@import "~bootstrap/scss/bootstrap.scss";
+
+aol-map { position:absolute;width:100%;height:100%;}
+
+.arrow {
+  top: 3rem;
+}
+
+.popover {
+  max-height:22rem;
+  min-width:15rem;
+}
+
+.popover-body {
+  max-height:19rem;
+  overflow:hidden;
+  overflow-y:auto;
+}
+
+.card-title {
+  font-size:1rem;
+}
+
+.menu-card {
+  margin-left:-7px;
+  padding-left:7px;
+  margin-right:-7px;
+  padding-right:7px;
+  margin-bottom:7px;
+}
+
+.icon-top {
+  font-size: 6rem;
+  text-align: center;
+  height: 9.75rem;
+}
+
+.icon-top i {
+  padding-top: 1.875rem;
+}
+
+.card-title {
+  white-space:nowrap;
+  overflow:hidden;
+  text-overflow:ellipsis;
+}
+
+
+.control-container {
+  position: absolute;
+  right: 1em;
+  bottom: 1em;
+}
+
+switch2d3d {
+  position: absolute;
+  right: 1em;
+  bottom: 1em;
+}
+
+.panel-wrapper {
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  width: 100%;
+  height: 100%;
+}
+
+.panel-top {
+  display: block;
+  height:0;
+}
+
+.panel-bottom {
+  overflow:auto;
+  flex:1;
+}
+
+.no-results {
+  font-weight:bold;
+}
+
+.no-results > span {
+  font-style:italic;
+}
+
+div.header {
+  display:flex;
+  padding-top:1em;
+  margin-bottom:1em;
+}
+
+div.header button {
+  margin-left:1em;
+}
+
+.logo {
+  overflow: hidden;
+  max-height: 2.5em;
+}
+
+timespan {
+  position: absolute;
+  transition: left 0.5s;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background-color: rgba(255, 255, 255, 0.5);  
+}
+
+timespan.menuVisible {
+  left: 22rem;
+}
+
+:host ::ng-deep .timespan div.clearfix {
+  transition: height 0.5s;
+}
+
+
+@media screen and (min-width:44rem) {
+  .panel-top {
+    height: 8.1rem;
+  }
+}
+
+.map {
+  transition: margin-left 0.3s;
+}
+
+.shortcut-icon {
+  display: inline-block;
+  text-align: center;
+  margin: 0.5rem;
+  cursor:pointer;
+}
+
+.shortcut-icon > .icon {
+  width: 3rem;
+  height: 3rem;
+  background-color: #731e64;
+  display: inline-block;
+  text-align: center;
+  line-height: 3rem;
+  color: #ffffff;
+  font-size: 2rem;
+}
+
+.shortcut-icon > .caption {
+  text-align: center;
+  width: 4rem;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  color: theme-color();
+}
+
+.shortcut-icon > .farm-icon {
+  background-color: #731E64;
+}
+
+.shortcut-icon > .trijntje-icon {
+  background-color: #FAA33F;
+}
+
+/*.panel-visible {
+  margin-left:22rem;
+}*/

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

@@ -1,303 +1,338 @@
-import { Component, OnInit, OnDestroy, HostListener, Inject, ViewChild, AfterViewInit } 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 { 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 { 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 { GeolocationService} from '../../services/geolocation.service';
-
-// AppCommon
-import { ResumableFileUploadService, ItemTypeService } from '@farmmaps/common';
-import { IItemType, IItem } from '@farmmaps/common';
-import {commonReducers} from '@farmmaps/common';
-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';
-
-
-@Component({
-  selector: 'fm-map-map',
-  templateUrl: './map.component.html',
-  styleUrls: ['./map.component.scss']
-})
-
-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>();
-  private paramSub: Subscription;
-  private itemTypeSub: Subscription;
-  private mapStateSub: 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>;
-  public baseLayersCollapsed:boolean = true;
-  public overlayLayersCollapsed: boolean = true;
-  public extent: Observable<Extent>;
-  @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 ) {
-  }
-
-  @HostListener('document:keyup', ['$event'])
-  escapeClose(event: KeyboardEvent) {
-    let x = event.keyCode;
-    if (x === 27) {
-      this.handleCloseModal()
-    }
-  }
-
-  handleOpenModal(modalName: string) {
-    this.store.dispatch(new  commonActions.OpenModal(modalName));
-  }
-
-  handleCloseModal() {
-    this.store.dispatch(new commonActions.CloseModal());
-  }
-
-  handleFileDropped(droppedFile: IDroppedFile) {
-    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));
-    }
-  }
-
-  handleSearch(queryState: IQueryState) {
-    this.store.dispatch(new mapActions.DoQuery(queryState));
-  }
-
-  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);
-    });
-  }
-
-  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);
-      }
-      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;
-      }
-
-      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));
-      }
-      this.stateSetCount += 1;
-    });
-    setTimeout(() => {
-      this.map.instance.updateSize();
-    }, 500);
-  }
-
-  handleSearchCollapse(event) {
-    this.store.dispatch(new mapActions.CollapseSearch());
-  }
-
-  handleSearchExpand(event) {
-    this.store.dispatch(new mapActions.ExpandSearch());
-  }
-
-  handleToggleMenu(event) {
-    this.store.dispatch(new mapActions.ToggleMenu());
-  }
-
-  handleToggleBaseLayers(event:MouseEvent) {
-    this.baseLayersCollapsed = !this.baseLayersCollapsed;
-    event.preventDefault();
-  }
-
-  handleToggleOverlayLayers(event: MouseEvent) {
-    this.overlayLayersCollapsed = !this.overlayLayersCollapsed;
-    event.preventDefault();
-  }
-
-  handlePredefinedQuery(event: MouseEvent, query: any) {
-    event.preventDefault();
-    var queryState = tassign(mapReducers.initialQueryState, query);
-    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));
-      parts.push( mapState.zoom.toFixed(0));
-      parts.push( mapState.rotation.toFixed(2));
-      if(mapState.baseLayerCode!="") {
-        parts.push(mapState.baseLayerCode);
-        parts.push( this.serializeService.serialize(queryState));
-        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));
-      }
-    });
-  }
-
-  handleOnMouseDown(event: MouseEvent) {
-    this.store.dispatch(new mapActions.CollapseSearch());
-  }
-
-  handleOnDownload(event) {
-
-  }
-
-  handleClearSearch(event) {
-    this.store.dispatch(new commonActions.Escape(true, false));
-  }  
-
-  handleOnDelete(itemLayer: IItemLayer) {
-    this.store.dispatch(new mapActions.RemoveLayer(itemLayer));
-  }
-
-  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));
-  }
-
-  handleZoomToExtent(itemLayer: IItemLayer) {
-    var extent =  createEmpty();
-    extend(extent, itemLayer.layer.getExtent());
-    if (extent) {
-      this.store.dispatch(new mapActions.SetExtent(extent));
-    }    
-  }
-
-  handleSelectBaseLayer(itemLayer: IItemLayer) {
-    this.store.dispatch(new mapActions.SelectBaseLayer(itemLayer));
-  }
-
-  handleSelectOverlayLayer(itemLayer: IItemLayer) {
-    this.store.dispatch(new mapActions.SelectOverlayLayer(itemLayer));
-  }
-
-  ngOnDestroy() {
-    this.paramSub.unsubscribe();
-    if (this.itemTypeSub) this.itemTypeSub.unsubscribe();
-    if (this.mapStateSub) this.mapStateSub.unsubscribe();
-    if (this.queryStateSub) this.queryStateSub.unsubscribe();  }
-}
+import { Component, OnInit, OnDestroy, HostListener, Inject, ViewChild, AfterViewInit,ChangeDetectorRef,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 { 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} 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 '@farmmaps/common';
+import { GeolocationService} from '../../services/geolocation.service';
+import {DeviceOrientationService} from '../../services/device-orientation.service';
+
+// AppCommon
+import { ResumableFileUploadService, ItemTypeService } from '@farmmaps/common';
+import { IItemType, IItem } from '@farmmaps/common';
+import {commonReducers} from '@farmmaps/common';
+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({
+  selector: 'fm-map-map',
+  templateUrl: './map.component.html',
+  styleUrls: ['./map.component.scss']
+})
+
+export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
+  title: string = 'Map';
+  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 queryStateSub: 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 selectedItem$: Observable<IItem> = this.store.select(mapReducers.selectGetSelectedItem);
+  public queryState$: Observable<IQueryState> = this.store.select(mapReducers.selectGetQueryState);
+  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> = this.store.select(mapReducers.selectGetExtent);
+  public styles$:Observable<IStyles> = this.store.select(mapReducers.selectGetStyles);
+  private setStateCount$:Observable<number> =  this.store.select(mapReducers.selectgetSetStateCount);
+
+  @ViewChild('map', { static: false }) 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,
+    private zone: NgZone,
+    private deviceorientationService:DeviceOrientationService) {
+  }
+
+  @HostListener('document:keyup', ['$event'])
+  escapeClose(event: KeyboardEvent) {
+    let x = event.keyCode;
+    if (x === 27) {
+      this.handleCloseModal()
+    }
+  }
+
+  handleOpenModal(modalName: string) {
+    this.store.dispatch(new  commonActions.OpenModal(modalName));
+  }
+
+  handleCloseModal() {
+    this.store.dispatch(new commonActions.CloseModal());
+  }
+
+  handleFileDropped(droppedFile: IDroppedFile) {
+    this.uploadService.addFiles(droppedFile.files, droppedFile.event, { parentCode:droppedFile.parentCode, geometry:droppedFile.geometry });
+  }
+
+  handleFeaturesSelected(feature: Feature) {
+    if (feature) {
+      let newQuery = tassign(mapReducers.initialQueryState, { parentCode: feature.get('parentCode'), itemCode: feature.get('code'),itemType:feature.get('itemType') });
+      this.store.dispatch(new mapActions.DoQuery(newQuery));
+    }
+  }
+
+  handleSearch(queryState: IQueryState) {
+    this.store.dispatch(new mapActions.DoQuery(queryState));
+  }
+
+  ngOnInit() {
+    this.store.dispatch(new mapActions.Init());   
+    this.selectedFeatures$.next({x:0,y:0,features:[]});
+    this.selectedFeatures$.next(null);
+    this.query$.pipe(withLatestFrom(this.mapState$),withLatestFrom(this.setStateCount$)).subscribe((state) => {
+      let queryState = state[0][0];
+      let mapState = state[0][1];      
+      let urlparts=[];
+
+      // TODO: fix this properly move the action to a separte column in itemtypes
+      if(queryState.itemType && queryState.itemCode) {
+        let itemType = this.itemTypeService.itemTypes[queryState.itemType];
+        if (itemType.viewer == "edit_in_editor" && itemType.editor) {
+          urlparts.push('/editor');
+          urlparts.push(itemType.editor);
+          urlparts.push('item');
+          urlparts.push(queryState.itemCode);               
+        }       
+      }   
+      if(state[1]>0) {
+        if(urlparts.length>0) {
+           this.router.navigate(urlparts);   
+        } else {
+           this.replaceUrl(mapState, queryState,false); 
+        } 
+      }             
+    });      
+  }
+
+  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()
+    })));
+  }
+
+  ngAfterViewInit() {    
+    this.initCustomStyles();   
+    this.paramSub = this.route.paramMap.pipe(withLatestFrom(this.setStateCount$),withLatestFrom(this.queryState$),withLatestFrom(this.mapState$)).subscribe( (state) => {
+      let params: ParamMap = state[0][0][0];  
+      let setStateCount:number = state[0][0][1];
+      let lastQueryState:IQueryState = state[0][1];
+      let lastMapState:IMapState = state[1];
+      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 = (JSON.stringify(lastMapState) != JSON.stringify(newMapState)) && setStateCount == 0 ;
+        window.localStorage.setItem("FarmMapsCommonMap_mapState",JSON.stringify(newMapState));
+      }
+      if (params.has("queryState")) {
+        let queryState = params.get("queryState");
+        newQueryState = tassign(mapReducers.initialQueryState);
+        if (queryState != "") {
+          newQueryState = this.serializeService.deserialize(queryState);
+          queryState = this.serializeService.serialize(newQueryState);
+        }
+        queryStateChanged = this.serializeService.serialize(lastQueryState) !=  queryState;
+      }     
+      let t =0;
+      if(setStateCount==0) t=600;
+      setTimeout(() => {
+        this.zone.run(()=> {
+          if ( queryStateChanged && mapStateChanged) {
+            console.debug("Both states");
+            this.store.dispatch(new mapActions.SetState(newMapState,newQueryState));
+          } else if(queryStateChanged) {
+            console.debug("Query state");
+            this.store.dispatch(new mapActions.SetQueryState(newQueryState));
+          } else if (mapStateChanged) {
+            console.debug("Map state");
+            this.store.dispatch(new mapActions.SetMapState(newMapState));
+          }
+        })
+      },t);                
+    });
+    setTimeout(() => {
+      this.map.instance.updateSize();
+    }, 500);
+    console.debug("Afterviewinit");   
+  }
+
+  handleSearchCollapse(event) {
+    this.store.dispatch(new mapActions.CollapseSearch());
+  }
+
+  handleSearchExpand(event) {
+    this.store.dispatch(new mapActions.ExpandSearch());
+  }
+
+  handleToggleMenu(event) {
+    this.store.dispatch(new commonActions.ToggleMenu());
+  }
+
+  handleToggleBaseLayers(event:MouseEvent) {
+    this.baseLayersCollapsed = !this.baseLayersCollapsed;
+    event.preventDefault();
+  }
+
+  handleToggleOverlayLayers(event: MouseEvent) {
+    this.overlayLayersCollapsed = !this.overlayLayersCollapsed;
+    event.preventDefault();
+  }
+
+  handlePredefinedQuery(event: MouseEvent, query: any) {
+    event.preventDefault();
+    var queryState = tassign(mapReducers.initialQueryState, query);
+    this.store.dispatch(new mapActions.DoQuery(queryState));
+  } 
+
+  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));
+      parts.push( mapState.zoom.toFixed(0));
+      parts.push( mapState.rotation.toFixed(2));
+      if(mapState.baseLayerCode!="") {
+        parts.push(mapState.baseLayerCode);
+        parts.push( this.serializeService.serialize(queryState));
+        this.router.navigate(parts, { replaceUrl: replace,relativeTo:this.route.parent });
+      }      
+  }
+
+  handleOnMoveEnd(event) {
+    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.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));
+        }
+      });
+    });   
+  }
+
+  handleOnMouseDown(event: MouseEvent) {
+    this.zone.run(() =>{
+      this.store.dispatch(new mapActions.CollapseSearch());
+    });
+  }
+
+  handleOnDownload(event) {
+
+  }
+
+  handleClearSearch(event) {
+    this.store.dispatch(new commonActions.Escape(true, false));
+  }  
+
+  handleOnDelete(itemLayer: IItemLayer) {
+    this.store.dispatch(new mapActions.RemoveLayer(itemLayer));
+  }
+
+  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));
+  }
+
+  handleZoomToExtent(itemLayer: IItemLayer) {
+    var extent =  createEmpty();
+    extend(extent, itemLayer.layer.getExtent());
+    if (extent) {
+      this.store.dispatch(new mapActions.SetExtent(extent));
+    }    
+  }
+
+  handleSelectBaseLayer(itemLayer: IItemLayer) {
+    this.store.dispatch(new mapActions.SelectBaseLayer(itemLayer));
+  }
+
+  handleSelectOverlayLayer(itemLayer: IItemLayer) {
+    this.store.dispatch(new mapActions.SelectOverlayLayer(itemLayer));
+  }
+
+  ngOnDestroy() {
+    this.paramSub.unsubscribe();
+    if (this.itemTypeSub) this.itemTypeSub.unsubscribe();
+    if (this.mapStateSub) this.mapStateSub.unsubscribe();
+    if (this.queryStateSub) this.queryStateSub.unsubscribe();  }
+}

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

@@ -1,61 +1,61 @@
-import { Component, Output, ViewChild, EventEmitter, Input, ElementRef, HostListener } from '@angular/core';
-import { FormGroup,FormBuilder, Validators } from '@angular/forms';
-import { IListItem } from '@farmmaps/common';
-import { IDroppedFile } from '../aol/file-drop-target/file-drop-target.component';
-import {NgbModal, NgbModalRef} from "@ng-bootstrap/ng-bootstrap";
-
-export interface IMetaData {
-  droppedFile: IDroppedFile,
-  attributes: any
-}
-
-@Component({
-  selector: 'fm-map-meta-data-modal',
-  templateUrl: 'meta-data-modal.component.html'
-})
-export class MetaDataModalComponent {
-
-  private modalName: string = 'metaDataModal';
-  private modalRef: NgbModalRef;
-
-  @ViewChild('content') _templateModal:ElementRef;
-  @Input() droppedFile: IDroppedFile;
-  @Input() set modalState(_modalState:any) {;
-    if(_modalState == this.modalName) {
-      this.openModal()
-    } else if(this.modalRef) {
-      this.closeModal();
-    }
-  }
-
-  @Input() event: IListItem;
-
-  @Output() onCloseModal = new EventEmitter<any>();
-  @Output() onAddFilesWithMetaData = new EventEmitter<IMetaData>();
-
-  constructor(private modalService: NgbModal, public fb: FormBuilder) { }
-
-  public metaDataForm: FormGroup;
-
-  handleMetaDataEntered(event) {
-    if (this.metaDataForm.valid) {
-      this.onAddFilesWithMetaData.emit({ droppedFile: this.droppedFile, attributes: { name: this.metaDataForm.value.name } });
-    }
-  }
-
-  openModal() {
-      //Timeout trick to avoid ExpressionChangedAfterItHasBeenCheckedError 
-      setTimeout(() => this.modalRef = this.modalService.open(this._templateModal, { backdrop: 'static', keyboard: false }));     
-  }  
-
-  closeModal()  {
-      this.modalRef.close();
-      this.metaDataForm.patchValue({ name: "" });
-  }
-
-   ngOnInit(): void {
-      this.metaDataForm = this.fb.group({
-      name: ["", Validators.compose([Validators.required, Validators.pattern("[a-zA-Z0-9_].*")])]
-      });
-  }
-}
+import { Component, Output, ViewChild, EventEmitter, Input, ElementRef, HostListener } from '@angular/core';
+import { FormGroup,FormBuilder, Validators } from '@angular/forms';
+import { IListItem } from '@farmmaps/common';
+import { IDroppedFile } from '../aol/file-drop-target/file-drop-target.component';
+import {NgbModal, NgbModalRef} from "@ng-bootstrap/ng-bootstrap";
+
+export interface IMetaData {
+  droppedFile: IDroppedFile,
+  attributes: any
+}
+
+@Component({
+  selector: 'fm-map-meta-data-modal',
+  templateUrl: 'meta-data-modal.component.html'
+})
+export class MetaDataModalComponent {
+
+  private modalName: string = 'metaDataModal';
+  private modalRef: NgbModalRef;
+
+  @ViewChild('content', { static: true }) _templateModal:ElementRef;
+  @Input() droppedFile: IDroppedFile;
+  @Input() set modalState(_modalState:any) {;
+    if(_modalState == this.modalName) {
+      this.openModal()
+    } else if(this.modalRef) {
+      this.closeModal();
+    }
+  }
+
+  @Input() event: IListItem;
+
+  @Output() onCloseModal = new EventEmitter<any>();
+  @Output() onAddFilesWithMetaData = new EventEmitter<IMetaData>();
+
+  constructor(private modalService: NgbModal, public fb: FormBuilder) { }
+
+  public metaDataForm: FormGroup;
+
+  handleMetaDataEntered(event) {
+    if (this.metaDataForm.valid) {
+      this.onAddFilesWithMetaData.emit({ droppedFile: this.droppedFile, attributes: { name: this.metaDataForm.value.name } });
+    }
+  }
+
+  openModal() {
+      //Timeout trick to avoid ExpressionChangedAfterItHasBeenCheckedError 
+      setTimeout(() => this.modalRef = this.modalService.open(this._templateModal, { backdrop: 'static', keyboard: false }));     
+  }  
+
+  closeModal()  {
+      this.modalRef.close();
+      this.metaDataForm.patchValue({ name: "" });
+  }
+
+   ngOnInit(): void {
+      this.metaDataForm = this.fb.group({
+      name: ["", Validators.compose([Validators.required, Validators.pattern("[a-zA-Z0-9_].*")])]
+      });
+  }
+}

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

@@ -1,93 +1,93 @@
-import { Component, Output, ViewChild, EventEmitter, Input, ElementRef, HostListener } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
-import { NgbModal, NgbModalRef, NgbDateStruct, NgbCalendar, NgbDateAdapter } from "@ng-bootstrap/ng-bootstrap";
-import { NgbDateNativeAdapter } from '@farmmaps/common';
-
-
-const equals = (one: NgbDateStruct, two: NgbDateStruct) =>
-  one && two && two.year === one.year && two.month === one.month && two.day === one.day;
-
-const before = (one: NgbDateStruct, two: NgbDateStruct) =>
-  !one || !two ? false : one.year === two.year ? one.month === two.month ? one.day === two.day
-    ? false : one.day < two.day : one.month < two.month : one.year < two.year;
-
-const after = (one: NgbDateStruct, two: NgbDateStruct) =>
-  !one || !two ? false : one.year === two.year ? one.month === two.month ? one.day === two.day
-    ? false : one.day > two.day : one.month > two.month : one.year > two.year;
-
-@Component({
-  selector: 'fm-map-select-period-modal',
-  templateUrl: 'select-period-modal.component.html',
-  styleUrls: ['select-period-modal.component.scss']  
-})
-export class SelectPeriodModalComponent {
-
-  private modalName: string = 'selectPeriodModal';
-  private modalRef: NgbModalRef;
-  private dateAdapter = new NgbDateNativeAdapter();
-  hoveredDate: NgbDateStruct;
-  fromDate: NgbDateStruct;
-  toDate: NgbDateStruct;
-
-  @ViewChild('content') _templateModal:ElementRef;
-
-  @Input() set modalState(_modalState:any) {;
-    if(_modalState == this.modalName) {
-      this.openModal()
-    } else if(this.modalRef) {
-      this.closeModal();
-    }
-  }
-
-  @Input() set startDate(_modalState: Date) {
-    this.fromDate = this.dateAdapter.fromModel(_modalState);
-  }
-
-  @Input() set endDate(_modalState: Date) {
-    var d = new Date(_modalState);
-    d.setDate(d.getDate() - 1);
-    this.toDate = this.dateAdapter.fromModel(d);
-  }
-
-  @Output() onCloseModal = new EventEmitter<any>();
-  @Output() onSelect = new EventEmitter<{ startDate: Date, endDate: Date }>();
-  
-  constructor(private modalService: NgbModal, private calendar: NgbCalendar) { }
-
-  openModal() {
-      //Timeout trick to avoid ExpressionChangedAfterItHasBeenCheckedError 
-      setTimeout(() => this.modalRef = this.modalService.open(this._templateModal, { backdrop: 'static', keyboard: false}));     
-  }  
-
-  closeModal()  {
-      this.modalRef.close();    
-  }
-
-   ngOnInit(): void {     
-   }
-
-   onDateChange(date: NgbDateStruct) {
-     if (!this.fromDate && !this.toDate) {
-       this.fromDate = date;
-     } else if (this.fromDate && !this.toDate && after(date, this.fromDate)) {
-       this.toDate = date;
-     } else {
-       this.toDate = null;
-       this.fromDate = date;
-     }
-   }
-
-   handleSelect(event:MouseEvent) {
-     event.preventDefault();
-     if (this.fromDate && this.toDate && before(this.fromDate, this.toDate)) {
-       var endDate = new Date(this.dateAdapter.toModel(this.toDate));
-       endDate.setDate(endDate.getDate() + 1);
-       this.onSelect.emit({startDate:this.dateAdapter.toModel(this.fromDate),endDate:endDate})
-     }
-   }
-
-   isHovered = date => this.fromDate && !this.toDate && this.hoveredDate && after(date, this.fromDate) && before(date, this.hoveredDate);
-   isInside = date => after(date, this.fromDate) && before(date, this.toDate);
-   isFrom = date => equals(date, this.fromDate);
-   isTo = date => equals(date, this.toDate);
-}
+import { Component, Output, ViewChild, EventEmitter, Input, ElementRef, HostListener } from '@angular/core';
+import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { NgbModal, NgbModalRef, NgbDateStruct, NgbCalendar, NgbDateAdapter } from "@ng-bootstrap/ng-bootstrap";
+import { NgbDateNativeAdapter } from '@farmmaps/common';
+
+
+const equals = (one: NgbDateStruct, two: NgbDateStruct) =>
+  one && two && two.year === one.year && two.month === one.month && two.day === one.day;
+
+const before = (one: NgbDateStruct, two: NgbDateStruct) =>
+  !one || !two ? false : one.year === two.year ? one.month === two.month ? one.day === two.day
+    ? false : one.day < two.day : one.month < two.month : one.year < two.year;
+
+const after = (one: NgbDateStruct, two: NgbDateStruct) =>
+  !one || !two ? false : one.year === two.year ? one.month === two.month ? one.day === two.day
+    ? false : one.day > two.day : one.month > two.month : one.year > two.year;
+
+@Component({
+  selector: 'fm-map-select-period-modal',
+  templateUrl: 'select-period-modal.component.html',
+  styleUrls: ['select-period-modal.component.scss']  
+})
+export class SelectPeriodModalComponent {
+
+  private modalName: string = 'selectPeriodModal';
+  private modalRef: NgbModalRef;
+  private dateAdapter = new NgbDateNativeAdapter();
+  hoveredDate: NgbDateStruct;
+  fromDate: NgbDateStruct;
+  toDate: NgbDateStruct;
+
+  @ViewChild('content', { static: true }) _templateModal:ElementRef;
+
+  @Input() set modalState(_modalState:any) {;
+    if(_modalState == this.modalName) {
+      this.openModal()
+    } else if(this.modalRef) {
+      this.closeModal();
+    }
+  }
+
+  @Input() set startDate(_modalState: Date) {
+    this.fromDate = this.dateAdapter.fromModel(_modalState);
+  }
+
+  @Input() set endDate(_modalState: Date) {
+    var d = new Date(_modalState);
+    d.setDate(d.getDate() - 1);
+    this.toDate = this.dateAdapter.fromModel(d);
+  }
+
+  @Output() onCloseModal = new EventEmitter<any>();
+  @Output() onSelect = new EventEmitter<{ startDate: Date, endDate: Date }>();
+  
+  constructor(private modalService: NgbModal, private calendar: NgbCalendar) { }
+
+  openModal() {
+      //Timeout trick to avoid ExpressionChangedAfterItHasBeenCheckedError 
+      setTimeout(() => this.modalRef = this.modalService.open(this._templateModal, { backdrop: 'static', keyboard: false}));     
+  }  
+
+  closeModal()  {
+      this.modalRef.close();    
+  }
+
+   ngOnInit(): void {     
+   }
+
+   onDateChange(date: NgbDateStruct) {
+     if (!this.fromDate && !this.toDate) {
+       this.fromDate = date;
+     } else if (this.fromDate && !this.toDate && after(date, this.fromDate)) {
+       this.toDate = date;
+     } else {
+       this.toDate = null;
+       this.fromDate = date;
+     }
+   }
+
+   handleSelect(event:MouseEvent) {
+     event.preventDefault();
+     if (this.fromDate && this.toDate && before(this.fromDate, this.toDate)) {
+       var endDate = new Date(this.dateAdapter.toModel(this.toDate));
+       endDate.setDate(endDate.getDate() + 1);
+       this.onSelect.emit({startDate:this.dateAdapter.toModel(this.fromDate),endDate:endDate})
+     }
+   }
+
+   isHovered = date => this.fromDate && !this.toDate && this.hoveredDate && after(date, this.fromDate) && before(date, this.hoveredDate);
+   isInside = date => after(date, this.fromDate) && before(date, this.toDate);
+   isFrom = date => equals(date, this.fromDate);
+   isTo = date => equals(date, this.toDate);
+}

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

@@ -1,14 +1,13 @@
-@import "../../_theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
-.row {
-  border-bottom: 1px solid gray('500');
-  user-select: none;
-}
-
-.row:hover {
-  background-color: gray('100');
-}
-
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
+.row {
+  border-bottom: 1px solid gray('500');
+  user-select: none;
+}
+
+.row:hover {
+  background-color: gray('100');
+}
+

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

@@ -1,40 +1,51 @@
-import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject, Type} from '@angular/core';
-import { IItem } from '@farmmaps/common';
-import { AbstractSelectedItemComponent, SelectedItemComponent  } from '../selected-item/selected-item.component';
-import { WidgetHostDirective } from '../widget-host/widget-host.directive';
-
-
-@Component({
-  selector: 'fm-map-selected-item-container',
-  templateUrl: './selected-item-container.component.html',
-  styleUrls: ['./selected-item-container.component.scss'] 
-})
-export class SelectedItemContainerComponent {
-
-  constructor(private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractSelectedItemComponent) public selectedItemComponents: AbstractSelectedItemComponent[] ) {
-  }
-
-  @Input() item: IItem;
-
-  @ViewChild(WidgetHostDirective) 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);
-      }
-    }    
-    const viewContainerRef = this.widgetHost.viewContainerRef;
-    viewContainerRef.clear();
-
-    const componentRef = viewContainerRef.createComponent(componentFactory);
-    (<AbstractSelectedItemComponent>componentRef.instance).item = this.item;
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    if (changes["item"] && changes["item"].currentValue) {
-        this.loadComponent();
-    }
-  }
-}
+import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject, Type} from '@angular/core';
+import { IItem } from '@farmmaps/common';
+import { AbstractSelectedItemComponent, SelectedItemComponent  } from '../selected-item/selected-item.component';
+import { WidgetHostDirective } from '../widget-host/widget-host.directive';
+
+
+@Component({
+  selector: 'fm-map-selected-item-container',
+  templateUrl: './selected-item-container.component.html',
+  styleUrls: ['./selected-item-container.component.scss'] 
+})
+export class SelectedItemContainerComponent {
+
+  constructor(private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractSelectedItemComponent) public selectedItemComponents: AbstractSelectedItemComponent[] ) {
+  }
+
+  @Input() item: IItem;
+
+  @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; 
+
+  loadComponent() {
+    let componentFactory: ComponentFactory<AbstractSelectedItemComponent> = this.componentFactoryResolver.resolveComponentFactory(SelectedItemComponent); // default
+    let firstComponentWithTypeAndTask = this.selectedItemComponents
+      .find(value => value['forSourceTask'] == this.item.sourceTask &&
+        value['forItemType'] == this.item.itemType
+      );
+
+    if (firstComponentWithTypeAndTask) {
+      componentFactory = this.componentFactoryResolver.resolveComponentFactory(firstComponentWithTypeAndTask['constructor'] as any);
+    } else {
+      let firstComponentWithType = this.selectedItemComponents
+        .find(value => value['forSourceTask'] == null &&
+          value['forItemType'] == this.item.itemType);
+
+      if (firstComponentWithType) {
+        componentFactory = this.componentFactoryResolver.resolveComponentFactory(firstComponentWithType['constructor'] as any);
+      }
+    }
+    const viewContainerRef = this.widgetHost.viewContainerRef;
+    viewContainerRef.clear();
+
+    const componentRef = viewContainerRef.createComponent(componentFactory);
+    (<AbstractSelectedItemComponent>componentRef.instance).item = this.item;
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    if (changes["item"] && changes["item"].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>{{item.data.cropTypeName}}</div>
+        <div><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)" i18n><i class="fa fa-pencil" aria-hidden="true" title="Edit"></i> Edit</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-geotiff/selected-item-geotiff.component.html

@@ -1,22 +1,28 @@
-<div class="spacer"></div>
-<div *ngIf="item;let item">
-  <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>
-      <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 class="spacer"></div>
+<div *ngIf="item;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">
+        <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;let layerIndex = index" [value]="layerIndex">{{l.name}}</option>
+            </select>
+          </div>
+          <fm-map-layer-legend [layer]="layers[selectedLayer]" [histogramenabled]="true"></fm-map-layer-legend>
+        </div>
+      </div>
+      <div class="card menu-card">
+        <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 *ngIf="item.isEditable"><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,33 +1,41 @@
-@import "../../_theme.scss";
-@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;
-  }
-}
+@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-geotiff/selected-item-geotiff.component.ts

@@ -1,30 +1,30 @@
-import { Component, Input, Injectable, OnInit } 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 { ForItemType } from '../for-item/for-itemtype.decorator';
-import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
-import { Observable } from 'rxjs';
-
-
-@ForItemType("vnd.farmmaps.itemtype.geotiff.processed")
-@Injectable()
-@Component({
-  selector: 'fm-map-selected-item-geotiff',
-  templateUrl: './selected-item-geotiff.component.html',
-  styleUrls: ['./selected-item-geotiff.component.scss']
-})
-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;
-  }
-}
+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 } 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 * as mapActions from '../../actions/map.actions';
+
+
+@ForItemType("vnd.farmmaps.itemtype.geotiff.processed")
+@Injectable()
+@Component({
+  selector: 'fm-map-selected-item-geotiff',
+  templateUrl: './selected-item-geotiff.component.html',
+  styleUrls: ['./selected-item-geotiff.component.scss']
+})
+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));
+  }
+}

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

@@ -3,20 +3,26 @@
   <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">
+        <h1>{{item.name}}</h1>
       </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 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">{{l.name}}</option>
+            </select>
+          </div>
+          <fm-map-layer-legend [showTitle]="layers.length==1" [layer]="layers[selectedLayer]" [histogramenabled]="true"></fm-map-layer-legend>
+        </div>
+      </div>
+      <div class="card menu-card">
+        <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 *ngIf="item.isEditable"><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>
+</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/selected-item.component.html

@@ -1,16 +1,18 @@
-<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()" />
-    <div *ngIf="!item.thumbnail" class="big-icon" [style.background-color]="itemTypeService.getColor(item.itemType)">
-      <i [ngClass]="itemTypeService.getIcon(item.itemType)"></i>
-    </div>
-    <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>
-  </div>
- </div>
+<div *ngIf="item;let item">
+  <div class="card border-0">
+    <img *ngIf="item.thumbnail" class="card-img-top" [src]="config.getConfig('apiEndPoint') +'/api/v1/items/'+item.code+'/thumbnail?v='+item.updated.getTime()" />
+    <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]="config.getConfig('apiEndPoint')+ '/api/v1/items/'+ item.code+ '/download'" class="btn btn-outline-secondary" i18n><i class="fa fa-download" aria-hidden="true" title="Download"></i> Download</a>
+      <a *ngIf="item.isEditable" 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>
+  </div>
+</div>

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

@@ -1,14 +1,13 @@
-@import "../../theme.scss";
-@import "~bootstrap/scss/bootstrap.scss";
-
-.big-icon {
-  width: 100%;
-  color: white;
-  font-size: 9rem;
-  padding: 3rem;
-  text-align: center;
-}
-
-.card-title {
-  font-size: 1rem;
-}
+@import "~bootstrap/scss/bootstrap.scss";
+
+.big-icon {
+  width: 100%;
+  color: white;
+  font-size: 9rem;
+  padding: 3rem;
+  text-align: center;
+}
+
+.card-title {
+  font-size: 1rem;
+}

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

@@ -1,56 +1,57 @@
-import { Component, Input, 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 } from '@farmmaps/common';
-import * as mapActions from '../../actions/map.actions';
-import { Router, ActivatedRoute, ParamMap, Event } from '@angular/router';
-
-
-@Injectable()
-export abstract class AbstractSelectedItemComponent {
-  @Input() item: IItem
-  constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, private location: Location, private 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]);
-      }
-    }
-    return false;
-  }
-
-  handleOnEdit(item: IItem) {
-    let url = `/editor/property/item/${item.code}`;
-    this.router.navigate([url]);
-    return false;
-  }
-
-  handleAddAsLayer(item: IItem,layerIndex:number = -1) {
-    this.store.dispatch(new mapActions.AddLayer(item,layerIndex));
-    return false;
-  }
-
-  handleBackToList(event: MouseEvent) {
-    event.preventDefault();
-    this.location.back();
-  }
-}
-
-@Injectable()
-@Component({
-  selector: 'fm-map-selected-item',
-  templateUrl: './selected-item.component.html',
-  styleUrls: ['./selected-item.component.scss']
-})
-export class SelectedItemComponent extends AbstractSelectedItemComponent {
-
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router) {
-    super(store, itemTypeService,location,router);
-  }
-}
+import {Component, Injectable, Input} from '@angular/core';
+import {Location} from '@angular/common';
+import {Store} from '@ngrx/store';
+import * as mapReducers from '../../reducers/map.reducer';
+import {AppConfig, commonReducers, IItem, ItemTypeService} from '@farmmaps/common';
+import * as mapActions from '../../actions/map.actions';
+import {Router} from '@angular/router';
+
+
+@Injectable()
+export abstract class AbstractSelectedItemComponent {
+  @Input() item: IItem
+  constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, private location: Location, private router: Router) {
+  }
+
+  handleOnView(item: IItem) {
+    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) {
+    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;
+  }
+
+  handleAddAsLayer(item: IItem,layerIndex:number = -1) {
+    this.store.dispatch(new mapActions.AddLayer(item,layerIndex));
+    return false;
+  }
+
+  handleBackToList(event: MouseEvent) {
+    event.preventDefault();
+    this.location.back();
+  }
+}
+
+@Injectable()
+@Component({
+  selector: 'fm-map-selected-item',
+  templateUrl: './selected-item.component.html',
+  styleUrls: ['./selected-item.component.scss']
+})
+export class SelectedItemComponent extends AbstractSelectedItemComponent {
+
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, public config:AppConfig) {
+    super(store, itemTypeService,location,router);
+  }
+}

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

@@ -1,230 +1,261 @@
-import { Injectable, Inject } from '@angular/core';
-import { Router } from '@angular/router';
-
-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 {GeoJSON} from 'ol/format';
-import {Feature} from 'ol';
-import { getCenter, Extent, createEmpty, extend} from 'ol/extent';
-import {Point} from 'ol/geom'
-
-
-import * as mapActions from '../actions/map.actions';
-import * as mapReducers from '../reducers/map.reducer';
-import {commonReducers} from '@farmmaps/common';
-
-import {commonActions} from '@farmmaps/common';
-
-import { IListItem, IItem } from '@farmmaps/common';
-import { FolderService, ItemService } from '@farmmaps/common';
-import { tassign } from 'tassign';
-
-@Injectable()
-export class MapEffects {
-  private _format: GeoJSON;
-
-  private toPointFeature(feature: any): Feature {
-    var f = this._format.readFeature(feature);
-    var centroid = getCenter(f.getGeometry().getExtent());
-    f.setGeometry(new Point(centroid));
-    return f;
-  }
-
-  @Effect()
-  init$: Observable<Action> = this.actions$.pipe(
-    ofType(mapActions.INIT),
-    withLatestFrom(this.store$.select(commonReducers.selectGetRootItems)),
-    switchMap(([action, rootItems]) => {
-      for (let rootItem of rootItems) {
-        if (rootItem.itemType == "UPLOADS_FOLDER") return of(new mapActions.SetParent(rootItem.code));
-      }
-      return [];
-    }
-    ));
-
-  @Effect()
-  initBaseLayers$: Observable<Action> = this.actions$.pipe(
-    ofType(mapActions.INIT),
-    withLatestFrom(this.store$.select(mapReducers.selectGetProjection)),
-    map(([action, projection]) => new mapActions.LoadBaseLayers(projection)));
-
-  @Effect()
-  loadBaseLayers$: Observable<Action> = this.actions$.pipe(
-    ofType(mapActions.LOADBASELAYERS),
-    switchMap((action: mapActions.LoadBaseLayers) => {
-      return this.itemService$.getItemList("vnd.farmmaps.itemtype.layer", { "isBaseLayer": true }).pipe(
-        map((items: IItem[]) => new mapActions.LoadBaseLayersSuccess(items)),
-        catchError(error => of(new commonActions.Fail(error))));
-    }));
-
-  @Effect()
-  initRootItems$: Observable<Action> = this.actions$.pipe(
-    ofType(commonActions.INITROOTSUCCESS),
-    map((action) => new mapActions.Init()
-    ));
-
-  @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(
-          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));
-          }
-          ),
-          catchError(error => of(new commonActions.Fail(error))));
-      } else {
-        newAction=  of(new commonActions.Escape(true,false));
-      }     
-      return newAction;
-    }));
-
-
-  @Effect()
-  startSearchSucces$: 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));
-    }
-    }));
-
-  @Effect()
-  selectItem$: Observable<Action> = this.actions$.pipe(
-    ofType(mapActions.SELECTITEM),
-    withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItem)),
-      switchMap(([action, selectedItem]) => {
-        let a = action as mapActions.SelectItem;
-        let itemCode = selectedItem ? selectedItem.code : "";
-        if (a.itemCode != itemCode) {
-          return this.itemService$.getItem(a.itemCode).pipe(
-            map((item: IItem) => new mapActions.SelectItemSuccess(item)),
-            catchError(error => of(new commonActions.Fail(error))))
-        } else {
-          return [];
-        }
-      }
-    ));
-
-  @Effect()
-  selectItemSuccess$: Observable<Action> = this.actions$.pipe(
-    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) )),
-        catchError(error => of(new commonActions.Fail(error))));
-    }
-    ));
-
-  @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),
-    withLatestFrom(this.store$.select(mapReducers.selectGetFeatures)),
-    mergeMap(([action, features]) => {
-      let itemChangedAction = action as commonActions.ItemChangedEvent;
-      var feature: Feature = null;
-      for (let f of features) {
-        if (f.get("code") == itemChangedAction.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))));
-      } else {
-        return [];
-      }
-    }));
-
-  @Effect()
-  itemUpdate$: Observable<Action> = this.actions$.pipe(
-    ofType(commonActions.ITEMCHANGEDEVENT),
-    withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItem)),
-    mergeMap(([action, selectedItem]) => {
-      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)),
-          catchError(error => of(new commonActions.Fail(error))));
-      } else {
-        return [];
-      }
-    }));
-
-  @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);
-      }));
-
-  @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);
-    }));
-
-  constructor(private actions$: Actions, private store$: Store<mapReducers.State>, private folderService$: FolderService, private itemService$: ItemService) {
-    this._format = new GeoJSON();
-  }
-}
+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 } from 'rxjs/operators';
+
+import {GeoJSON,WKT} from 'ol/format';
+import {Feature} from 'ol';
+import { getCenter } from 'ol/extent';
+import {Point} from 'ol/geom'
+
+
+import * as mapActions from '../actions/map.actions';
+import * as mapReducers from '../reducers/map.reducer';
+import {commonReducers} from '@farmmaps/common';
+
+import {commonActions} 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';
+
+
+@Injectable()
+export class MapEffects {
+  private _geojsonFormat: GeoJSON;
+  private _wktFormat: WKT;
+
+  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;
+  }
+
+  @Effect()
+  init$: Observable<Action> = this.actions$.pipe(
+    ofType(mapActions.INIT),
+    withLatestFrom(this.store$.select(commonReducers.selectGetRootItems)),
+    switchMap(([action, rootItems]) => {
+      let actions=[];
+      for (let rootItem of rootItems) {
+        if (rootItem.itemType == "UPLOADS_FOLDER") actions.push(new mapActions.SetParent(rootItem.code));
+      }
+      // 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;
+    }
+    ));
+
+  @Effect()
+  initBaseLayers$: Observable<Action> = this.actions$.pipe(
+    ofType(mapActions.INIT),
+    withLatestFrom(this.store$.select(mapReducers.selectGetProjection)),
+    map(([action, projection]) => new mapActions.LoadBaseLayers(projection)));
+
+  @Effect()
+  loadBaseLayers$: Observable<Action> = this.actions$.pipe(
+    ofType(mapActions.LOADBASELAYERS),
+    switchMap((action: mapActions.LoadBaseLayers) => {
+      return this.itemService$.getItemList("vnd.farmmaps.itemtype.layer", { "isBaseLayer": true }).pipe(
+        map((items: IItem[]) => new mapActions.LoadBaseLayersSuccess(items)),
+        catchError(error => of(new commonActions.Fail(error))));
+    }));
+
+  @Effect()
+  initRootItems$: Observable<Action> = this.actions$.pipe(
+    ofType(commonActions.INITROOTSUCCESS),
+    map((action) => new mapActions.Init()
+    ));
+
+  @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:Observable<Action>;
+      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(
+          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._geojsonFormat.readFeatures(features), action.queryState));
+          }
+          ),
+          catchError(error => of(new commonActions.Fail(error))));
+      } else {
+        newAction=  of(new commonActions.Escape(true,false));
+      }     
+      return newAction;
+    }));
+
+
+  @Effect()
+  startSearchSucces$: Observable<Action> = this.actions$.pipe(
+    ofType(mapActions.STARTSEARCHSUCCESS),
+    mergeMap((action: mapActions.StartSearchSuccess) => {
+        return [new commonActions.SetMenuVisible(false)];
+    }));
+
+  @Effect()
+  selectItem$: Observable<Action> = this.actions$.pipe(
+    ofType(mapActions.SELECTITEM),
+    withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItem)),
+      switchMap(([action, selectedItem]) => {
+        let a = action as mapActions.SelectItem;
+        let itemCode = selectedItem ? selectedItem.code : "";
+        if (a.itemCode != itemCode) {
+          return this.itemService$.getItem(a.itemCode).pipe(
+            map((item: IItem) => new mapActions.SelectItemSuccess(item)),
+            catchError(error => of(new commonActions.Fail(error))))
+        } else {
+          return [];
+        }
+      }
+    ));
+
+  @Effect()
+  selectItemSuccess$: Observable<Action> = this.actions$.pipe(
+    ofType(mapActions.SELECTITEMSUCCESS),
+    switchMap((action:mapActions.SelectItemSuccess) => {
+      return this.itemService$.getFeature(action.item.code, "EPSG:3857").pipe(
+        map((feature: any) => {
+          let f = this._geojsonFormat.readFeature(feature);
+          f.setId(action.item.code);
+          return new mapActions.AddFeatureSuccess(f );
+        }),
+        catchError(error => of(new commonActions.Fail(error))));
+    }
+    ));
+
+  @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.DEVICEUPDATEEVENT),
+    withLatestFrom(this.store$.select(mapReducers.selectGetFeatures)),
+    mergeMap(([action, features]) => {
+      let deviceUpdateEventAction = action as commonActions.DeviceUpdateEvent;
+      var feature: Feature = null;
+      for (let f of features) {
+        if (f.getId() == deviceUpdateEventAction.itemCode) {
+          feature = f;
+          break;
+        }
+      }     
+      if (feature) {
+        return of(new mapActions.UpdateFeatureSuccess(this.toPointFeature(deviceUpdateEventAction)));        
+      } else {
+        return [];
+      }
+    }));
+
+  @Effect()
+  itemUpdate$: Observable<Action> = this.actions$.pipe(
+    ofType(commonActions.ITEMCHANGEDEVENT),
+    withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItem)),
+    mergeMap(([action, selectedItem]) => {
+      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)),
+          catchError(error => of(new commonActions.Fail(error))));
+      } else {
+        return [];
+      }
+    }));
+
+  @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);
+      }));
+
+  @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);
+    }));
+
+  constructor(private actions$: Actions, private store$: Store<mapReducers.State>, private folderService$: FolderService, private itemService$: ItemService,private featureIconService$:FeatureIconService) {
+    this._geojsonFormat = new GeoJSON();
+    this._wktFormat = new WKT();
+  }
+}

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

@@ -1,69 +1,72 @@
-export interface IColor {
-  red: number,
-  green: number,
-  blue: number,
-  alpha: number,
-}
-
-export interface IColorEntry {
-   value: number,
-   color: IColor
-}
-
-export interface IHistogramEntry {
-  value: number,
-  freqency: number
-}
-
-export interface IHistogram {
-  min: number,
-  max: number,
-  mean: number,
-  stddev: number,
-  classes: number,
-  entries: IHistogramEntry[]
-}
-
-export interface IGradientstop {
-  relativestop: number,
-  color: IColor
-}
-
-export interface IColorMap {
-   gradient: IGradientstop[],
-   noValue: IColorEntry,
-   entries: IColorEntry[]
-}
-
-export interface IBand {
-  histogram: IHistogram
-}
-
-
-export interface IRenderer {
-  band:IBand,
-  colorMap: IColorMap
-}
-
-export interface IRenderoutput {
-  renderoutputType: string
-}
-
-export interface IRenderoutputTiles {
-  renderoutputType: string,
-  minzoom: number,
-  maxzoom: number
-}
-
-export interface IRenderoutputImage {
-  renderoutputType: string,
-  extent: [number,number,number,number]
-}
-
-export interface ILayer {
-  name: string,
-  unit: string,
-  index: number,
-  renderer: IRenderer,
-  rendering: IRenderoutput
-}
+export interface IColor {
+  red: number,
+  green: number,
+  blue: number,
+  alpha: number,
+}
+
+export interface IColorEntry {
+   value: number,
+   color: IColor,
+   label: string
+}
+
+export interface IHistogramEntry {
+  value: number,
+  freqency: number
+}
+
+export interface IHistogram {
+  min: number,
+  max: number,
+  mean: number,
+  stddev: number,
+  classes: number,
+  entries: IHistogramEntry[]
+}
+
+export interface IGradientstop {
+  relativestop: number,
+  color: IColor
+}
+
+export interface IColorMap {
+  gradient: IGradientstop[],
+  noValue: IColorEntry,
+  entries: IColorEntry[],
+  colormapType: string
+}
+
+export interface IBand {
+  histogram: IHistogram
+}
+
+
+export interface IRenderer {
+  band:IBand,
+  colorMap: IColorMap,
+  renderType:string
+}
+
+export interface IRenderoutput {
+  renderoutputType: string
+}
+
+export interface IRenderoutputTiles {
+  renderoutputType: string,
+  minzoom: number,
+  maxzoom: number
+}
+
+export interface IRenderoutputImage {
+  renderoutputType: string,
+  extent: [number,number,number,number]
+}
+
+export interface ILayer {
+  name: string,
+  unit: string,
+  index: number,
+  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/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,369 +1,402 @@
-import { tassign } from 'tassign';
-import { IItem,Item } from '@farmmaps/common';
-import { IItemLayer,ItemLayer, IMapState,IQueryState,IPeriodState} from '../models'
-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';
-
-const startDate:Date = new Date(new Date(Date.now()).getFullYear(), new Date(Date.now()).getMonth() - 3, 1);
-const endDate:Date = new Date(Date.now());
-
-export const initialQueryState: IQueryState = {
-  itemCode: null,
-  parentCode: null,
-  level: 1,
-  itemType: null,
-  bboxFilter: false,
-  query: null,
-  tags: null,
-  endDate: null,
-  startDate: null,
-  bbox: []
-};
-
-export interface State {
-  period:IPeriodState,
-  mapState: IMapState,
-  viewExtent: number[],
-  queryState: IQueryState,
-  query:IQueryState,
-  parentCode: string,
-  features: Array<Feature>,
-  panelVisible: boolean,
-  panelCollapsed: boolean,
-  selectedFeature: Feature,
-  selectedItem: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
-}
-
-export const initialState: State = {
-  period: {
-    startDate: startDate,
-    endDate: endDate
-  },
-  mapState: {
-    zoom: 8,
-    rotation: 0,
-    xCenter: 5.377554,
-    yCenter: 52.162422,
-    baseLayerCode: ""
-  },
-  viewExtent:[],
-  queryState: tassign(initialQueryState),
-  query: tassign(initialQueryState),
-  parentCode: null,
-  features: [],
-  panelVisible: false,
-  panelCollapsed: false,
-  selectedFeature: null,
-  selectedItem: null, 
-  clearEnabled: false,
-  searchCollapsed: true,
-  searchMinified:false,
-  menuVisible: true,
-  extent: null,
-  baseLayers: [],
-  overlayLayers: [],
-  projection: "EPSG:3857",
-  selectedBaseLayer: null,
-  selectedOverlayLayer: null,
-  selectedItemLayer: null
-}
-
-export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State {    
-  switch (action.type) {
-    case ROUTER_NAVIGATION: {
-      let a = action as RouterNavigationAction;
-      return tassign(state);
-    }
-    case mapActions.SETMAPSTATE: {
-      let a = action as mapActions.SetMapState;
-      return tassign(state, {
-        mapState: a.mapState
-      });
-    }
-    case mapActions.SETQUERYSTATE: {
-      let a = action as mapActions.SetQueryState;
-      return tassign(state, { queryState: tassign(a.queryState )});
-    }
-    case mapActions.SETSTATE: {
-      let a = action as mapActions.SetState;
-      return tassign(state, { mapState: tassign(a.mapState), queryState: tassign(a.queryState)});
-    }
-    case mapActions.SETVIEWEXTENT: {
-      let a = action as mapActions.SetViewExtent;
-      return tassign(state, { viewExtent: a.extent });
-    }
-    case mapActions.SETPARENT: {
-      let a = action as mapActions.SetParent;
-      return tassign(state, {       
-        parentCode : a.parentCode
-      });
-    }
-    case mapActions.STARTSEARCHSUCCESS: {
-      let a = action as mapActions.StartSearchSuccess;
-      return tassign(state, {
-        panelVisible: true,
-        clearEnabled: true,
-        searchMinified: true,
-        features: a.features
-      });
-    }
-    case mapActions.SELECTFEATURE: {
-      let a = action as mapActions.SelectFeature;
-      return tassign(state, {
-        selectedFeature: state.selectedItem?state.selectedFeature: a.feature
-      });
-    }
-    case mapActions.SELECTITEM: {
-      return tassign(state, {
-        selectedItem: null,
-        searchMinified:false,
-        selectedItemLayer: null,
-        features:[]
-      });
-    }
-    case mapActions.SELECTITEMSUCCESS: {
-      let a = action as mapActions.SelectItemSuccess;
-      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);
-      }
-      return tassign(state, {
-        selectedItem: a.item,
-        selectedItemLayer: itemLayer,
-        panelVisible: a.item != null,
-        clearEnabled: a.item != null,
-        searchCollapsed: false,
-        searchMinified: true,
-        queryState: tassign(state.queryState, {itemCode:a.item ? a.item.code:null})
-      });
-    }
-    case mapActions.STARTSEARCH: {
-      let a = action as mapActions.StartSearch;
-      return tassign(state, {
-        selectedItem: null,
-        selectedItemLayer:null,
-        queryState: tassign(a.queryState),
-        searchCollapsed: false,
-        searchMinified: true,
-        menuVisible:false
-      });
-    }
-    case mapActions.DOQUERY: {
-      let a = action as mapActions.DoQuery;
-      return tassign(state, {
-        query: tassign(a.query, { bbox: a.query.bboxFilter ? state.viewExtent : [] })});
-    }
-    case mapActions.ADDFEATURESUCCESS: {
-      let a = action as mapActions.AddFeatureSuccess;
-      let features = state.features.slice();
-      features.push(a.feature);
-      return tassign(state, {
-        panelVisible: true,
-        selectedFeature: a.feature,
-        menuVisible: false,
-        extent: a.feature.getGeometry().getExtent(),
-        searchCollapsed: false,
-        clearEnabled:true,
-        features:features
-      });
-    }
-    case mapActions.UPDATEFEATURESUCCESS: {
-      let a = action as mapActions.UpdateFeatureSuccess;     
-      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")) {
-          features.push(a.feature);
-        } else {
-          features.push(state.features[i]);
-        }
-      }
-      return tassign(state, { features: features });
-    }
-    case mapActions.EXPANDSEARCH: {
-      return tassign(state, { searchCollapsed: false });
-    }
-    case mapActions.COLLAPSESEARCH: {
-      return tassign(state, { searchCollapsed: state.panelVisible ? false: true});
-    }
-    case mapActions.TOGGLEMENU: {
-      return tassign(state, { menuVisible: !state.menuVisible });
-    }
-    case mapActions.SETEXTENT: {
-      let a = action as mapActions.SetExtent;    
-      return tassign(state, { extent: a.extent });
-    }   
-    case mapActions.ADDLAYER: {
-      let a = action as mapActions.AddLayer;
-      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 });
-    }
-    case mapActions.REMOVELAYER: {
-      let a = action as mapActions.RemoveLayer;
-      let newLayers = state.overlayLayers.slice(0);
-      let i = state.overlayLayers.indexOf(a.itemLayer);
-      var selectedOverlayLayer: IItemLayer = null;
-      if (i>0 && state.overlayLayers.length > 1)
-        selectedOverlayLayer = state.overlayLayers[i - 1];
-      else if (i == 0 && state.overlayLayers.length > 1)
-        selectedOverlayLayer = state.overlayLayers[i + 1];
-      newLayers.splice(i, 1);
-      return tassign(state, { overlayLayers: newLayers, selectedOverlayLayer: selectedOverlayLayer });
-    }
-    case mapActions.SETVISIBILITY: {
-      let a = action as mapActions.SetVisibility;
-      let newLayers = state.overlayLayers.slice(0);
-      let i = state.overlayLayers.indexOf(a.itemLayer);
-      newLayers[i].visible = a.visibility;
-      return tassign(state, { overlayLayers: newLayers });
-    }
-    case mapActions.SETOPACITY: {
-      let a = action as mapActions.SetOpacity;
-      let newLayers = state.overlayLayers.slice(0);
-      let i = state.overlayLayers.indexOf(a.itemLayer);
-      newLayers[i].opacity = a.opacity;
-      return tassign(state, { overlayLayers: newLayers });
-    }
-    case mapActions.SETLAYERINDEX: {
-      let a = action as mapActions.SetLayerIndex;
-      if (a.itemLayer == null) {
-        var newItemlayer = new ItemLayer(state.selectedItemLayer.item);
-        newItemlayer.layerIndex = a.layerIndex;
-        return tassign(state, { selectedItemLayer: newItemlayer})
-      } else {
-        let newLayers = state.overlayLayers.slice(0);
-        let i = state.overlayLayers.indexOf(a.itemLayer);
-        newLayers[i].layerIndex = a.layerIndex;
-        return tassign(state, { overlayLayers: newLayers });
-      }
-    }
-    case mapActions.LOADBASELAYERSSUCCESS: {
-      let a =action as mapActions.LoadBaseLayersSuccess;
-      let baseLayers:ItemLayer[] = [];
-      for (let item of a.items) {
-        var l = new ItemLayer(item);
-        l.visible = false;
-        baseLayers.push(l);
-      }
-      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];
-        selectedBaseLayer.visible = true;
-      } else if (baseLayers.length > 0) {
-        selectedBaseLayer = baseLayers[0];
-        selectedBaseLayer.visible = true;
-        mapState.baseLayerCode = selectedBaseLayer.item.code;
-      }
-      return tassign(state, { mapState:mapState, baseLayers: baseLayers, selectedBaseLayer: selectedBaseLayer });
-    }
-    case mapActions.SELECTBASELAYER: {
-      let a = action as mapActions.SelectBaseLayer;
-      let baseLayers = state.baseLayers.slice(0);
-      baseLayers.forEach((l) => l.visible = false);
-      let i = state.baseLayers.indexOf(a.itemLayer);
-      baseLayers[i].visible = true;
-      var mapState = tassign(state.mapState);
-      mapState.baseLayerCode = a.itemLayer.item.code;
-      return tassign(state, {mapState:mapState, baseLayers:baseLayers,selectedBaseLayer:a.itemLayer });
-    }
-    case mapActions.SELECTOVERLAYLAYER: {
-      let a = action as mapActions.SelectOverlayLayer;
-      return tassign(state, { selectedOverlayLayer: a.itemLayer });
-    }
-    case commonActions.ESCAPE: {
-      let a = action as commonActions.Escape;
-      let newQueryState = tassign(state.queryState, { query: null, tags: null, itemCode: null, parentCode: null, itemType: null });
-      if (a.escapeKey) {
-        return tassign(state, {
-          panelVisible: false,
-          panelCollapsed:false,
-          selectedItem: null,
-          selectedItemLayer: null,
-          selectedFeature: null,
-          queryState: newQueryState,
-          clearEnabled: false,
-          searchCollapsed: true,
-          searchMinified: false,
-          menuVisible:false,
-          features: [],
-          query:initialState.query
-        });
-      } else {
-        return tassign(state, {});
-      }
-    }
-    default: {
-      return state;
-    }
-  }
-}
-
-export const getMapState = (state: State) => state.mapState;
-export const getParentCode = (state: State) => state.parentCode;
-export const getFeatures = (state: State) => state.features;
-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 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;
-export const getProjection = (state: State) => state.projection;
-export const getSelectedBaseLayer = (state: State) => state.selectedBaseLayer;
-export const getSelectedOverlayLayer = (state: State) => state.selectedOverlayLayer;
-export const getQuery = (state: State) => state.query;
-export const getSelectedItemLayer = (state: State) => state.selectedItemLayer;
-export const getPeriod = (state:State) => state.period;
-
-export const selectMapState = createFeatureSelector<State>(MODULE_NAME);
-export const selectGetMapState= createSelector(selectMapState, getMapState);
-export const selectGetParentCode = createSelector(selectMapState, getParentCode);
-export const selectGetFeatures = createSelector(selectMapState, getFeatures);
-export const selectGetPanelVisible = createSelector(selectMapState, getPanelVisible);
-export const selectGetPanelCollapsed = createSelector(selectMapState, getPanelCollapsed);
-export const selectGetSelectedFeature = createSelector(selectMapState, getSelectedFeature);
-export const selectGetSelectedItem = createSelector(selectMapState, getSelectedItem);
-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);
-export const selectGetProjection = createSelector(selectMapState, getProjection);
-export const selectGetSelectedBaseLayer = createSelector(selectMapState, getSelectedBaseLayer);
-export const selectGetSelectedOverlayLayer = createSelector(selectMapState, getSelectedOverlayLayer);
-export const selectGetQuery = createSelector(selectMapState, getQuery); 
-export const selectGetSelectedItemLayer = createSelector(selectMapState, getSelectedItemLayer);
-export const selectGetPeriod = createSelector(selectMapState, getPeriod);
-
-
+import { tassign } from 'tassign';
+import { IItem,Item } from '@farmmaps/common';
+import { IItemLayer,ItemLayer} 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 { createEmpty, extend} from 'ol/extent';
+
+import { ROUTER_NAVIGATION, RouterNavigationAction } from '@ngrx/router-store';
+
+import { MODULE_NAME } from '../module-name';
+
+const startDate:Date = new Date(new Date(Date.now()).getFullYear(), new Date(Date.now()).getMonth() - 3, 1);
+const endDate:Date = new Date(Date.now());
+
+export const initialQueryState: IQueryState = {
+  itemCode: null,
+  parentCode: null,
+  level: 1,
+  itemType: null,
+  bboxFilter: false,
+  query: null,
+  tags: null,
+  endDate: null,
+  startDate: null,
+  bbox: []
+};
+
+export interface State {
+  period:IPeriodState,
+  mapState: IMapState,
+  viewExtent: number[],
+  queryState: IQueryState,
+  query:IQueryState,
+  parentCode: string,
+  features: Array<Feature>,
+  panelVisible: boolean,
+  panelCollapsed: boolean,
+  selectedFeature: Feature,
+  selectedItem:IItem,
+  clearEnabled: boolean,
+  searchCollapsed: boolean,
+  searchMinified: boolean, 
+  extent: number[],
+  baseLayers: Array<IItemLayer>
+  overlayLayers: Array<IItemLayer>,
+  selectedItemLayer: IItemLayer,
+  projection: string,
+  selectedBaseLayer: IItemLayer,
+  selectedOverlayLayer: IItemLayer,
+  styles:IStyles,
+  showLayerSwitcher:boolean,
+  setStateCount:number
+}
+
+export const initialState: State = {
+  period: {
+    startDate: startDate,
+    endDate: endDate
+  },
+  mapState: {
+    zoom: 8,
+    rotation: 0,
+    xCenter: 5.377554,
+    yCenter: 52.162422,
+    baseLayerCode: ""
+  },
+  viewExtent:[],
+  queryState: tassign(initialQueryState),
+  query: tassign(initialQueryState),
+  parentCode: null,
+  features: [],
+  panelVisible: false,
+  panelCollapsed: false,
+  selectedFeature: null,
+  selectedItem: null, 
+  clearEnabled: false,
+  searchCollapsed: true,
+  searchMinified:false,
+  extent: null,
+  baseLayers: [],
+  overlayLayers: [],
+  projection: "EPSG:3857",
+  selectedBaseLayer: null,
+  selectedOverlayLayer: null,
+  selectedItemLayer: null,
+  styles: {},
+  showLayerSwitcher: false,
+  setStateCount: 0
+}
+
+export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State {    
+  switch (action.type) {
+    case ROUTER_NAVIGATION: {
+      let a = action as RouterNavigationAction;
+      return tassign(state);
+    }
+    case mapActions.SETMAPSTATE: {
+      let a = action as mapActions.SetMapState;
+      return tassign(state, {
+        mapState: a.mapState,setStateCount: state.setStateCount+1
+      });
+    }
+    case mapActions.SETQUERYSTATE: {
+      let a = action as mapActions.SetQueryState;
+      return tassign(state, { queryState: tassign(a.queryState ),setStateCount: state.setStateCount+1});
+    }
+    case mapActions.SETSTATE: {
+      let a = action as mapActions.SetState;
+      return tassign(state, { mapState: tassign(a.mapState), queryState: tassign(a.queryState),setStateCount: state.setStateCount+1});
+    }
+    case mapActions.SETVIEWEXTENT: {
+      let a = action as mapActions.SetViewExtent;
+      return tassign(state, { viewExtent: a.extent });
+    }
+    case mapActions.SETPARENT: {
+      let a = action as mapActions.SetParent;
+      return tassign(state, {       
+        parentCode : a.parentCode
+      });
+    }
+    case mapActions.STARTSEARCHSUCCESS: {
+      let a = action as mapActions.StartSearchSuccess;
+      let extent = state.extent;
+      if (!action.query.bboxFilter) {
+        console.debug("Set extent");
+        extent = createEmpty();
+        if (extent) {
+          for (let f of action.features) {
+            extend(extent, (f as Feature).getGeometry().getExtent());
+          }
+        }  
+      }
+      return tassign(state, {
+        panelVisible: true,
+        clearEnabled: true,
+        searchMinified: true,
+        features: a.features,
+        extent:extent
+      });
+    }
+    case mapActions.SELECTFEATURE: {
+      let a = action as mapActions.SelectFeature;
+      return tassign(state, {
+        selectedFeature: state.selectedItem?state.selectedFeature: a.feature
+      });
+    }
+    case mapActions.SELECTITEM: {
+      return tassign(state, {
+        selectedItem: null,
+        searchMinified:false,
+        selectedItemLayer: null,
+        features:[]
+      });
+    }
+    case mapActions.SELECTITEMSUCCESS: {
+      let a = action as mapActions.SelectItemSuccess;
+      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);
+      }
+      return tassign(state, {
+        selectedItem: a.item,
+        selectedItemLayer: itemLayer,
+        panelVisible: a.item != null,
+        clearEnabled: a.item != null,
+        searchCollapsed: false,
+        searchMinified: true,
+        queryState: tassign(state.queryState, {itemCode:a.item ? a.item.code:null})
+      });
+    }
+    case mapActions.STARTSEARCH: {
+      let a = action as mapActions.StartSearch;
+      return tassign(state, {
+        selectedItem: null,
+        selectedItemLayer:null,
+        queryState: tassign(a.queryState),
+        searchCollapsed: false,
+        searchMinified: true
+      });
+    }
+    case mapActions.DOQUERY: {
+      let a = action as mapActions.DoQuery;
+      return tassign(state, {
+        query: tassign(a.query, { bbox: a.query.bboxFilter ? state.viewExtent : [] })});
+    }
+    case mapActions.ADDFEATURESUCCESS: {
+      let a = action as mapActions.AddFeatureSuccess;
+      let features = state.features.slice();
+      features.push(a.feature);
+      return tassign(state, {
+        panelVisible: true,
+        selectedFeature: a.feature,
+        extent: a.feature.getGeometry().getExtent(),
+        searchCollapsed: false,
+        clearEnabled:true,
+        features:features
+      });
+    }
+    case mapActions.UPDATEFEATURESUCCESS: {
+      let a = action as mapActions.UpdateFeatureSuccess;     
+      let features: any[] = [];
+      var index = -1;
+      for (var i = 0; i < state.features.length; i++) {
+        if (state.features[i].getId() == a.feature.getId()) {
+          features.push(a.feature);
+        } else {
+          features.push(state.features[i]);
+        }
+      }
+      return tassign(state, { features: features });
+    }
+    case mapActions.EXPANDSEARCH: {
+      return tassign(state, { searchCollapsed: false });
+    }
+    case mapActions.COLLAPSESEARCH: {
+      return tassign(state, { searchCollapsed: state.panelVisible ? false: true});
+    }
+    case mapActions.SETEXTENT: {
+      console.debug("Set extent 2");
+      let a = action as mapActions.SetExtent;    
+      return tassign(state, { extent: a.extent });
+    }   
+    case mapActions.ADDLAYER: {
+      let a = action as mapActions.AddLayer;
+      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 });
+    }
+    case mapActions.REMOVELAYER: {
+      let a = action as mapActions.RemoveLayer;
+      let newLayers = state.overlayLayers.slice(0);
+      let i = state.overlayLayers.indexOf(a.itemLayer);
+      var selectedOverlayLayer: IItemLayer = null;
+      if (i>0 && state.overlayLayers.length > 1)
+        selectedOverlayLayer = state.overlayLayers[i - 1];
+      else if (i == 0 && state.overlayLayers.length > 1)
+        selectedOverlayLayer = state.overlayLayers[i + 1];
+      newLayers.splice(i, 1);
+      return tassign(state, { overlayLayers: newLayers, selectedOverlayLayer: selectedOverlayLayer });
+    }
+    case mapActions.SETVISIBILITY: {
+      let a = action as mapActions.SetVisibility;
+      let newLayers = state.overlayLayers.slice(0);
+      let i = state.overlayLayers.indexOf(a.itemLayer);
+      newLayers[i].visible = a.visibility;
+      return tassign(state, { overlayLayers: newLayers });
+    }
+    case mapActions.SETOPACITY: {
+      let a = action as mapActions.SetOpacity;
+      let newLayers = state.overlayLayers.slice(0);
+      let i = state.overlayLayers.indexOf(a.itemLayer);
+      newLayers[i].opacity = a.opacity;
+      return tassign(state, { overlayLayers: newLayers });
+    }
+    case mapActions.SETLAYERINDEX: {
+      let a = action as mapActions.SetLayerIndex;
+      if (a.itemLayer == null) {
+        var newItemlayer = new ItemLayer(state.selectedItemLayer.item);
+        newItemlayer.layerIndex = a.layerIndex;
+        return tassign(state, { selectedItemLayer: newItemlayer})
+      } else {
+        let newLayers = state.overlayLayers.slice(0);
+        let i = state.overlayLayers.indexOf(a.itemLayer);
+        newLayers[i].layerIndex = a.layerIndex;
+        return tassign(state, { overlayLayers: newLayers });
+      }
+    }
+    case mapActions.LOADBASELAYERSSUCCESS: {
+      let a =action as mapActions.LoadBaseLayersSuccess;
+      let baseLayers:ItemLayer[] = [];
+      for (let item of a.items) {
+        var l = new ItemLayer(item);
+        l.visible = false;
+        baseLayers.push(l);
+      }
+      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];
+        selectedBaseLayer.visible = true;
+      } else if (baseLayers.length > 0) {
+        selectedBaseLayer = baseLayers[0];
+        selectedBaseLayer.visible = true;
+        mapState.baseLayerCode = selectedBaseLayer.item.code;
+      }
+      return tassign(state, { mapState:mapState, baseLayers: baseLayers, selectedBaseLayer: selectedBaseLayer });
+    }
+    case mapActions.SELECTBASELAYER: {
+      let a = action as mapActions.SelectBaseLayer;
+      let baseLayers = state.baseLayers.slice(0);
+      baseLayers.forEach((l) => l.visible = false);
+      let i = state.baseLayers.indexOf(a.itemLayer);
+      baseLayers[i].visible = true;
+      var mapState = tassign(state.mapState);
+      mapState.baseLayerCode = a.itemLayer.item.code;
+      return tassign(state, {mapState:mapState, baseLayers:baseLayers,selectedBaseLayer:a.itemLayer });
+    }
+    case mapActions.SELECTOVERLAYLAYER: {
+      let a = action as mapActions.SelectOverlayLayer;
+      return tassign(state, { selectedOverlayLayer: a.itemLayer });
+    }
+    case commonActions.ESCAPE: {
+      let a = action as commonActions.Escape;
+      let newQueryState = tassign(state.queryState, { query: null, tags: null, itemCode: null, parentCode: null, itemType: null });
+      if (a.escapeKey) {
+        return tassign(state, {
+          panelVisible: false,
+          panelCollapsed:false,
+          selectedItem: null,
+          selectedItemLayer: null,
+          selectedFeature: null,
+          queryState: newQueryState,
+          clearEnabled: false,
+          searchCollapsed: true,
+          searchMinified: false,
+          features: [],
+          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.INIT:{
+      return tassign(state,{setStateCount:0});
+    }
+    default: {
+      return state;
+    }
+  }
+}
+
+export const getMapState = (state: State) => state.mapState;
+export const getParentCode = (state: State) => state.parentCode;
+export const getFeatures = (state: State) => state.features;
+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 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 getExtent = (state: State) => state.extent;
+export const getOverlayLayers = (state: State) => state.overlayLayers;
+export const getBaseLayers = (state: State) => state.baseLayers;
+export const getProjection = (state: State) => state.projection;
+export const getSelectedBaseLayer = (state: State) => state.selectedBaseLayer;
+export const getSelectedOverlayLayer = (state: State) => state.selectedOverlayLayer;
+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 selectMapState = createFeatureSelector<State>(MODULE_NAME);
+export const selectGetMapState= createSelector(selectMapState, getMapState);
+export const selectGetParentCode = createSelector(selectMapState, getParentCode);
+export const selectGetFeatures = createSelector(selectMapState, getFeatures);
+export const selectGetPanelVisible = createSelector(selectMapState, getPanelVisible);
+export const selectGetPanelCollapsed = createSelector(selectMapState, getPanelCollapsed);
+export const selectGetSelectedFeature = createSelector(selectMapState, getSelectedFeature);
+export const selectGetSelectedItem = createSelector(selectMapState, getSelectedItem);
+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 selectGetExtent = createSelector(selectMapState, getExtent);
+export const selectGetOverlayLayers = createSelector(selectMapState, getOverlayLayers);
+export const selectGetBaseLayers = createSelector(selectMapState, getBaseLayers);
+export const selectGetProjection = createSelector(selectMapState, getProjection);
+export const selectGetSelectedBaseLayer = createSelector(selectMapState, getSelectedBaseLayer);
+export const selectGetSelectedOverlayLayer = createSelector(selectMapState, getSelectedOverlayLayer);
+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);
+
+

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,39 +1,39 @@
-import { Injectable } from '@angular/core';
-import { Observer, Observable } from 'rxjs';
-
-/**
- * GeolocationService class.
- * https://developers.google.com/maps/documentation/javascript/
- * https://dev.w3.org/geo/api/spec-source.html
- */
-@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
-        }
-      );
-    });
-  }
-
-}
+import { Injectable } from '@angular/core';
+import { Observer, Observable } from 'rxjs';
+
+/**
+ * GeolocationService class.
+ * https://developers.google.com/maps/documentation/javascript/
+ * https://dev.w3.org/geo/api/spec-source.html
+ */
+@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
+        }
+      );
+    });
+  }
+
+}

projects/common/package-lock.json

@@ -1,35 +1,35 @@
-{
-  "name": "@farmmaps/common",
-  "version": "0.0.1",
-  "lockfileVersion": 1,
-  "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==",
-      "requires": {
-        "jsrsasign": "^8.0.12",
-        "tslib": "^1.9.0"
-      }
-    },
-    "jsrsasign": {
-      "version": "8.0.12",
-      "resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-8.0.12.tgz",
-      "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==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "tslib": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
-    }
-  }
-}
+{
+  "name": "@farmmaps/common",
+  "version": "0.0.1",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "angular-oauth2-oidc": {
+      "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"
+      }
+    },
+    "jsrsasign": {
+      "version": "8.0.12",
+      "resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-8.0.12.tgz",
+      "integrity": "sha1-Iqu5ZW00owuVMENnIINeicLlwxY="
+    },
+    "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"
+      }
+    },
+    "tslib": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
+    }
+  }
+}

projects/common/package.json

@@ -1,24 +1,24 @@
-{
-  "name": "@farmmaps/common",
-  "version": "0.0.1",
-  "publishConfig": {
-    "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
-  },
-  "dependencies": {
-    "angular-oauth2-oidc": "^5.0.2",
-    "ngx-uploadx": "^3.1.3"
-  },
-  "peerDependencies": {
-    "@ng-bootstrap/ng-bootstrap": "^4.2.1",
-    "@angular/common": "^7.2.0",
-    "@angular/core": "^7.2.0",
-    "@angular/forms": "^7.2.0",
-    "@ngrx/effects": "^7.2",
-    "@ngrx/router-store": "^7.2",
-    "@ngrx/store": "^7.2",
-    "tassign": "^1.0.0",
-    "bootstrap": "^4.3.1",
-    "@aspnet/signalr": "^1.1.4",
-    "font-awesome": "^4.7.0"
-  }
-}
+{
+  "name": "@farmmaps/common",
+  "version": "0.0.1",
+  "publishConfig": {
+    "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
+  },
+  "dependencies": {
+    "angular-oauth2-oidc": "^8.0.2",
+    "ngx-uploadx": "^3.3.2"
+  },
+  "peerDependencies": {
+    "@ng-bootstrap/ng-bootstrap": "^4.2.1",
+    "@angular/common": "^8.2.0",
+    "@angular/core": "^8.2.0",
+    "@angular/forms": "^8.2.0",
+    "@ngrx/effects": "^8.2",
+    "@ngrx/router-store": "^8.2",
+    "@ngrx/store": "^8.2",
+    "tassign": "^1.0.0",
+    "bootstrap": "^4.3.1",
+    "@aspnet/signalr": "^1.1.4",
+    "font-awesome": "^4.7.0"
+  }
+}

projects/common/src/fm/_theme.scss

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

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

@@ -1,234 +1,253 @@
-import { Action } from '@ngrx/store';
-
-import { IItemTypes } from '../models/item.types';
-import { IListItem } from '../models/list.item';
-import { IUser } from '../models/user';
-
-export const INITUSER = '[AppCommon] InitUser';
-export const INITUSERSUCCESS = '[AppCommon] InitUserSuccess';
-
-export const INITROOT = '[Explorer] InitRoot';
-export const INITROOTSUCCESS = '[Explorer] InitRootSuccess';
-
-export const OPENMODAL = '[AppCommon] OpenModal';
-export const CLOSEMODAL = '[AppCommon] CloseModal';
-export const LOGIN = '[AppCommon] Login';
-export const INITIALIZED = '[AppCommon] Initialized';
-export const ESCAPE = '[AppCommon] Escape';
-
-export const LOADITEMTYPES = '[AppCommon] LoadItemTypes';
-export const LOADITEMTYPESSUCCESS = '[AppCommon] LoadItemTypesSuccess';
-
-export const ITEMCHANGEDEVENT = '[AppCommon] ItemChangedEvent';
-export const ITEMADDEDEVENT = '[AppCommon] ItemAddedEvent';
-export const ITEMDELETEDEVENT = '[AppCommon] ItemDeletedEvent';
-
-export const TASKSTARTEVENT = '[AppCommon] TaskStartEvent';
-export const TASKENDEVENT = '[AppCommon] TaskEndEvent';
-export const TASKERRORTEVENT = '[AppCommon] TaskErrorEvent';
-
-export const DELETEITEMS = '[AppCommon] DeleteItems';
-export const DELETEITEMSSUCCESS = '[AppCommon] DeleteItemsSuccess';
-
-export const STARTROUTELOADING = '[AppCommon] StartRouteLoading';
-export const ENDROUTELOADING = '[AppCommon] EndRouteLoading';
-
-export const FULLSCREEN = '[AppCommon] FullScreen';
-export const SHOWNAVBAR = '[AppCommon] ShowNavBar';
-
-export const EDITITEM = "[AppCommon] EditItem";
-
-export const VIEWITEM = "[AppCommon] ViewItem";
-
-export const FAIL = '[AppCommon] Fail';
-
-export const UPLOADEDFILECLICK = '[AppCommon] UploadedFileClick';
-
-export class InitUser implements Action {
-  readonly type = INITUSER;
-
-  constructor() { }
-}
-
-export class InitUserSuccess implements Action {
-  readonly type = INITUSERSUCCESS;
-
-  constructor(public user:IUser ) { }
-}
-
-export class InitRoot implements Action {
-  readonly type = INITROOT;
-
-  constructor() { }
-}
-
-export class InitRootSuccess implements Action {
-  readonly type = INITROOTSUCCESS;
-
-  constructor(public items:IListItem[]) { }
-}
-
-export class OpenModal implements Action {
-  readonly type = OPENMODAL;
-
-  constructor(public modalName: string) { }
-}
-
-export class CloseModal implements Action {
-  readonly type = CLOSEMODAL;
-
-  constructor() { }
-}
-
-export class StartRouteLoading implements Action {
-  readonly type = STARTROUTELOADING;
-
-  constructor() { }
-}
-
-export class EndRouteLoading implements Action {
-  readonly type = ENDROUTELOADING;
-
-  constructor() { }
-}
-
-export class Login implements Action {
-  readonly type = LOGIN;
-
-  constructor(public url: string) { }
-}
-
-export class Initialized implements Action {
-  readonly type = INITIALIZED;
-
-  constructor() { }
-}
-
-export class Escape implements Action {
-  readonly type = ESCAPE;
-
-  constructor(public escapeKey:boolean, public click:boolean) { }
-}
-
-export class LoadItemTypes implements Action {
-  readonly type = LOADITEMTYPES;
-
-  constructor() { }
-}
-
-export class LoadItemTypesSuccess implements Action {
-  readonly type = LOADITEMTYPESSUCCESS;
-
-  constructor(public itemTypes: IItemTypes) { }
-}
-
-export class Fail implements Action {
-  readonly type = FAIL;
-
-  constructor(public payload: string) { }
-}
-
-export class ItemChangedEvent implements Action {
-  readonly type = ITEMCHANGEDEVENT;
-
-  constructor(public itemCode: string, public attributes: any) { }
-}
-
-export class ItemAddedEvent implements Action {
-  readonly type = ITEMADDEDEVENT;
-
-  constructor(public itemCode: string, public attributes: any) { }
-}
-
-export class ItemDeletedEvent implements Action {
-  readonly type = ITEMDELETEDEVENT;
-
-  constructor(public itemCode: string, public attributes: any) { }
-}
-
-export class TaskStartEvent implements Action {
-  readonly type = TASKSTARTEVENT;
-
-  constructor(public itemCode: string, public attributes: any) { }
-}
-
-export class TaskEndEvent implements Action {
-  readonly type = TASKENDEVENT;
-
-  constructor(public itemCode: string, public attributes: any) { }
-}
-
-export class TaskErrorEvent implements Action {
-  readonly type = TASKERRORTEVENT;
-
-  constructor(public itemCode: string, public attributes: any) { }
-}
-
-export class DeleteItems implements Action {
-  readonly type = DELETEITEMS;
-
-  constructor(public itemCodes: string[]) { }
-}
-
-export class DeleteItemsSuccess implements Action {
-  readonly type = DELETEITEMSSUCCESS;
-
-  constructor(public deletedItemCodes: string[]) { }
-}
-
-export class EditItem implements Action {
-  readonly type = EDITITEM;
-
-  constructor(public item: IListItem) { }
-}
-
-export class ViewItem implements Action {
-  readonly type = VIEWITEM;
-
-  constructor(public item: IListItem) { }
-}
-
-export class FullScreen implements Action {
-  readonly type = FULLSCREEN;
-
-  constructor() { }
-}
-
-export class ShowNavBar implements Action {
-  readonly type = SHOWNAVBAR;
-
-  constructor() { }
-}
-
-export class UploadedFileClick implements Action {
-  readonly type = UPLOADEDFILECLICK;
-  constructor(public itemCode:string) { }
-}
-  
-
-export type Actions = OpenModal
-  | InitRoot
-  | InitRootSuccess
-  | CloseModal
-  | Login
-  | Initialized
-  | ItemChangedEvent
-  | ItemAddedEvent
-  | ItemDeletedEvent
-  | Escape
-  | LoadItemTypes
-  | LoadItemTypesSuccess
-  | DeleteItems
-  | DeleteItemsSuccess
-  | Fail
-  | EditItem
-  | ViewItem
-  | FullScreen
-  | ShowNavBar
-  | StartRouteLoading
-  | EndRouteLoading
-  | InitUser
-  | InitUserSuccess
-  | TaskStartEvent
-  | TaskEndEvent
-  | TaskErrorEvent;
+import { Action } from '@ngrx/store';
+
+import { IItemTypes } from '../models/item.types';
+import { IListItem } from '../models/list.item';
+import { IUser } from '../models/user';
+
+export const INITUSER = '[AppCommon] InitUser';
+export const INITUSERSUCCESS = '[AppCommon] InitUserSuccess';
+
+export const INITROOT = '[Explorer] InitRoot';
+export const INITROOTSUCCESS = '[Explorer] InitRootSuccess';
+
+export const OPENMODAL = '[AppCommon] OpenModal';
+export const CLOSEMODAL = '[AppCommon] CloseModal';
+export const LOGIN = '[AppCommon] Login';
+export const ESCAPE = '[AppCommon] Escape';
+
+export const LOADITEMTYPES = '[AppCommon] LoadItemTypes';
+export const LOADITEMTYPESSUCCESS = '[AppCommon] LoadItemTypesSuccess';
+
+export const ITEMCHANGEDEVENT = '[AppCommon] ItemChangedEvent';
+export const ITEMADDEDEVENT = '[AppCommon] ItemAddedEvent';
+export const ITEMDELETEDEVENT = '[AppCommon] ItemDeletedEvent';
+
+export const TASKSTARTEVENT = '[AppCommon] TaskStartEvent';
+export const TASKENDEVENT = '[AppCommon] TaskEndEvent';
+export const TASKERRORTEVENT = '[AppCommon] TaskErrorEvent';
+
+export const DEVICEUPDATEEVENT = '[AppCommon] DeviceUpdateEvent';
+
+export const DELETEITEMS = '[AppCommon] DeleteItems';
+export const DELETEITEMSSUCCESS = '[AppCommon] DeleteItemsSuccess';
+
+export const STARTROUTELOADING = '[AppCommon] StartRouteLoading';
+export const ENDROUTELOADING = '[AppCommon] EndRouteLoading';
+
+export const FULLSCREEN = '[AppCommon] FullScreen';
+export const SHOWNAVBAR = '[AppCommon] ShowNavBar';
+
+export const EDITITEM = "[AppCommon] EditItem";
+
+export const VIEWITEM = "[AppCommon] ViewItem";
+
+export const FAIL = '[AppCommon] Fail';
+
+export const UPLOADEDFILECLICK = '[AppCommon] UploadedFileClick';
+
+export const TOGGLEMENU = '[AppCommon] ToggleMenu';
+
+export const SETMENUVISIBLE = '[AppCommon] SetMenuVisible';
+
+export class InitUser implements Action {
+  readonly type = INITUSER;
+
+  constructor() { }
+}
+
+export class InitUserSuccess implements Action {
+  readonly type = INITUSERSUCCESS;
+
+  constructor(public user:IUser ) { }
+}
+
+export class InitRoot implements Action {
+  readonly type = INITROOT;
+
+  constructor() { }
+}
+
+export class InitRootSuccess implements Action {
+  readonly type = INITROOTSUCCESS;
+
+  constructor(public items:IListItem[]) { }
+}
+
+export class OpenModal implements Action {
+  readonly type = OPENMODAL;
+
+  constructor(public modalName: string) { }
+}
+
+export class CloseModal implements Action {
+  readonly type = CLOSEMODAL;
+
+  constructor() { }
+}
+
+export class StartRouteLoading implements Action {
+  readonly type = STARTROUTELOADING;
+
+  constructor() { }
+}
+
+export class EndRouteLoading implements Action {
+  readonly type = ENDROUTELOADING;
+
+  constructor() { }
+}
+
+export class Login implements Action {
+  readonly type = LOGIN;
+
+  constructor(public url: string) { }
+}
+
+export class Escape implements Action {
+  readonly type = ESCAPE;
+
+  constructor(public escapeKey:boolean, public click:boolean) { }
+}
+
+export class LoadItemTypes implements Action {
+  readonly type = LOADITEMTYPES;
+
+  constructor() { }
+}
+
+export class LoadItemTypesSuccess implements Action {
+  readonly type = LOADITEMTYPESSUCCESS;
+
+  constructor(public itemTypes: IItemTypes) { }
+}
+
+export class Fail implements Action {
+  readonly type = FAIL;
+
+  constructor(public payload: string) { }
+}
+
+export class ItemChangedEvent implements Action {
+  readonly type = ITEMCHANGEDEVENT;
+
+  constructor(public itemCode: string, public attributes: any) { }
+}
+
+export class ItemAddedEvent implements Action {
+  readonly type = ITEMADDEDEVENT;
+
+  constructor(public itemCode: string, public attributes: any) { }
+}
+
+export class ItemDeletedEvent implements Action {
+  readonly type = ITEMDELETEDEVENT;
+
+  constructor(public itemCode: string, public attributes: any) { }
+}
+
+export class TaskStartEvent implements Action {
+  readonly type = TASKSTARTEVENT;
+
+  constructor(public itemCode: string, public attributes: any) { }
+}
+
+export class TaskEndEvent implements Action {
+  readonly type = TASKENDEVENT;
+
+  constructor(public itemCode: string, public attributes: any) { }
+}
+
+export class TaskErrorEvent implements Action {
+  readonly type = TASKERRORTEVENT;
+
+  constructor(public itemCode: string, public attributes: any) { }
+}
+
+export class DeviceUpdateEvent implements Action {
+  readonly type = DEVICEUPDATEEVENT;
+
+  constructor(public itemCode: string, public attributes: any) { }
+}
+
+export class DeleteItems implements Action {
+  readonly type = DELETEITEMS;
+
+  constructor(public itemCodes: string[]) { }
+}
+
+export class DeleteItemsSuccess implements Action {
+  readonly type = DELETEITEMSSUCCESS;
+
+  constructor(public deletedItemCodes: string[]) { }
+}
+
+export class EditItem implements Action {
+  readonly type = EDITITEM;
+
+  constructor(public item: IListItem) { }
+}
+
+export class ViewItem implements Action {
+  readonly type = VIEWITEM;
+
+  constructor(public item: IListItem) { }
+}
+
+export class FullScreen implements Action {
+  readonly type = FULLSCREEN;
+
+  constructor() { }
+}
+
+export class ShowNavBar implements Action {
+  readonly type = SHOWNAVBAR;
+
+  constructor() { }
+}
+
+export class UploadedFileClick implements Action {
+  readonly type = UPLOADEDFILECLICK;
+  constructor(public itemCode:string) { }
+}
+
+export class ToggleMenu implements Action {
+  readonly type = TOGGLEMENU;
+
+  constructor() { }
+}
+
+export class SetMenuVisible implements Action {
+  readonly type = SETMENUVISIBLE;
+
+  constructor(public visible:boolean) { }
+}
+  
+
+export type Actions = OpenModal
+  | InitRoot
+  | InitRootSuccess
+  | CloseModal
+  | Login
+  | ItemChangedEvent
+  | ItemAddedEvent
+  | ItemDeletedEvent
+  | Escape
+  | LoadItemTypes
+  | LoadItemTypesSuccess
+  | DeleteItems
+  | DeleteItemsSuccess
+  | Fail
+  | EditItem
+  | ViewItem
+  | FullScreen
+  | ShowNavBar
+  | StartRouteLoading
+  | EndRouteLoading
+  | InitUser
+  | InitUserSuccess
+  | TaskStartEvent
+  | TaskEndEvent
+  | TaskErrorEvent
+  | DeviceUpdateEvent
+  | ToggleMenu
+  | SetMenuVisible;

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

@@ -1,41 +1,34 @@
-import {NgModule} from '@angular/core';
-import {RouterModule} from '@angular/router';
-
-import {AuthCallbackComponent} from './components/auth-callback/auth-callback.component';
-import {AuthCallbackGuard} from './components/auth-callback/auth-callback.guard';
-import {FullScreenGuard} from './services/full-screen-guard.service';
-import {SessionClearedComponent} from './components/session-cleared/session-cleared.component';
-import {NotFoundComponent} from './components/not-found/not-found.component';
-
-
-const routes = [
-  {
-    path: 'cb',
-    component: AuthCallbackComponent,
-    canActivate: [AuthCallbackGuard],
-  },
-  {
-    path: 'loggedout',
-    component: SessionClearedComponent,
-    canActivate: [FullScreenGuard],
-  },
-  {
-    path: '**', component: NotFoundComponent,
-    data: {
-      title: '404 - Not found',
-      meta: [{name: 'description', content: '404 - Error'}],
-      links: [],
-      // links: [
-      //  { rel: 'canonical', href: 'http://blogs.example.com/bootstrap/something' },
-      //  { rel: 'alternate', hreflang: 'es', href: 'http://es.example.com/bootstrap-demo' }
-      //]
-    },
-  },
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class AppCommonRoutingModule {
-}
+import {NgModule} from '@angular/core';
+import {RouterModule} from '@angular/router';
+
+import {AuthCallbackComponent} from './components/auth-callback/auth-callback.component';
+import {AuthCallbackGuard} from './components/auth-callback/auth-callback.guard';
+import {NavBarGuard} from './services/nav-bar-guard.service';
+import {FullScreenGuard} from './services/full-screen-guard.service';
+import {SessionClearedComponent} from './components/session-cleared/session-cleared.component';
+import {NotFoundComponent} from './components/not-found/not-found.component';
+
+
+const routes = [
+  {
+    path: 'cb',
+    component: AuthCallbackComponent,
+    canActivate: [AuthCallbackGuard],
+  },
+  {
+    path: 'loggedout',
+    component: SessionClearedComponent,
+    canActivate: [FullScreenGuard],
+  },
+  {
+    path: '**', component: NotFoundComponent,
+    canActivate: [NavBarGuard]   
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class AppCommonRoutingModule {
+}

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

@@ -0,0 +1,86 @@
+// angular modules
+import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector, Optional, SkipSelf } from '@angular/core';
+import { DatePipe } from '@angular/common';
+import { HTTP_INTERCEPTORS } from '@angular/common/http';
+
+// external modules
+import { OAuthModule, OAuthService, OAuthStorage } from 'angular-oauth2-oidc';
+
+
+//components
+import { ItemTypeService } from './services/itemtype.service';
+import { FolderService } from './services/folder.service';
+import { TimespanService } from './services/timespan.service';
+import { ItemService } from './services/item.service';
+import { EventService } from './services/event.service';
+import { TypeaheadService } from './services/typeahead.service';
+import { UserService } from './services/user.service';
+import { WeatherService} from './services/weather.service';
+import { AppConfig } from './shared/app.config';
+import { AccessTokenInterceptor } from "./shared/accesstoken.interceptor";
+import { appConfigFactory } from "./shared/app.config.factory";
+import { AuthGuard } from './services/auth-guard.service';
+import { NavBarGuard } from './services/nav-bar-guard.service';
+import { FullScreenGuard } from './services/full-screen-guard.service';
+import { CodeListItemService } from './services/codelistitem.service';
+import { AuthCallbackGuard } from './components/auth-callback/auth-callback.guard';
+import { ResumableFileUploadService } from './components/resumable-file-upload/resumable-file-upload.service';
+import { NgbDateNativeAdapter } from './services/date-adapter.service'
+import { AuthConfigFactory } from './shared/authconfigFactory';
+import { StateSerializerService } from './services/state-serializer.service';
+
+export {
+  FolderService,
+  ItemTypeService,
+  TimespanService,
+  ItemService,
+  EventService,
+  TypeaheadService,
+  UserService,
+  WeatherService,
+  CodeListItemService,
+  AppConfig,
+  AccessTokenInterceptor,
+  AuthGuard,
+  NavBarGuard,
+  FullScreenGuard,
+  AuthCallbackGuard,
+  ResumableFileUploadService,
+  NgbDateNativeAdapter,
+  StateSerializerService
+};
+
+@NgModule({
+  imports: [
+    OAuthModule.forRoot(),
+  ]
+})
+export class AppCommonServiceModule {
+  constructor(@Optional() @SkipSelf() parentModule: AppCommonServiceModule) {
+    if (parentModule) {
+      throw new Error(
+        'AppCommonServiceModule is already loaded. Import it in the AppModule only');
+    }
+  }
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: AppCommonServiceModule,
+      providers: [
+        AppConfig,
+        ItemTypeService,
+        {
+          provide: APP_INITIALIZER,
+          useFactory: appConfigFactory,
+          deps: [Injector, AppConfig, OAuthService, AuthConfigFactory, OAuthStorage,ItemTypeService],
+          multi: true
+        },
+        {
+          provide: HTTP_INTERCEPTORS,
+          useClass: AccessTokenInterceptor,
+          multi: true
+        },
+        DatePipe
+      ]
+    };
+  }
+}

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

@@ -1,80 +1,56 @@
 // angular modules
-import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector,Optional,SkipSelf } from '@angular/core';
+import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector, Optional, SkipSelf } from '@angular/core';
 import { CommonModule, DatePipe } from '@angular/common';
 import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { FormsModule } from '@angular/forms';
 
 // external modules
-import { OAuthModule,AuthConfig, OAuthService, OAuthStorage } from 'angular-oauth2-oidc';
-import { StoreModule,Store } from '@ngrx/store';
+import { OAuthModule, AuthConfig, OAuthService, OAuthStorage } from 'angular-oauth2-oidc';
+import { StoreModule, Store } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import {UploadxModule } from 'ngx-uploadx';
+import { UploadxModule } from 'ngx-uploadx';
 
 
 // routing module
 import { AppCommonRoutingModule } from './common-routing.module';
 
-import { MODULE_NAME }  from './module-name';
+import { MODULE_NAME } from './module-name';
 
 //components
-import { ItemTypeService } from './services/itemtype.service';
-import { FolderService } from './services/folder.service';
-import { TimespanService} from './services/timespan.service';
-import { ItemService} from './services/item.service';
-import { EventService } from './services/event.service';
-import { TypeaheadService } from './services/typeahead.service';
-import { UserService } from './services/user.service';
-import { AppConfig } from './shared/app.config';
-import { AccessTokenInterceptor } from "./shared/accesstoken.interceptor";
-import { appConfigFactory } from "./shared/app.config.factory";
-import { AuthGuard } from './services/auth-guard.service';
-import { NavBarGuard } from './services/nav-bar-guard.service';
-import { FullScreenGuard } from './services/full-screen-guard.service';
 import { SafePipe } from './shared/safe.pipe';
-import { AppComponent} from './components/app/app.component';
+import { AuthConfigFactory, IAuthconfigFactory } from './shared/authconfigFactory';
+import { AppComponent } from './components/app/app.component';
 import { AuthCallbackComponent } from './components/auth-callback/auth-callback.component';
-import { AuthCallbackGuard } from './components/auth-callback/auth-callback.guard';
 import { SessionClearedComponent } from './components/session-cleared/session-cleared.component';
-import { ResumableFileUploadService } from './components/resumable-file-upload/resumable-file-upload.service';
 import { ResumableFileUploadComponent } from './components/resumable-file-upload/resumable-file-upload.component';
 import { NotFoundComponent } from './components/not-found/not-found.component';
 import { NotImplementedComponent } from './components/not-implemented/not-implemented.component';
 import { SidePanelComponent } from './components/side-panel/side-panel.component';
 import { TimespanComponent } from './components/timespan/timespan.component';
 import { TagInputComponent } from './components/tag-input/tag-input.component';
-import {IEventMessage } from './models/event.message';
+import { MenuBackgroundComponent } from './components/menu-background/menu-background.component';
+import { IEventMessage } from './models/event.message';
 import { IItem, Item } from './models/item';
-import {IItemType} from './models/item.type';
-import {IItemTypes} from './models/item.types';
-import {IItemTask,ItemTask} from './models/itemTask';
-import {IListItem} from './models/list.item';
-import {ITypeaheadItem} from './models/typeahead.item';
-import {IUser} from './models/user';
+import { WeatherCurrentObservation } from './models/weatherCurrentObservation';
+import { IItemType } from './models/item.type';
+import { IItemTypes } from './models/item.types';
+import { IItemTask, ItemTask } from './models/itemTask';
+import { IListItem } from './models/list.item';
+import { ITypeaheadItem } from './models/typeahead.item';
+import { IUser } from './models/user';
+import { IQueryState } from './models/query.state';
+import { ICodeListItem } from './models/code.list.item';
 import * as commonActions from './actions/app-common.actions';
 import * as commonReducers from './reducers/app-common.reducer';
 import * as commonEffects from './effects/app-common.effects';
-import {NgbDateNativeAdapter} from './services/date-adapter.service'
-import { from } from 'rxjs';
+import { SecureOAuthStorage} from './shared/secureOAuthStorage';
 
-export {FolderService,
-  ItemTypeService,
-  TimespanService,
-  ItemService,
-  EventService,
-  TypeaheadService,
-  UserService,
-  AppConfig,
-  AccessTokenInterceptor,
-  AuthGuard,
-  NavBarGuard,
-  FullScreenGuard,
+export {
   SafePipe,
   AuthCallbackComponent,
-  AuthCallbackGuard,
   AppComponent,
   SessionClearedComponent,
-  ResumableFileUploadService,
   ResumableFileUploadComponent,
   NotFoundComponent,
   NotImplementedComponent,
@@ -91,9 +67,15 @@ export {FolderService,
   IListItem,
   ITypeaheadItem,
   IUser,
+  ICodeListItem,
+  IQueryState,
   commonActions,
   commonReducers,
-  NgbDateNativeAdapter
+  IAuthconfigFactory,
+  AuthConfigFactory,
+  MenuBackgroundComponent,
+  SecureOAuthStorage,
+  WeatherCurrentObservation
 };
 
 @NgModule({
@@ -101,16 +83,13 @@ export {FolderService,
     CommonModule,
     HttpClientModule,
     AppCommonRoutingModule,
-    StoreModule.forFeature(MODULE_NAME, commonReducers.reducer ),
+    StoreModule.forFeature(MODULE_NAME, commonReducers.reducer),
     EffectsModule.forFeature([commonEffects.AppCommonEffects]),
     OAuthModule.forRoot(),
     NgbModule,
     FormsModule,
     UploadxModule
   ],
-  providers: [
-    DatePipe
-  ],
   declarations: [
     AppComponent,
     AuthCallbackComponent,
@@ -121,14 +100,15 @@ export {FolderService,
     ResumableFileUploadComponent,
     TimespanComponent,
     TagInputComponent,
-    SessionClearedComponent
+    SessionClearedComponent,
+    MenuBackgroundComponent
   ],
   exports: [
     NgbModule,
     UploadxModule,
     CommonModule,
     AppComponent,
-    ResumableFileUploadComponent, 
+    ResumableFileUploadComponent,
     AuthCallbackComponent,
     SidePanelComponent,
     SafePipe,
@@ -137,33 +117,9 @@ export {FolderService,
     ResumableFileUploadComponent,
     TimespanComponent,
     TagInputComponent,
-    SessionClearedComponent
-    ]
+    SessionClearedComponent,
+    MenuBackgroundComponent
+  ]
 })
 export class AppCommonModule {
-  constructor (@Optional() @SkipSelf() parentModule: AppCommonModule) {
-    if (parentModule) {
-      throw new Error(
-        'AppCommonModule is already loaded. Import it in the AppModule only');
-    }
-  }
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: AppCommonModule,
-      providers: [
-        AppConfig,
-        {
-          provide: APP_INITIALIZER,
-          useFactory: appConfigFactory,
-          deps: [Injector, AppConfig, OAuthService],
-          multi: true
-        },       
-        {
-          provide: HTTP_INTERCEPTORS,
-          useClass: AccessTokenInterceptor,
-          multi: true
-        }
-      ]
-    };
-  }
 }

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

@@ -1,14 +1,26 @@
-<div class="app fullscreen" (click)="handleClick($event)" [ngClass]="{'fullscreen' :(fullScreen|async)}">
-  <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
-    <a class="navbar-brand" [routerLink]="['/']">Farm Maps <span *ngIf="routeLoading|async"><i class="fa fa-spinner fa-spin"></i></span></a>
-    <ul class="navbar-nav">
-      <li class="nav-item py-0"><a [routerLinkActive]="['active']" [routerLink]="['/map']" class="nav-link"><span><i class="fa fa-globe" aria-hidden="true"></i> Map</span></a></li>
-      <li class="nav-item py-0"><a [routerLinkActive]="['active']" [routerLink]="['/explorer']" class="nav-link"><span><i class="fa fa-folder" aria-hidden="true"></i> Explorer</span></a></li>
-    </ul>
-    <router-outlet name="menu"></router-outlet>
-  </nav>
-  <div class="body">
-    <router-outlet></router-outlet>
-  </div>
-  <fm-resumable-file-upload></fm-resumable-file-upload>
-</div>
+<div class="app fullscreen" (click)="handleClick($event)" [ngClass]="{'fullscreen' :(fullScreen|async)}">
+  <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
+    <button type="button" class="btn btn-outline-light" (click)="handleToggleMenu($event)"><i class="fa fa-bars" aria-hidden="true"></i></button>
+    <router-outlet name="menu" class="ml-4"></router-outlet>
+  </nav>
+  <div class="body">
+    <router-outlet></router-outlet>
+  </div>  
+  <fm-menu-background [visible]="menuVisible|async"></fm-menu-background>
+  <fm-side-panel [visible]="menuVisible|async" [left]="true" class="menu" (click)="handleStopBubble($event)">
+    <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>
+  <ng-container *ngIf="showUploadProgress">
+    <fm-resumable-file-upload></fm-resumable-file-upload>
+  </ng-container>  
+</div>

projects/common/src/fm/components/app/app.component.scss

@@ -1,72 +1,78 @@
-//@import "theme.scss";
-
-/* Import Bootstrap & Fonts */
-
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-// custom styles
-
-.btn:focus {
-  box-shadow:none;
-}
-
-.input-group > .form-control:focus {
-  z-index: auto;
-}
-
-.form-control:focus {
-  box-shadow: none;
-  border-color: $input-border-color;
-}
-
-
-/* *** Overall APP Styling can go here ***
-   --------------------------------------------
-   Note: This Component has ViewEncapsulation.None so the styles will bleed out
-
-*/
-
-body { background: #f1f1f1; line-height: 18px; user-select:none;}
-
-.navbar-brand {
-  padding-top: .5rem;
-  padding-bottom: .5rem;
-}
-
-.app {
-  width:100vw;
-  height:100vh;
-}
-
-.app > .navbar {
-  position: absolute;
-  transition: top 0.5s ease-out;
-  top:0;
-  left: 0;
-  right: 0;
-  height: 3.1rem;
-}
-
-.app > .body {
-  position: absolute;
-  transition: top 0.5s ease-out;
-  top: 3.1rem;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  overflow:hidden;
-}
-
-.app.fullscreen > .navbar {
-  top: -3.1rem;
-}
-
-.app.fullscreen > .body {
-  top:0;
-}
-
-.btn-primary, .btn-primary:hover {
-  color: #ffffff;
-}
-
+/* Import Bootstrap & Fonts */
+
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+// custom styles
+
+.btn:focus {
+  box-shadow:none;
+}
+
+.input-group > .form-control:focus {
+  z-index: auto;
+}
+
+.form-control:focus {
+  box-shadow: none;
+  border-color: $input-border-color;
+}
+
+
+/* *** Overall APP Styling can go here ***
+   --------------------------------------------
+   Note: This Component has ViewEncapsulation.None so the styles will bleed out
+
+*/
+
+body { background: #f1f1f1; line-height: 18px; user-select:none;}
+
+.navbar-brand {
+  padding-top: .5rem;
+  padding-bottom: .5rem;
+}
+
+.app {
+  width:100vw;
+  height:100vh;
+}
+
+.app > .navbar {
+  position: absolute;
+  transition: top 0.5s ease-out;
+  top:0;
+  left: 0;
+  right: 0;
+  height: 3.1rem;
+}
+
+.app > .body {
+  position: absolute;
+  transition: top 0.5s ease-out;
+  top: 3.1rem;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  overflow:hidden;
+}
+
+.app.fullscreen > .navbar {
+  top: -3.1rem;
+}
+
+.app.fullscreen > .body {
+  top:0;
+}
+
+.btn-primary, .btn-primary:hover {
+  color: #ffffff;
+}
+
+.menu .side-panel {
+  z-index: 100;
+  background-color: rgb(245,245,245);
+}
+
+.logo {
+  margin-left: 1rem;
+}

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

@@ -1,129 +1,145 @@
-import { Component, OnInit, OnDestroy, Inject, ViewEncapsulation, RendererFactory2, PLATFORM_ID, ChangeDetectionStrategy, HostListener } from '@angular/core';
-import { Router, NavigationEnd, RouteConfigLoadStart, RouteConfigLoadEnd, ActivatedRoute, PRIMARY_OUTLET } from '@angular/router';
-import { Meta, Title, DOCUMENT, MetaDefinition } from '@angular/platform-browser';
-import { Subscription ,  Observable } from 'rxjs';
-import { Store, Action } from '@ngrx/store';
-
-//AppCommon
-import { IEventMessage } from '../../models/event.message';
-import { IListItem} from '../../models/list.item';
-import { EventService } from '../../services/event.service';
-import * as  commonActions  from '../../actions/app-common.actions';
-
-import * as appReducers from '../../reducers/app-common.reducer';
-
-@Component({
-  selector: 'fm-app',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.scss'],
-  encapsulation: ViewEncapsulation.None,
-  changeDetection: ChangeDetectionStrategy.OnPush
-})
-export class AppComponent implements OnInit, OnDestroy {
-
-  // This will go at the END of your title for example "Home - Angular Universal..." <-- after the dash (-)
-  private endPageTitle: string = 'Farmmaps';
-  // If no Title is provided, we'll use a default one before the dash(-)
-  private defaultPageTitle: string = 'Farmmaps';
-
-  private routerSub$: Subscription;
-  private eventSub$: Subscription;
-
-  public currentFolder: Observable<IListItem>;
-  public folderParents: Observable<IListItem[]>;
-  public browseFileElement: any;
-  public browseDirectoryElement: any;
-  public fileDroptarget: any;
-  public fullScreen: Observable<boolean>;
-  public routeLoading: Observable<boolean>;
-
-  constructor(
-    private router: Router,
-    private activatedRoute: ActivatedRoute,
-    private title: Title,
-    private meta: Meta,
-    private store: Store<appReducers.State>,
-    private eventService: EventService,
-  ) {    
-  }
-
- 
-
-  getActionFromEvent(event: IEventMessage): Action {
-    var action: Action = null;
-    console.debug(`${event.eventType} Event received`);
-    switch (event.eventType) {
-      case "ItemChanged": {
-        action = new commonActions.ItemChangedEvent(event.itemCode, event.attributes);
-        break;
-      }
-      case "ItemAdded": {
-        action = new commonActions.ItemAddedEvent(event.itemCode, event.attributes);
-        break;
-      }
-      case "ItemDeleted": {
-        action = new commonActions.ItemDeletedEvent(event.itemCode, event.attributes);
-        break;
-      }
-      case "taskStart": {
-        action = new commonActions.TaskStartEvent(event.itemCode, event.attributes);
-        break;
-      }
-      case "taskEnd": {
-        action = new commonActions.TaskEndEvent(event.itemCode, event.attributes);
-        break;
-      }
-      case "taskError": {
-        action = new commonActions.TaskErrorEvent(event.itemCode, event.attributes);
-        break;
-      }
-    }
-    return action;
-  }
-
-  ngOnInit() {
-    this.fullScreen = this.store.select(appReducers.selectGetFullScreen);
-    this.routeLoading = this.store.select(appReducers.selectGetRouteLoading);
-    this.InstallRouteEventHandler();
-    this.InstallEventServiceEventHandler();
-  }
-
-  @HostListener('document:keyup', ['$event'])
-  keyUp(event: KeyboardEvent) {
-    let x = event.keyCode;
-    if (x === 27) {
-      this.store.dispatch(new commonActions.Escape(true,false));
-    }    
-  }
-
-  ngOnDestroy() {
-    // Subscription clean-up
-    if(this.routerSub$) this.routerSub$.unsubscribe();
-    if(this.eventSub$) this.eventSub$.unsubscribe();
-  }
-
-  private InstallRouteEventHandler() {
-    var other = this;
-    this.routerSub$ = this.router.events.subscribe(event => {
-      if (event instanceof RouteConfigLoadStart) {
-        other.store.dispatch(new commonActions.StartRouteLoading());
-      }
-      if (event instanceof RouteConfigLoadEnd) {
-        other.store.dispatch(new commonActions.EndRouteLoading());
-      }      
-    });     
-  }
-
-  private InstallEventServiceEventHandler() {
-    var other = this;
-    this.eventSub$ = this.eventService.event.subscribe(event => {
-      var action = other.getActionFromEvent(event);
-      if (action) other.store.dispatch(action);
-    });
-  }
-
-  handleClick(event: MouseEvent) {
-    this.store.dispatch(new commonActions.Escape(false,true));
-  }  
-}
-
+import { Component, OnInit, OnDestroy, Inject, ViewEncapsulation, RendererFactory2, PLATFORM_ID, ChangeDetectionStrategy, HostListener, Input } from '@angular/core';
+import { Router, NavigationStart, NavigationEnd, RouteConfigLoadStart, RouteConfigLoadEnd, ActivatedRoute, PRIMARY_OUTLET } from '@angular/router';
+import { Meta, Title, MetaDefinition } from '@angular/platform-browser';import { DOCUMENT } from "@angular/common";
+import { Subscription ,  Observable } from 'rxjs';
+import { Store, Action } from '@ngrx/store';
+
+//AppCommon
+import { IEventMessage } from '../../models/event.message';
+import { IListItem} from '../../models/list.item';
+import { EventService } from '../../services/event.service';
+import * as  commonActions  from '../../actions/app-common.actions';
+
+import * as appReducers from '../../reducers/app-common.reducer';
+
+@Component({
+  selector: 'fm-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss'],
+  encapsulation: ViewEncapsulation.None,
+  changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class AppComponent implements OnInit, OnDestroy {
+
+  // This will go at the END of your title for example "Home - Angular Universal..." <-- after the dash (-)
+  private endPageTitle: string = 'Farmmaps';
+  // If no Title is provided, we'll use a default one before the dash(-)
+  private defaultPageTitle: string = 'Farmmaps';
+
+  private routerSub$: Subscription;
+  private eventSub$: Subscription;
+
+  public currentFolder: Observable<IListItem>;
+  public folderParents: Observable<IListItem[]>;
+  public fullScreen: Observable<boolean>;
+  public routeLoading: Observable<boolean>;
+  public menuVisible: Observable<boolean>;
+  @Input() showUploadProgress: boolean =true;
+
+  constructor(
+    private router: Router,
+    private activatedRoute: ActivatedRoute,
+    private title: Title,
+    private meta: Meta,
+    private store: Store<appReducers.State>,
+    private eventService: EventService,
+  ) {    
+  }
+
+ 
+
+  getActionFromEvent(event: IEventMessage): Action {
+    var action: Action = null;
+    console.debug(`${event.eventType} Event received`);
+    switch (event.eventType) {
+      case "ItemChanged": {
+        action = new commonActions.ItemChangedEvent(event.itemCode, event.attributes);
+        break;
+      }
+      case "ItemAdded": {
+        action = new commonActions.ItemAddedEvent(event.itemCode, event.attributes);
+        break;
+      }
+      case "ItemDeleted": {
+        action = new commonActions.ItemDeletedEvent(event.itemCode, event.attributes);
+        break;
+      }
+      case "taskStart": {
+        action = new commonActions.TaskStartEvent(event.itemCode, event.attributes);
+        break;
+      }
+      case "taskEnd": {
+        action = new commonActions.TaskEndEvent(event.itemCode, event.attributes);
+        break;
+      }
+      case "taskError": {
+        action = new commonActions.TaskErrorEvent(event.itemCode, event.attributes);
+        break;
+      }
+      case "deviceUpdate": {
+        action = new commonActions.DeviceUpdateEvent(event.itemCode, event.attributes);
+        break;
+      }
+    }
+    return action;
+  }
+
+  ngOnInit() {
+    this.fullScreen = this.store.select(appReducers.selectGetFullScreen);
+    this.routeLoading = this.store.select(appReducers.selectGetRouteLoading);
+    this.menuVisible = this.store.select(appReducers.SelectGetMenuVisible);
+    this.InstallRouteEventHandler();
+    this.InstallEventServiceEventHandler();
+  }
+
+  @HostListener('document:keyup', ['$event'])
+  keyUp(event: KeyboardEvent) {
+    let x = event.keyCode;
+    if (x === 27) {
+      this.store.dispatch(new commonActions.Escape(true,false));
+    }    
+  }
+
+  ngOnDestroy() {
+    // Subscription clean-up
+    if(this.routerSub$) this.routerSub$.unsubscribe();
+    if(this.eventSub$) this.eventSub$.unsubscribe();
+  }
+
+  private InstallRouteEventHandler() {
+    var other = this;
+    this.routerSub$ = this.router.events.subscribe(event => {
+      if (event instanceof RouteConfigLoadStart) {
+        other.store.dispatch(new commonActions.StartRouteLoading());
+      }
+      if (event instanceof RouteConfigLoadEnd) {
+        other.store.dispatch(new commonActions.EndRouteLoading());
+      }      
+      if(event instanceof NavigationStart) {
+        other.store.dispatch(new commonActions.SetMenuVisible(false));
+      }
+    });     
+  }
+
+  private InstallEventServiceEventHandler() {
+    var other = this;
+    this.eventSub$ = this.eventService.event.subscribe(event => {
+      var action = other.getActionFromEvent(event);
+      if (action) other.store.dispatch(action);
+    });
+  }
+
+  handleClick(event: MouseEvent) {
+    this.store.dispatch(new commonActions.Escape(false,true));
+  }  
+
+  handleStopBubble(event: MouseEvent) {
+    event.stopPropagation();
+  }  
+
+  handleToggleMenu(event:MouseEvent) {
+    event.stopPropagation();
+    this.store.dispatch(new commonActions.ToggleMenu());
+  }
+}
+

projects/common/src/fm/components/menu-background/menu-background.component.html

@@ -0,0 +1,3 @@
+<div class="menu-background" [ngClass]="{'show':visible}">
+
+</div>

projects/common/src/fm/components/menu-background/menu-background.component.scss

@@ -0,0 +1,18 @@
+.menu-background {
+    display: block;
+    position: absolute;
+    top:0;
+    left:0;
+    right:0;
+    bottom:0;
+    opacity: 0;
+    background-color: #000000;
+    transition: opacity 0s ease-out 1s;
+    pointer-events: none;
+    z-index:99;
+}
+
+.menu-background.show {
+    pointer-events: all;
+    opacity: 0.3;
+}

projects/common/src/fm/components/menu-background/menu-background.component.ts

@@ -0,0 +1,23 @@
+import { Component, OnInit,Input } from '@angular/core';
+import { Store, Action } from '@ngrx/store';
+import * as appReducers from '../../reducers/app-common.reducer';
+import * as  commonActions  from '../../actions/app-common.actions';
+
+@Component({
+    selector: 'fm-menu-background',
+    templateUrl: './menu-background.component.html',
+    styleUrls: ['./menu-background.component.scss'],
+})
+export class MenuBackgroundComponent implements OnInit {
+    @Input() visible:boolean = false;
+    constructor(private store: Store<appReducers.State>) { }
+
+    ngOnInit() { }
+
+    handleOnClick(event:MouseEvent) {
+        if(this.visible) {
+            this.store.dispatch(new commonActions.SetMenuVisible(false));
+            event.stopPropagation();
+        }
+    }
+}

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

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

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

@@ -1,113 +1,111 @@
-@import "../../theme.scss";
-
-/* Import Bootstrap & Fonts */
-
-@import "~bootstrap/scss/bootstrap.scss";
-
-div.resumable-file-upload {
-  position: fixed;
-  right: 0px;
-  bottom: 0px;
-  width: 300px;
-  max-height: 250px;
-  /*z-index:2000 !important;*/
-}
-
-div.minimized {
-    height: 0px;
-}
-
-div.closed {
-    height: 0px;
-}
-
-div.card {
-    margin-bottom: 0px;
-}
-
-div.card-block {
-    max-height: calc(250px - 41px);
-    overflow-y: auto;
-}
-
-div.minimized div.card-block {
-    height: 0px;
-}
-
-div.card-header span.fa {
-    padding-left: 5px;
-}
-
-.upload-file {
-    padding-top: 3px;
-}
-
-    .upload-file .progress-container {
-        height: 3px;
-        width: 100%;
-        margin-top:4px;
-    }
-
-        .upload-file .progress-container .progress-bar {
-            display: block;
-            background-color: color("green");
-            width: 0%;
-            height: 100%;
-        }
-
-    .upload-file.done .progress-container .progress-bar {
-        display: none;
-    }
-
-    .upload-file > div > span.file-name {
-        display: inline-block;
-        width: calc(100% - 20px);
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        vertical-align: middle;
-    }
-
-    .upload-file > div > a.file-name {
-      display: inline-block;
-      width: calc(100% - 20px);
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      vertical-align: middle;
-  }
-
-.upload-file.busy > div > span.fa-times {
-  color: theme-color("danger");
-  width: 20px;
-  display: inline-block;
-  vertical-align: middle;
-}
-
-  .upload-file.done > div > span.fa-times {
-    display: none;
-  }
-
-  .upload-file.done > div > span.fa-check {
-    color: color("green");
-    width: 20px;
-    display: inline-block;
-    vertical-align: middle;
-  }
-
-  .upload-file > div.errormessage {
-    color: theme-color("danger");
-    display: none;
-  }
-
-  .upload-file.error > div.errormessage {
-    display: block;
-  }
-
-  .upload-file.busy > div > span.fa-check {
-    display: none;
-  }
-
-.resumable-file-upload ul {
-  padding:0px;
-}
+/* Import Bootstrap & Fonts */
+
+@import "~bootstrap/scss/bootstrap.scss";
+
+div.resumable-file-upload {
+  position: fixed;
+  right: 0px;
+  bottom: 0px;
+  width: 300px;
+  max-height: 250px;
+  /*z-index:2000 !important;*/
+}
+
+div.minimized {
+    height: 0px;
+}
+
+div.closed {
+    height: 0px;
+}
+
+div.card {
+    margin-bottom: 0px;
+}
+
+div.card-block {
+    max-height: calc(250px - 41px);
+    overflow-y: auto;
+}
+
+div.minimized div.card-block {
+    height: 0px;
+}
+
+div.card-header span.fa {
+    padding-left: 5px;
+}
+
+.upload-file {
+    padding-top: 3px;
+}
+
+    .upload-file .progress-container {
+        height: 3px;
+        width: 100%;
+        margin-top:4px;
+    }
+
+        .upload-file .progress-container .progress-bar {
+            display: block;
+            background-color: color("green");
+            width: 0%;
+            height: 100%;
+        }
+
+    .upload-file.done .progress-container .progress-bar {
+        display: none;
+    }
+
+    .upload-file > div > span.file-name {
+        display: inline-block;
+        width: calc(100% - 20px);
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        vertical-align: middle;
+    }
+
+    .upload-file > div > a.file-name {
+      display: inline-block;
+      width: calc(100% - 20px);
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      vertical-align: middle;
+  }
+
+.upload-file.busy > div > span.fa-times {
+  color: theme-color("danger");
+  width: 20px;
+  display: inline-block;
+  vertical-align: middle;
+}
+
+  .upload-file.done > div > span.fa-times {
+    display: none;
+  }
+
+  .upload-file.done > div > span.fa-check {
+    color: color("green");
+    width: 20px;
+    display: inline-block;
+    vertical-align: middle;
+  }
+
+  .upload-file > div.errormessage {
+    color: theme-color("danger");
+    display: none;
+  }
+
+  .upload-file.error > div.errormessage {
+    display: block;
+  }
+
+  .upload-file.busy > div > span.fa-check {
+    display: none;
+  }
+
+.resumable-file-upload ul {
+  padding:0px;
+}

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

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

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

@@ -1,100 +1,122 @@
-.side-panel {
-  position: absolute;
-  bottom: 0px;
-  width: 100%;
-  left: 0px;
-  top:50%;
-  transition: left 0.3s, top 0.3s;
-  background-color: white;
-  box-shadow: 0 0 20px rgba(0, 0, 0, 0.3);
-}
-
-.side-panel.resizing {
-  transition: left 0s, top 0s;
-}
-
-.side-panel.collapsed {
-  left:-22rem;
-}
-
-.arrow {
-  position: absolute;
-  top: 1rem;
-  left: 100%;  
-  background-color: inherit;
-  cursor:pointer;
-}
-
-.arrow i {
-  transition: transform 0.3s;
-}
-
-.collapsed .arrow i {
-  -webkit-transform: rotate(180deg);
-  transform: rotate(180deg);
-}
-
-.side-panel.hidden {
-  top:100%;
-}
-
-.content {
-  height:100% ;
-  width:100%;
-  overflow:hidden;
-  overflow-y:auto;
-  position: relative;
-  z-index: 1;
-  background-color: rgb(255,255,255);
-}
-
-.resizegrip {
-  height:2rem;
-  line-height: 1rem;
-  display: none;
-  text-align: center;
-  position: relative;
-  z-index: 2; 
-}
-div.resizegrip > div {
-  position: absolute;
-  top:0px;
-  height: 1rem;
-  width: 100%;
-  background-color: rgb(255,255,255);
-}
-
-div.resizegrip > span {
-  position: relative;
-  display: inline-block;
-  height:0.3rem;
-  width:4rem;
-  background-color:rgba(0, 0, 0, 0.3);
-  top:-0.3rem;
-}
-
-.resizeable .resizegrip {
-  display:block;
-  
-}
-
-.resizeable .content {
-  height:calc(100% - 1rem);
-  top:-1rem;
-}
-
-@media screen and (min-width:44rem) {
-  .side-panel {
-    top:0px;
-    width: 22rem;
-    height:100%;
-    left:0px;
-  }
-
-  .side-panel.hidden {
-    width: 22rem;
-    left:-24rem;
-    height:100%;
-  }
-
-}
+.side-panel {
+  position: absolute;
+  bottom: 0px;
+  width: 100%;
+  left: 0px;
+  top:50%;
+  transition: left 0.2s, top 0.2s;
+  background-color: white;
+  box-shadow: 0 0 20px rgba(0, 0, 0, 0.3);
+}
+
+.side-panel.resizing {
+  transition: left 0s, top 0s;
+}
+
+.side-panel.collapsed {
+  left:-22rem;
+}
+
+.arrow {
+  position: absolute;
+  top: 1rem;
+  left: 100%;  
+  background-color: inherit;
+  cursor:pointer;
+}
+
+.arrow i {
+  transition: transform 0.2s;
+}
+
+.collapsed .arrow i {
+  -webkit-transform: rotate(180deg);
+  transform: rotate(180deg);
+}
+
+.side-panel.hidden {
+  top:100%;
+}
+
+.content {
+  height:100% ;
+  width:100%;
+  overflow:hidden;
+  overflow-y:auto;
+  position: relative;
+  z-index: 1;
+  background-color: rgb(255,255,255);
+}
+
+.resizegrip {
+  height:2rem;
+  line-height: 1rem;
+  display: none;
+  text-align: center;
+  position: relative;
+  z-index: 2; 
+}
+div.resizegrip > div {
+  position: absolute;
+  top:0px;
+  height: 1rem;
+  width: 100%;
+  background-color: rgb(255,255,255);
+}
+
+div.resizegrip > span {
+  position: relative;
+  display: inline-block;
+  height:0.3rem;
+  width:4rem;
+  background-color:rgba(0, 0, 0, 0.3);
+  top:-0.3rem;
+}
+
+.resizeable .resizegrip {
+  display:block;
+  
+}
+
+.resizeable .content {
+  height:calc(100% - 1rem);
+  top:-1rem;
+}
+
+@media screen and (min-width:40rem) {
+  .side-panel {
+    top:0px;
+    width: 22rem;
+    height:100%;
+    left:0px;
+  }
+
+  .side-panel.hidden {
+    width: 22rem;
+    left:-24rem;
+    height:100%;
+  }  
+}
+
+
+.side-panel.left {
+  top:0px;
+  width: 80%;
+  height:100%;
+  left:0px;
+}
+
+.side-panel.left.hidden {
+  width: 80%;
+  left:-80%;
+  height:100%;
+}  
+
+@media screen and (min-width:40rem) {
+  .side-panel.left {
+    width:22rem;
+  }
+  .side-panel.left.hidden {
+    width:22rem;
+  }  
+}

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

@@ -1,85 +1,87 @@
-import { Component, Input,ViewChild,ElementRef,OnChanges,SimpleChanges,HostListener,ChangeDetectorRef  } from '@angular/core';
-
-@Component({
-  selector: 'fm-side-panel',
-  templateUrl: 'side-panel.component.html',
-  styleUrls: ['side-panel.component.scss']
-})
-
-
-export class SidePanelComponent  implements OnChanges {
-  @Input() public visible: boolean;
-  @Input() public collapsed: boolean;
-  @Input() public collapsable: boolean;
-  @Input() public resizeable: boolean = false;
-  @ViewChild("resizeGrip") elementView: ElementRef;
-  public mobile:boolean = true;
-  private parentHeight:number = 0;
-  public top = "100%";
-  private resizeTop:number=50;
-  public resizing:boolean=false;
-
-  constructor(private element: ElementRef,private ref: ChangeDetectorRef) {
-    this.collapsable = false;
-    this.setTop();
-  }
-
-  checkMobile():boolean {
-    let size = parseFloat(getComputedStyle(document.documentElement).width);
-    let rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
-    let threshold = 44 * rem;
-    return !(size>threshold);
-  }
-
-  setTop() {
-    this.mobile = this.checkMobile();
-    this.resizeTop = this.mobile?50:0;
-    this.top =  (this.visible?this.resizeTop: (this.mobile? 100:0)) + "%";
-  }
-
-  ngAfterViewInit() {
-    this.parentHeight = this.element.nativeElement.offsetParent.clientHeight;
-  }
-
-  handleToggleClick(event) {
-    if (this.collapsable) {
-      this.collapsed = !this.collapsed;     
-    }
-  }
-
-  handleStartGripDrag(event:DragEvent|TouchEvent) {
-    this.resizing=true;
-    if(event instanceof DragEvent) {
-      var crt = new Image();
-      crt.style.display = "none"; 
-      document.body.appendChild(crt);
-      event.dataTransfer.setDragImage(crt,0,0);
-    }   
-  }
-
-  handleEndGripDrag() {
-    this.resizing = false;
-  }
-
-  handleGripDrag(event:DragEvent|TouchEvent) {
-    var clientY = 0;
-    if((event instanceof TouchEvent)) {
-      clientY = (event as TouchEvent).changedTouches[0].clientY;
-    } else {
-      clientY=(event as DragEvent).clientY;
-    }
-    this.resizeTop =  Math.min(98, Math.max(0, clientY / (this.parentHeight  / 100)));
-    this.top =  (this.visible? this.resizeTop:(this.mobile? 100:0)) + "%";
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    if(changes.visible) {
-      this.top =  (changes.visible.currentValue?this.resizeTop:(this.mobile? 100:0)) + "%";
-    }    
-  }
-
-  @HostListener('window:resize', ['$event'])
-  onResize(event) {
-    this.setTop();
-  }
-}
+import { Component, Input,ViewChild,ElementRef,OnChanges,SimpleChanges,HostListener,ChangeDetectorRef  } from '@angular/core';
+
+@Component({
+  selector: 'fm-side-panel',
+  templateUrl: 'side-panel.component.html',
+  styleUrls: ['side-panel.component.scss']
+})
+
+
+export class SidePanelComponent  implements OnChanges {
+  @Input() public visible: boolean;
+  @Input() public collapsed: boolean;
+  @Input() public collapsable: boolean;
+  @Input() public resizeable: boolean = false;
+  @Input() public left: boolean = false;
+  @ViewChild("resizeGrip", { static: false }) elementView: ElementRef;
+  public mobile:boolean = true;
+  private parentHeight:number = 0;
+  public top = "100%";
+  private resizeTop:number=50;
+  public resizing:boolean=false;
+
+  constructor(private element: ElementRef,private ref: ChangeDetectorRef) {
+    this.collapsable = false;
+    this.setTop();
+  }
+
+  checkMobile():boolean {
+    let size = parseFloat(getComputedStyle(document.documentElement).width);
+    let rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
+    let threshold = 40 * rem;
+    return !(size>threshold);
+  }
+
+  setTop() {
+    this.mobile = this.left?false: this.checkMobile();
+    this.resizeTop = this.mobile?50:0;
+    this.top =  (this.visible?this.resizeTop: (this.mobile? 100:0)) + "%";
+  }
+
+  ngAfterViewInit() {
+    this.parentHeight = this.element.nativeElement.offsetParent.clientHeight;
+    this.setTop();
+  }
+
+  handleToggleClick(event) {
+    if (this.collapsable) {
+      this.collapsed = !this.collapsed;     
+    }
+  }
+
+  handleStartGripDrag(event:DragEvent|TouchEvent) {
+    this.resizing=true;
+    if(event instanceof DragEvent) {
+      var crt = new Image();
+      crt.style.display = "none"; 
+      document.body.appendChild(crt);
+      event.dataTransfer.setDragImage(crt,0,0);
+    }   
+  }
+
+  handleEndGripDrag() {
+    this.resizing = false;
+  }
+
+  handleGripDrag(event:DragEvent|TouchEvent) {
+    var clientY = 0;
+    if((event instanceof TouchEvent)) {
+      clientY = (event as TouchEvent).changedTouches[0].clientY;
+    } else {
+      clientY=(event as DragEvent).clientY;
+    }
+    this.resizeTop =  Math.min(98, Math.max(0, clientY / (this.parentHeight  / 100)));
+    this.top =  (this.visible? this.resizeTop:(this.mobile? 100:0)) + "%";
+  }
+
+  ngOnChanges(changes: SimpleChanges) {
+    if(changes.visible) {
+      this.top =  (changes.visible.currentValue?this.resizeTop:(this.mobile? 100:0)) + "%";
+    }    
+  }
+
+  @HostListener('window:resize', ['$event'])
+  onResize(event) {
+    this.setTop();
+  }
+}