AW-3912 fix build

# Conflicts:
#	package.json
#	projects/common-map/src/fm-map/common-map.module.ts
#	projects/common/src/fm/reducers/app-common.reducer.ts

Jenkinsfile

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

Jenkinsfile.develop

@@ -8,21 +8,21 @@ pipeline {
     stage('npm install'){
       steps {
         sh '''rm -rf node_modules/
-        npm install
+        npm install --legacy-peer-deps
         cd projects/common
-        npm install
+        npm install --legacy-peer-deps
         cd ../common-map
-        npm install
+        npm install --legacy-peer-deps
         cd ../common-map3d
-        npm install
+        npm install --legacy-peer-deps
         '''
       }
     }
     stage('build'){
       steps {
-        sh '''ng build common
-        ng build common-map
-        ng build common-map3d'''
+        sh '''ng build common --configuration production
+        ng build common-map --configuration production
+        ng build common-map3d --configuration production'''
       }
     }
     stage('npm publish'){

angular.json

@@ -48,7 +48,7 @@
             "styles": [
               "src/styles.css",
               "node_modules/bootstrap/dist/css/bootstrap.min.css",
-              "node_modules/font-awesome/css/font-awesome.min.css",              
+              "fontawesome-5.15.2/css/all.min.css",
               "fonts/FMIconFont/style.css",
               "node_modules/cesium/Build/Cesium/Widgets/widgets.css",
               "node_modules/ol/ol.css"
@@ -83,6 +83,31 @@
                   "maximumWarning": "6kb"
                 }
               ]
+            },
+            "development": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": false,
+              "sourceMap": true,
+              "namedChunks": true,
+              "extractLicenses": false,
+              "vendorChunk": false,
+              "buildOptimizer": false,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "7mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ]
             }
           }
         },
@@ -94,8 +119,12 @@
           "configurations": {
             "production": {
               "browserTarget": "farmmaps-lib-app:build:production"
+            },
+            "development": {
+              "browserTarget": "farmmaps-lib-app:build:development"
             }
-          }
+          },
+          "defaultConfiguration": "development"
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
@@ -169,7 +198,7 @@
       "prefix": "fm",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "projects/common/tsconfig.lib.json",
             "project": "projects/common/ng-package.json"           
@@ -209,7 +238,7 @@
       "prefix": "fm-map",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
             "tsConfig": "projects/common-map/tsconfig.lib.json",
             "project": "projects/common-map/ng-package.json"

custom-webpack.config.js

@@ -1,5 +1,6 @@
 module.exports = {
-    node: {
+  resolve: {
+    fallback: {
       // Resolve node module use of fs
       fs: "empty",
       Buffer: false,
@@ -7,4 +8,5 @@ module.exports = {
       https: "empty",
       zlib: "empty"
     }
-  };
+  }
+};

fontawesome-5.15.2/css/brands.css

@@ -0,0 +1,15 @@
+/*!
+ * Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Commercial License)
+ */
+@font-face {
+  font-family: 'Font Awesome 5 Brands';
+  font-style: normal;
+  font-weight: 400;
+  font-display: block;
+  src: url("../webfonts/fa-brands-400.eot");
+  src: url("../webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.woff") format("woff"), url("../webfonts/fa-brands-400.ttf") format("truetype"), url("../webfonts/fa-brands-400.svg#fontawesome") format("svg"); }
+
+.fab {
+  font-family: 'Font Awesome 5 Brands';
+  font-weight: 400; }

fontawesome-5.15.2/css/brands.min.css

@@ -0,0 +1,5 @@
+/*!
+ * Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Commercial License)
+ */
+@font-face{font-family:"Font Awesome 5 Brands";font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-brands-400.eot);src:url(../webfonts/fa-brands-400.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-brands-400.woff2) format("woff2"),url(../webfonts/fa-brands-400.woff) format("woff"),url(../webfonts/fa-brands-400.ttf) format("truetype"),url(../webfonts/fa-brands-400.svg#fontawesome) format("svg")}.fab{font-family:"Font Awesome 5 Brands";font-weight:400}

fontawesome-5.15.2/css/light.css

@@ -0,0 +1,15 @@
+/*!
+ * Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Commercial License)
+ */
+@font-face {
+  font-family: 'Font Awesome 5 Pro';
+  font-style: normal;
+  font-weight: 300;
+  font-display: block;
+  src: url("../webfonts/fa-light-300.eot");
+  src: url("../webfonts/fa-light-300.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-light-300.woff2") format("woff2"), url("../webfonts/fa-light-300.woff") format("woff"), url("../webfonts/fa-light-300.ttf") format("truetype"), url("../webfonts/fa-light-300.svg#fontawesome") format("svg"); }
+
+.fal {
+  font-family: 'Font Awesome 5 Pro';
+  font-weight: 300; }

fontawesome-5.15.2/css/light.min.css

@@ -0,0 +1,5 @@
+/*!
+ * Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Commercial License)
+ */
+@font-face{font-family:"Font Awesome 5 Pro";font-style:normal;font-weight:300;font-display:block;src:url(../webfonts/fa-light-300.eot);src:url(../webfonts/fa-light-300.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-light-300.woff2) format("woff2"),url(../webfonts/fa-light-300.woff) format("woff"),url(../webfonts/fa-light-300.ttf) format("truetype"),url(../webfonts/fa-light-300.svg#fontawesome) format("svg")}.fal{font-family:"Font Awesome 5 Pro";font-weight:300}

fontawesome-5.15.2/css/regular.css

@@ -0,0 +1,15 @@
+/*!
+ * Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Commercial License)
+ */
+@font-face {
+  font-family: 'Font Awesome 5 Pro';
+  font-style: normal;
+  font-weight: 400;
+  font-display: block;
+  src: url("../webfonts/fa-regular-400.eot");
+  src: url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.woff") format("woff"), url("../webfonts/fa-regular-400.ttf") format("truetype"), url("../webfonts/fa-regular-400.svg#fontawesome") format("svg"); }
+
+.far {
+  font-family: 'Font Awesome 5 Pro';
+  font-weight: 400; }

fontawesome-5.15.2/css/regular.min.css

@@ -0,0 +1,5 @@
+/*!
+ * Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Commercial License)
+ */
+@font-face{font-family:"Font Awesome 5 Pro";font-style:normal;font-weight:400;font-display:block;src:url(../webfonts/fa-regular-400.eot);src:url(../webfonts/fa-regular-400.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-regular-400.woff2) format("woff2"),url(../webfonts/fa-regular-400.woff) format("woff"),url(../webfonts/fa-regular-400.ttf) format("truetype"),url(../webfonts/fa-regular-400.svg#fontawesome) format("svg")}.far{font-family:"Font Awesome 5 Pro";font-weight:400}

fontawesome-5.15.2/css/solid.css

@@ -0,0 +1,16 @@
+/*!
+ * Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Commercial License)
+ */
+@font-face {
+  font-family: 'Font Awesome 5 Pro';
+  font-style: normal;
+  font-weight: 900;
+  font-display: block;
+  src: url("../webfonts/fa-solid-900.eot");
+  src: url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.woff") format("woff"), url("../webfonts/fa-solid-900.ttf") format("truetype"), url("../webfonts/fa-solid-900.svg#fontawesome") format("svg"); }
+
+.fa,
+.fas {
+  font-family: 'Font Awesome 5 Pro';
+  font-weight: 900; }

fontawesome-5.15.2/css/solid.min.css

@@ -0,0 +1,5 @@
+/*!
+ * Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Commercial License)
+ */
+@font-face{font-family:"Font Awesome 5 Pro";font-style:normal;font-weight:900;font-display:block;src:url(../webfonts/fa-solid-900.eot);src:url(../webfonts/fa-solid-900.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.woff) format("woff"),url(../webfonts/fa-solid-900.ttf) format("truetype"),url(../webfonts/fa-solid-900.svg#fontawesome) format("svg")}.fa,.fas{font-family:"Font Awesome 5 Pro";font-weight:900}

fontawesome-5.15.2/css/svg-with-js.css

@@ -0,0 +1,371 @@
+/*!
+ * Font Awesome Pro 5.15.2 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Commercial License)
+ */
+svg:not(:root).svg-inline--fa {
+  overflow: visible; }
+
+.svg-inline--fa {
+  display: inline-block;
+  font-size: inherit;
+  height: 1em;
+  overflow: visible;
+  vertical-align: -.125em; }
+  .svg-inline--fa.fa-lg {
+    vertical-align: -.225em; }
+  .svg-inline--fa.fa-w-1 {
+    width: 0.0625em; }
+  .svg-inline--fa.fa-w-2 {
+    width: 0.125em; }
+  .svg-inline--fa.fa-w-3 {
+    width: 0.1875em; }
+  .svg-inline--fa.fa-w-4 {
+    width: 0.25em; }
+  .svg-inline--fa.fa-w-5 {
+    width: 0.3125em; }
+  .svg-inline--fa.fa-w-6 {
+    width: 0.375em; }
+  .svg-inline--fa.fa-w-7 {
+    width: 0.4375em; }
+  .svg-inline--fa.fa-w-8 {
+    width: 0.5em; }
+  .svg-inline--fa.fa-w-9 {
+    width: 0.5625em; }
+  .svg-inline--fa.fa-w-10 {
+    width: 0.625em; }
+  .svg-inline--fa.fa-w-11 {
+    width: 0.6875em; }
+  .svg-inline--fa.fa-w-12 {
+    width: 0.75em; }
+  .svg-inline--fa.fa-w-13 {
+    width: 0.8125em; }
+  .svg-inline--fa.fa-w-14 {
+    width: 0.875em; }
+  .svg-inline--fa.fa-w-15 {
+    width: 0.9375em; }
+  .svg-inline--fa.fa-w-16 {
+    width: 1em; }
+  .svg-inline--fa.fa-w-17 {
+    width: 1.0625em; }
+  .svg-inline--fa.fa-w-18 {
+    width: 1.125em; }
+  .svg-inline--fa.fa-w-19 {
+    width: 1.1875em; }
+  .svg-inline--fa.fa-w-20 {
+    width: 1.25em; }
+  .svg-inline--fa.fa-pull-left {
+    margin-right: .3em;
+    width: auto; }
+  .svg-inline--fa.fa-pull-right {
+    margin-left: .3em;
+    width: auto; }
+  .svg-inline--fa.fa-border {
+    height: 1.5em; }
+  .svg-inline--fa.fa-li {
+    width: 2em; }
+  .svg-inline--fa.fa-fw {
+    width: 1.25em; }
+
+.fa-layers svg.svg-inline--fa {
+  bottom: 0;
+  left: 0;
+  margin: auto;
+  position: absolute;
+  right: 0;
+  top: 0; }
+
+.fa-layers {
+  display: inline-block;
+  height: 1em;
+  position: relative;
+  text-align: center;
+  vertical-align: -.125em;
+  width: 1em; }
+  .fa-layers svg.svg-inline--fa {
+    -webkit-transform-origin: center center;
+            transform-origin: center center; }
+
+.fa-layers-text, .fa-layers-counter {
+  display: inline-block;
+  position: absolute;
+  text-align: center; }
+
+.fa-layers-text {
+  left: 50%;
+  top: 50%;
+  -webkit-transform: translate(-50%, -50%);
+          transform: translate(-50%, -50%);
+  -webkit-transform-origin: center center;
+          transform-origin: center center; }
+
+.fa-layers-counter {
+  background-color: #ff253a;
+  border-radius: 1em;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  color: #fff;
+  height: 1.5em;
+  line-height: 1;
+  max-width: 5em;
+  min-width: 1.5em;
+  overflow: hidden;
+  padding: .25em;
+  right: 0;
+  text-overflow: ellipsis;
+  top: 0;
+  -webkit-transform: scale(0.25);
+          transform: scale(0.25);
+  -webkit-transform-origin: top right;
+          transform-origin: top right; }
+
+.fa-layers-bottom-right {
+  bottom: 0;
+  right: 0;
+  top: auto;
+  -webkit-transform: scale(0.25);
+          transform: scale(0.25);
+  -webkit-transform-origin: bottom right;
+          transform-origin: bottom right; }
+
+.fa-layers-bottom-left {
+  bottom: 0;
+  left: 0;
+  right: auto;
+  top: auto;
+  -webkit-transform: scale(0.25);
+          transform: scale(0.25);
+  -webkit-transform-origin: bottom left;
+          transform-origin: bottom left; }
+
+.fa-layers-top-right {
+  right: 0;
+  top: 0;
+  -webkit-transform: scale(0.25);
+          transform: scale(0.25);
+  -webkit-transform-origin: top right;
+          transform-origin: top right; }
+
+.fa-layers-top-left {
+  left: 0;
+  right: auto;
+  top: 0;
+  -webkit-transform: scale(0.25);
+          transform: scale(0.25);
+  -webkit-transform-origin: top left;
+          transform-origin: top left; }
+
+.fa-lg {
+  font-size: 1.33333em;
+  line-height: 0.75em;
+  vertical-align: -.0667em; }
+
+.fa-xs {
+  font-size: .75em; }
+
+.fa-sm {
+  font-size: .875em; }
+
+.fa-1x {
+  font-size: 1em; }
+
+.fa-2x {
+  font-size: 2em; }
+
+.fa-3x {
+  font-size: 3em; }
+
+.fa-4x {
+  font-size: 4em; }
+
+.fa-5x {
+  font-size: 5em; }
+
+.fa-6x {
+  font-size: 6em; }
+
+.fa-7x {
+  font-size: 7em; }
+
+.fa-8x {
+  font-size: 8em; }
+
+.fa-9x {
+  font-size: 9em; }
+
+.fa-10x {
+  font-size: 10em; }
+
+.fa-fw {
+  text-align: center;
+  width: 1.25em; }
+
+.fa-ul {
+  list-style-type: none;
+  margin-left: 2.5em;
+  padding-left: 0; }
+  .fa-ul > li {
+    position: relative; }
+
+.fa-li {
+  left: -2em;
+  position: absolute;
+  text-align: center;
+  width: 2em;
+  line-height: inherit; }
+
+.fa-border {
+  border: solid 0.08em #eee;
+  border-radius: .1em;
+  padding: .2em .25em .15em; }
+
+.fa-pull-left {
+  float: left; }
+
+.fa-pull-right {
+  float: right; }
+
+.fa.fa-pull-left,
+.fas.fa-pull-left,
+.far.fa-pull-left,
+.fal.fa-pull-left,
+.fab.fa-pull-left {
+  margin-right: .3em; }
+
+.fa.fa-pull-right,
+.fas.fa-pull-right,
+.far.fa-pull-right,
+.fal.fa-pull-right,
+.fab.fa-pull-right {
+  margin-left: .3em; }
+
+.fa-spin {
+  -webkit-animation: fa-spin 2s infinite linear;
+          animation: fa-spin 2s infinite linear; }
+
+.fa-pulse {
+  -webkit-animation: fa-spin 1s infinite steps(8);
+          animation: fa-spin 1s infinite steps(8); }
+
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg); }
+  100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg); } }
+
+@keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg); }
+  100% {
+    -webkit-transform: rotate(360deg);
+            transform: rotate(360deg); } }
+
+.fa-rotate-90 {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
+  -webkit-transform: rotate(90deg);
+          transform: rotate(90deg); }
+
+.fa-rotate-180 {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
+  -webkit-transform: rotate(180deg);
+          transform: rotate(180deg); }
+
+.fa-rotate-270 {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
+  -webkit-transform: rotate(270deg);
+          transform: rotate(270deg); }
+
+.fa-flip-horizontal {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
+  -webkit-transform: scale(-1, 1);
+          transform: scale(-1, 1); }
+
+.fa-flip-vertical {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
+  -webkit-transform: scale(1, -1);
+          transform: scale(1, -1); }
+
+.fa-flip-both, .fa-flip-horizontal.fa-flip-vertical {
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
+  -webkit-transform: scale(-1, -1);
+          transform: scale(-1, -1); }
+
+:root .fa-rotate-90,
+:root .fa-rotate-180,
+:root .fa-rotate-270,
+:root .fa-flip-horizontal,
+:root .fa-flip-vertical,
+:root .fa-flip-both {
+  -webkit-filter: none;
+          filter: none; }
+
+.fa-stack {
+  display: inline-block;
+  height: 2em;
+  position: relative;
+  width: 2.5em; }
+
+.fa-stack-1x,
+.fa-stack-2x {
+  bottom: 0;
+  left: 0;
+  margin: auto;
+  position: absolute;
+  right: 0;
+  top: 0; }
+
+.svg-inline--fa.fa-stack-1x {
+  height: 1em;
+  width: 1.25em; }
+
+.svg-inline--fa.fa-stack-2x {
+  height: 2em;
+  width: 2.5em; }
+
+.fa-inverse {
+  color: #fff; }
+
+.sr-only {
+  border: 0;
+  clip: rect(0, 0, 0, 0);
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
+  width: 1px; }
+
+.sr-only-focusable:active, .sr-only-focusable:focus {
+  clip: auto;
+  height: auto;
+  margin: 0;
+  overflow: visible;
+  position: static;
+  width: auto; }
+
+.svg-inline--fa .fa-primary {
+  fill: var(--fa-primary-color, currentColor);
+  opacity: 1;
+  opacity: var(--fa-primary-opacity, 1); }
+
+.svg-inline--fa .fa-secondary {
+  fill: var(--fa-secondary-color, currentColor);
+  opacity: 0.4;
+  opacity: var(--fa-secondary-opacity, 0.4); }
+
+.svg-inline--fa.fa-swap-opacity .fa-primary {
+  opacity: 0.4;
+  opacity: var(--fa-secondary-opacity, 0.4); }
+
+.svg-inline--fa.fa-swap-opacity .fa-secondary {
+  opacity: 1;
+  opacity: var(--fa-primary-opacity, 1); }
+
+.svg-inline--fa mask .fa-primary,
+.svg-inline--fa mask .fa-secondary {
+  fill: black; }
+
+.fad.fa-inverse {
+  color: #fff; }

fonts/FMIconFont/style.css

@@ -23,6 +23,36 @@
   content: "b";
 }
 
+.fm-trijntje:before {
+  content: "c";
+}
+
+.fm-satellite:before {
+  content: "d";
+}
+
+.fm-sensoterra:before {
+  content: "e";
+}
+
+.fm-blight:before {
+  content: "f";
+}
+
+.fm-agrodatacube:before {
+  content: "g";
+}
+
+.fm-app-menu:before {
+  content: "h";
+}
+
+.fm-blight-holes:before {
+  content: "i";
+}
+
+hallo
+
 @font-face {
   font-family: "FarmMaps";
   src: url("./FMIconFont.woff") format("woff"), /* Modern Browsers */

package.json

@@ -1,6 +1,6 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "0.0.1",
+  "version": "2.1.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -11,62 +11,64 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~10.1.3",
-    "@angular/common": "~10.1.3",
-    "@angular/compiler": "~10.1.3",
-    "@angular/core": "~10.1.3",
-    "@angular/forms": "~10.1.3",
-    "@angular/platform-browser": "~10.1.3",
-    "@angular/platform-browser-dynamic": "~10.1.3",
-    "@angular/router": "~10.1.3",
-    "@farmmaps/common": ">=0.0.1-prerelease.434 <0.0.1",
-    "@farmmaps/common-map": ">=0.0.1-prerelease.434 <0.0.1",
-    "@farmmaps/common-map3d": ">=0.0.1-prerelease.434 <0.0.1",
-    "@microsoft/signalr": "^3.1.3",
-    "@ng-bootstrap/ng-bootstrap": "^7.0",
-    "@ngrx/effects": "^10.0",
-    "@ngrx/router-store": "^10.0",
-    "@ngrx/store": "^10.0",
-    "angular-oauth2-oidc": "^10.0.3",
-    "bootstrap": "^4.4.1",
-    "cesium": "^1.73.0",
-    "core-js": "^2.6.11",
-    "font-awesome": "^4.7.0",
-    "ngrx-store-localstorage": "^10.0",
-    "ngx-bootstrap": "^5.6.1",
-    "ngx-openlayers": "1.0.0-next.16",
+    "@angular/animations": "~12.2.8",
+    "@angular/common": "~12.2.8",
+    "@angular/compiler": "~12.2.8",
+    "@angular/core": "~12.2.8",
+    "@angular/forms": "~12.2.8",
+    "@angular/platform-browser": "~12.2.8",
+    "@angular/platform-browser-dynamic": "~12.2.8",
+    "@angular/router": "~12.2.8",
+    "@farmmaps/common": "file:dist/common",
+    "@farmmaps/common-map": "file:dist/common-map",
+    "@farmmaps/common-map3d": "file:dist/common-map3d",
+    "@microsoft/signalr": "^3.1.16",
+    "@ng-bootstrap/ng-bootstrap": "^9.0",
+    "@ngrx/effects": "^12.0",
+    "@ngrx/router-store": "^12.0",
+    "@ngrx/store": "^12.0",
+    "angular-oauth2-oidc": "^12.0",
+    "bootstrap": "^4.6.0",
+    "cesium": "^1.82.1",
+    "core-js": "^2.6.12",
+    "moment": "^2.29.1",
+    "ngrx-store-localstorage": "^12.0",
+    "ngx-avatar": "^4.1.0",
+    "ngx-clipboard": "^14.0.1",
+    "ngx-image-cropper": "^3.3.5",
+    "ngx-openlayers": "1.0.0-next.19",
     "ngx-uploadx": "^3.5.1",
-    "ol": "6.1.1",
-    "ol-cesium": "^2.11.3",
+    "ol": "6.8.1",
+    "ol-cesium": "^2.13.0",
     "resumablejs": "^1.1.0",
-    "rxjs": "^6.5.4",
+    "rxjs": "^6.6.7",
     "tassign": "^1.0.0",
-    "tslib": "^2.0.0",
-    "zone.js": "~0.10.2",
-    "moment": "^2.27.0"
+    "tslib": "^2.2.0",
+    "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.1001.3",
-    "@angular-devkit/build-ng-packagr": "~0.1001.3",
-    "@angular/cli": "^10.1.3",
-    "@angular/compiler-cli": "~10.1.3",
-    "@angular/language-service": "~10.1.3",
-    "@angular-builders/custom-webpack": "~10.0.1",
+    "@angular-builders/custom-webpack": "^12.1.3",
+    "@angular-devkit/build-angular": "^12.2.8",
+    "@angular/cli": "^12.2.8",
+    "@angular/compiler-cli": "~12.2.8",
+    "@angular/language-service": "~12.2.8",
+    "@angular/localize": "^12.2.8",
+    "@types/arcgis-rest-api": "^10.4.5",
     "@types/jasmine": "~2.8.8",
-    "@types/jasminewd2": "~2.0.3",
-    "@types/node": "^12.11.1",
+    "@types/jasminewd2": "^2.0.9",
+    "@types/node": "^12.20.15",
     "codelyzer": "^5.1.2",
     "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.0.0",
+    "karma": "~6.3.3",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",
-    "karma-jasmine-html-reporter": "^1.5.0",
-    "ng-packagr": "^10.1.0",
+    "karma-jasmine-html-reporter": "^1.6.0",
+    "ng-packagr": "^12.2.2",
     "protractor": "~7.0.0",
     "ts-node": "^8.8.1",
     "tslint": "~6.1.0",
-    "typescript": "~4.0.3"
+    "typescript": "~4.3.5"
   }
 }

projects/common-map/ng-package.json

@@ -4,7 +4,7 @@
   "lib": {
     "entryFile": "src/public-api.ts"
   },
-  "whitelistedNonPeerDependencies": [
+  "allowedNonPeerDependencies": [
     "."
   ]
 }

projects/common-map/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farmmaps/common-map",
-  "version": "0.0.1",
+  "version": "2.0.0",
   "publishConfig": {
     "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
   },
@@ -8,14 +8,14 @@
     "tslib": "^2.0.0"
   },
   "peerDependencies": {
-    "@angular/core": "^10.1.3",
-    "ngrx-store-localstorage": "^10.0",
-    "@ngrx/effects": "^10.0",
-    "@ngrx/router-store": "^10.0",
-    "@ngrx/store": "^10.0",
+    "@angular/core": "~12.2.8",
+    "ngrx-store-localstorage": "^12.0",
+    "@ngrx/effects": "^12.0",
+    "@ngrx/router-store":"^12.0",
+    "@ngrx/store":"^12.0",
     "tassign": "^1.0.0",
-    "@farmmaps/common": ">=0.0.1-prerelease.420 <0.0.1",
-    "ngx-openlayers": "1.0.0-next.16",
-    "ol": "6.1.1"
+    "@farmmaps/common": "~2.0",
+    "ngx-openlayers": "1.0.0-next.19",
+    "ol": "6.8.1"
   }
 }

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

@@ -2,20 +2,26 @@ import { Action } from '@ngrx/store';
 
 import { IMapState } from '../models/map.state';
 import { IItemLayer } from '../models/item.layer';
+import { ILayervalue } from '../models/layer.value';
 import { IQueryState } from '@farmmaps/common';
 import { IItem } from '@farmmaps/common';
-import { Feature,Style } from 'ol';
+import { Feature } from 'ol';
+import { Style } from 'ol/style';
+import { Geometry } from 'ol/geom';
+import { IPeriodState } from '../models/period.state';
 
 export const SETSTATE = '[Map] SetState';
 export const SETMAPSTATE = '[Map] MapState';
 export const SETVIEWEXTENT = '[Map] SetViewExtent';
 export const INIT = '[Map] Init';
 export const SETPARENT = '[Map] SetParent';
+export const SETPERIOD = '[Map] SetPeriod';
 export const STARTSEARCH = '[Map] StartSearch';
 export const STARTSEARCHSUCCESS = '[Map] StartSearchSuccess';
 export const SELECTFEATURE = '[Map] SelectFeature';
 export const SELECTITEM = '[Map] SelectItem';
 export const SELECTITEMSUCCESS = '[Map] SelectItemSuccess';
+export const SETSELECTEDITEMLAYER = '[Map] SetSelectedItemLayer';
 export const SELECTTEMPORALITEMSSUCCESS = '[Map] SelectTemporalItemsSuccess';
 export const NEXTTEMPORAL = '[Map] NextTemporal';
 export const PREVIOUSTEMPORAL = '[Map] PreviousTemporal';
@@ -32,6 +38,7 @@ export const SETVISIBILITY = '[Map] SetVisibility';
 export const SETOPACITY = '[Map] SetOpacity';
 export const SETLAYERINDEX = '[Map] SetLayerIndex';
 export const REMOVELAYER = '[Map] RemoveLayer';
+export const CLEARLAYERS = '[Map] ClearLayers';
 export const LOADBASELAYERS = '[Map] LoadLayers';
 export const LOADBASELAYERSSUCCESS = '[Map] LoadLayersSuccess';
 export const SELECTBASELAYER = '[Map] SelectBaseLayers';
@@ -42,6 +49,11 @@ export const SETSTYLE = '[Map] SetStyle';
 export const SHOWLAYERSWITCHER = '[Map] ShowLayerSwitcher';
 export const CLEAR = '[Map] Clear';
 export const SETREPLACEURL = '[Map] SetReplaceUrl';
+export const SETFEATURES = '[Map] SetFeatures'
+export const SETLAYERVALUESLOCATION = '[Map] SetLayerValuesLocation'
+export const TOGGLELAYERVALUESENABLED = '[Map] ToggleLayerValuesEnabled'
+export const GETLAYERVALUE = '[Map] GetLayerValue'
+export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess'
 
 export class Clear implements Action {
   readonly type = CLEAR;
@@ -78,6 +90,12 @@ export class SetParent implements Action {
   constructor(public parentCode:string) { }
 }
 
+export class SetPeriod implements Action {
+  readonly type = SETPERIOD;
+
+  constructor(public period:IPeriodState) { }
+}
+
 export class StartSearch implements Action {
   readonly type = STARTSEARCH;
 
@@ -87,13 +105,13 @@ export class StartSearch implements Action {
 export class StartSearchSuccess implements Action {
   readonly type = STARTSEARCHSUCCESS;
 
-  constructor(public features: Array<Feature>, public query:IQueryState,public setStateCount:number) { }
+  constructor(public features: Array<Feature<Geometry>>, public query:IQueryState) { }
 }
 
 export class SelectFeature implements Action {
   readonly type = SELECTFEATURE;
 
-  constructor(public feature:Feature) { }
+  constructor(public feature:Feature<Geometry>) { }
 }
 
 export class SelectItem implements Action {
@@ -135,13 +153,13 @@ export class SelectTemporal implements Action {
 export class AddFeatureSuccess implements Action {
   readonly type = ADDFEATURESUCCESS;
 
-  constructor(public feature: Feature) { }
+  constructor(public feature: Feature<Geometry>) { }
 }
 
 export class UpdateFeatureSuccess implements Action {
   readonly type = UPDATEFEATURESUCCESS;
 
-  constructor(public feature: Feature) { }
+  constructor(public feature: Feature<Geometry>) { }
 }
 
 export class ExpandSearch implements Action {
@@ -180,6 +198,12 @@ export class AddLayer implements Action {
   constructor(public item:IItem,public layerIndex=-1) { }
 }
 
+export class SetSelectedItemLayer implements Action {
+  readonly type = SETSELECTEDITEMLAYER;
+
+  constructor(public item:IItem,public layerIndex=-1) { }
+}
+
 export class SetVisibility implements Action {
   readonly type = SETVISIBILITY;
 
@@ -204,6 +228,12 @@ export class RemoveLayer implements Action {
   constructor(public itemLayer: IItemLayer) { }
 }
 
+export class ClearLayers implements Action {
+  readonly type = CLEARLAYERS;
+
+  constructor() { }
+}
+
 export class LoadBaseLayers implements Action {
   readonly type = LOADBASELAYERS;
 
@@ -237,13 +267,13 @@ export class ZoomToExtent implements Action {
 export class DoQuery implements Action {
   readonly type = DOQUERY;
 
-  constructor(public query:IQueryState) { }
+  constructor(public query:IQueryState,public replace:boolean = false) { }
 }
 
 export class SetStyle implements Action {
   readonly type = SETSTYLE;
 
-  constructor(public itemType:string,public style: Style | (Feature)) { }
+  constructor(public itemType:string,public style: Style | ((feature:Feature<Geometry>) => Style )) { }
 }
 
 export class ShowLayerSwitcher implements Action {
@@ -256,6 +286,36 @@ export class SetReplaceUrl implements Action {
   constructor(public replaceUrl:boolean) {}
 }
 
+export class SetFeatures implements Action {
+  readonly type = SETFEATURES;
+
+  constructor(public features: Array<Feature<Geometry>>) { }
+}
+
+export class SetLayerValuesLocation implements Action {
+  readonly type = SETLAYERVALUESLOCATION;
+
+  constructor(public x:number, public y:number) { }
+}
+
+export class ToggleLayerValuesEnabled implements Action {
+  readonly type = TOGGLELAYERVALUESENABLED;
+
+  constructor() { }
+}
+
+export class GetLayerValue implements Action {
+  readonly type = GETLAYERVALUE;
+
+  constructor(public itemLayer:IItemLayer,public x:number,public y:number) { }
+}
+
+export class GetLayerValueSuccess implements Action {
+  readonly type = GETLAYERVALUESUCCESS;
+
+  constructor(public layervalue:ILayervalue) { }
+}
+
 export type Actions = SetMapState
   | Init
   | Clear
@@ -278,6 +338,7 @@ export type Actions = SetMapState
   | SetTimeSpan
   | AddLayer
   | RemoveLayer
+  | ClearLayers
   | SetVisibility
   | SetOpacity
   | SetLayerIndex
@@ -291,5 +352,12 @@ export type Actions = SetMapState
   | DoQuery
   | SetStyle
   | ShowLayerSwitcher
-  | SetReplaceUrl;
+  | SetReplaceUrl
+  | SetFeatures
+  | SetSelectedItemLayer
+  | SetLayerValuesLocation
+  | ToggleLayerValuesEnabled
+  | GetLayerValueSuccess
+  | GetLayerValue
+  | SetPeriod;
 

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

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

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

@@ -18,8 +18,8 @@ import * as mapEffects from './effects/map.effects';
 
 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 { IItemLayer,ItemLayer,ITemporalItemLayer,TemporalItemLayer } from './models/item.layer';
+import { IClickedFeature } from './models/clicked.feature';
 import { IPeriodState } from './models/period.state';
 
 // components
@@ -59,6 +59,7 @@ import { LayerVectorImageComponent } from './components/aol/layer-vector-image/l
 import {FeatureIconService} from './services/feature-icon.service';
 import { GeolocationService } from './services/geolocation.service';
 import {DeviceOrientationService} from './services/device-orientation.service';
+import { TemporalService} from './services/temporal.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';
@@ -68,6 +69,10 @@ import { PanToLocation} from './components/aol/pan-to-location/pan-to-location.c
 import {LayerSwitcher} from './components/layer-switcher/layer-switcher.component';
 import {HistogramDetailsComponent} from './components/legend/histogram-details/histogram-details.component';
 import {StatisticsDetailsComponent} from './components/legend/statistics-details/statistics-details.component';
+import { ifZoomToShowDirective} from './components/if-zoom-to-show/if-zoom-to-show.directive';
+import { ZoomToShowAlert} from './components/zoom-to-show-alert/zoom-to-show-alert.component';
+import { LayerValuesComponent } from './components/aol/layer-values/layer-values.component';
+import { GeometryThumbnailComponent } from './components/feature-thumbnail/feature-thumbnail.component';
 
 export function LocalStorageSync(reducer: ActionReducer<any>): ActionReducer<any> {
   const r = function(state, action) {
@@ -78,9 +83,17 @@ export function LocalStorageSync(reducer: ActionReducer<any>): ActionReducer<any
         if(ms) {
           r2["mapState"] = JSON.parse(ms);
         }
+        let sp = window.localStorage.getItem(MODULE_NAME+"_searchPeriod");
+        if(sp) {          
+          let p = JSON.parse(sp);
+          r2["period"] = { startDate: new Date(Date.parse(p.startDate)),endDate:new Date(Date.parse(p.endDate))};
+        }
     }
     if(action.type == "[Map] MapState" || action.type == "[Map] SetState") {
-        window.localStorage.setItem(MODULE_NAME + "_mapState",JSON.stringify(r2["mapState"]));
+      window.localStorage.setItem(MODULE_NAME + "_mapState",JSON.stringify(r2["mapState"]));
+    }
+    if(action.type == "[Map] SetPeriod" ) {
+      window.localStorage.setItem(MODULE_NAME + "_searchPeriod",JSON.stringify(r2["period"]));
     }
 
     return r2;
@@ -138,6 +151,7 @@ export {
   FeatureIconService,
   GeolocationService,
   DeviceOrientationService,
+  TemporalService,
   IMapState,
   ISelectedFeatures,
   IItemLayer,
@@ -146,7 +160,13 @@ export {
   ForChild,
   ForItemType,
   ForSourceTask,
-  ForPackage
+  ForPackage ,
+  ITemporalItemLayer,
+  TemporalItemLayer,
+  ifZoomToShowDirective,
+  ZoomToShowAlert,
+  IClickedFeature,
+  GeometryThumbnailComponent
 }
 
 @NgModule({
@@ -198,7 +218,11 @@ export {
     PanToLocation,
     LayerSwitcher,
     HistogramDetailsComponent,
-    StatisticsDetailsComponent
+    StatisticsDetailsComponent,
+    ifZoomToShowDirective,
+    ZoomToShowAlert,
+    LayerValuesComponent,
+    GeometryThumbnailComponent
   ],
   entryComponents: [
     FeatureListComponent,
@@ -250,32 +274,31 @@ export {
        FeatureListCroppingschemeComponent,
        FeatureListCropfieldComponent,
        FeatureListFeatureContainerComponent,
-       ZoomToExtentComponent
+       ZoomToExtentComponent,
+       ifZoomToShowDirective,
+       ZoomToShowAlert,
+       GeometryThumbnailComponent
+  ],
+  providers: [
+    FeatureIconService,
+    GeolocationService,
+    DeviceOrientationService,
+    TemporalService,
+    { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
+    { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
+    { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
+    { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
+    { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
+    { provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
+    { provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
+    { provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
+    { provide: AbstractSelectedItemComponent, useClass: SelectedItemTemporalComponent, multi: true },
+    { provide: AbstractSelectedItemComponent, useClass: SelectedItemShapeComponent, multi: true },
+    { provide: AbstractItemListItemComponent, useClass: ItemListItemComponent, multi: true },
+    { provide: AbstractItemListComponent, useClass: ItemListComponent, multi: true }
   ]
 })
 
 
-export class AppCommonMapModule {
-  static forRoot(): ModuleWithProviders<AppCommonMapModule> {
-    return {
-      ngModule: AppCommonMapModule,
-      providers: [
-        FeatureIconService,
-        GeolocationService,
-        DeviceOrientationService,
-        { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
-        { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
-        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
-        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
-        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
-        { provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
-        { provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
-        { provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
-        { provide: AbstractSelectedItemComponent, useClass: SelectedItemTemporalComponent, multi: true },
-        { provide: AbstractSelectedItemComponent, useClass: SelectedItemShapeComponent, multi: true },
-        { provide: AbstractItemListItemComponent, useClass: ItemListItemComponent, multi: true },
-        { provide: AbstractItemListComponent, useClass: ItemListComponent, multi: true }
-      ]
-    };
-  }
+export class AppCommonMapModule {  
 }

projects/common-map/src/fm-map/components/aol/file-drop-target/file-drop-target.component.ts

@@ -4,7 +4,7 @@ import { MapComponent } from 'ngx-openlayers';
 import * as proj  from 'ol/proj';
 import {Point,Geometry} from 'ol/geom';
 import { GeoJSON } from 'ol/format';
-import { Feature } from 'ol';
+import { Feature} from 'ol';
 
 export interface IDroppedFile {
   files: any,
@@ -21,7 +21,7 @@ export class FileDropTargetComponent implements OnInit, OnDestroy {
   element: Element;
   @Output() onFileDropped = new EventEmitter<IDroppedFile>();
   @Input() parentCode: string;
-  @Input() features: Array<Feature>;
+  @Input() features: Array<Feature<Geometry>>;
 
   constructor(private map: MapComponent) {
   }

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

@@ -6,8 +6,8 @@
         <stop offset="100%" class="stop2" />
       </linearGradient>
     </defs>
-    <circle class="tolerance" cx="500" cy="500" stroke="none" [attr.r]="locTolerancePixels" />
-    <path *ngIf="showHeading" class="heading" stroke="none" [attr.d]="path" fill="url(#grad1)" [attr.transform]="rotate"></path>
+    <circle class="tolerance hidden" [ngClass]="{'hidden':!showTolerance}" cx="500" cy="500" stroke="none" [attr.r]="locTolerancePixels" />
+    <path class="heading hidden" [ngClass]="{'hidden': !showHeading }" stroke="none" [attr.d]="path" fill="url(#grad1)" [attr.transform]="rotate"></path>
     <circle class="border" cx="500" cy="500" r="7" stroke="none" />
     <circle class="center" cx="500" cy="500" r="6" stroke="none" />
 

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

@@ -9,11 +9,19 @@
   stroke-width: 0;
 }
 
+.heading.hidden {
+  display: none;
+}
+
 .tolerance {
   fill: $primary;
   fill-opacity:0.4;
 }
 
+.tolerance.hidden {
+  display: none
+}
+
 .border {
   fill: $white;
 }

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

@@ -1,6 +1,6 @@
 import { Component, OnInit, Input, ViewChild, ElementRef, OnChanges, SimpleChanges ,Host} from '@angular/core';
 import { MapComponent } from 'ngx-openlayers';
-import Overlay from 'ol/Overlay';
+import  Overlay  from 'ol/Overlay';
 import { fromLonLat, toLonLat } from 'ol/proj';
 
 
@@ -13,10 +13,11 @@ export class GpsLocation  implements OnInit,OnChanges{
 
   @Input() enable:boolean;
   public instance: Overlay;
-  @Input() position: Position;
+  @Input() position: GeolocationPosition;
   @Input() location: number[]=[0,0];
   @Input() locationTolerance: number = 0;
   @Input() showHeading: boolean = false;
+  @Input() showTolerance: boolean = false;
   @Input() heading: number = 0;
   @Input() headingTolerance: number = 0;
   public locTolerancePixels: number = 0;
@@ -26,7 +27,7 @@ export class GpsLocation  implements OnInit,OnChanges{
   initialized:boolean = false;
   @ViewChild('location', { static: true }) locationElement: ElementRef;
 
-  constructor(@Host() private map: MapComponent) {
+  constructor(private map: MapComponent) {
     
   }
 
@@ -51,7 +52,7 @@ export class GpsLocation  implements OnInit,OnChanges{
     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.map.instance.getView().on('change:resolution', (evt:any) => {
       this.resolution = evt.target.get('resolution');
       this.recalcLocationTolerance();
     });
@@ -60,7 +61,7 @@ export class GpsLocation  implements OnInit,OnChanges{
 
   ngOnChanges(changes: SimpleChanges) {
     if (changes.position && this.instance) {
-      var p = changes.position.currentValue as Position;
+      var p = changes.position.currentValue as GeolocationPosition;
       if(p && this.initialized) {
         this.instance.setPosition(fromLonLat([p.coords.longitude, p.coords.latitude]));
         this.locationTolerance = p.coords.accuracy;

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

@@ -1,23 +1,23 @@
-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 { Component, Host, Input, Output, EventEmitter,OnDestroy, OnInit, OnChanges, SimpleChanges, forwardRef } from '@angular/core';
+import { LayerGroupComponent, MapComponent } from 'ngx-openlayers';
 import { ItemService,IItem,AppConfig } from '@farmmaps/common';
-import { IItemLayer,ItemLayer, ITemporalItemLayer} from '../../../models/item.layer';
+import { IItemLayer, ITemporalItemLayer} from '../../../models/item.layer';
 import { ILayerData} from '../../../models/layer.data';
-import { IRenderoutputTiles,IRenderoutputImage,IGradientstop,ILayer,IHistogram} from '../../../models/color.map';
+import { IRenderoutputTiles,IRenderoutputImage,IGradientstop,ILayer,IHistogram,IColor} 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,TileJSON} from 'ol/source';
+import {XYZ,ImageStatic,OSM,BingMaps,TileWMS,TileArcGISRest,TileJSON,Source} from 'ol/source';
 import {Vector as VectorSource} from 'ol/source';
 import { Vector as VectorLayer } from 'ol/layer';
 import VectorTileSource from 'ol/source/VectorTile';
 import VectorTileLayer from 'ol/layer/VectorTile';
 import {GeoJSON,MVT} from 'ol/format';
-import { from } from 'rxjs';
+import { Geometry } from 'ol/geom';
+import TileSource from 'ol/source/Tile';
 
 @Component({
   selector: 'fm-map-item-layers',
@@ -27,13 +27,18 @@ import { from } from 'rxjs';
   ]
 })
 
-export class ItemLayersComponent extends LayerGroupComponent implements OnChanges, OnInit {
+export class ItemLayersComponent extends LayerGroupComponent implements OnChanges, OnInit,OnDestroy {
   @Input() itemLayers: IItemLayer[];
   @Input() itemLayer: IItemLayer;
+  @Output() onFeatureSelected: EventEmitter<any> = new EventEmitter<any>();
+  @Output() onFeatureHover: EventEmitter<any> = new EventEmitter<any>();
   private _apiEndPoint: string;
   private initialized:boolean = false;
-
-  constructor(private itemService: ItemService, @Host() private map: MapComponent, public appConfig: AppConfig) {
+  private mapEventHandlerInstalled = false;
+  private selectedFeatures = {};
+  private selectionLayer:Layer<Source> = null;
+  
+  constructor(private itemService: ItemService, private map: MapComponent, public appConfig: AppConfig) {
     super(map);
     this._apiEndPoint = appConfig.getConfig("apiEndPoint");
   }
@@ -49,11 +54,8 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
      return "#" + this.componentToHex(r) + this.componentToHex(g) + this.componentToHex(b) + this.componentToHex(a);
   }
 
-  getColorFromGradient(item:IItem,layer: ILayer,  feature): style.Style {
-    var value = layer.indexKey ? feature.get(layer.indexKey): feature.get(layer.name);
-    var key = item.code + "_" + value;
-    if(!this.styleCache[key]) {
-      var gradient: IGradientstop[] = layer.renderer.colorMap.gradient;
+  getColorFromGradient(layer: ILayer, value: number): IColor {
+    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];
@@ -65,34 +67,63 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     }
     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 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));
 
-    this.styleCache[key] = new style.Style(
-      {
-        image: new style.Circle({
-          fill: new style.Fill({
-            color: this.rgbaToHex(red,green,blue,alpha)
+    return { alpha: alpha, red: red, green: green, blue: blue };
+  }
+
+  getColorForValue(layer: ILayer, value: number): IColor {
+    var color: IColor =  { alpha:0,red:0,green:0,blue:0};
+    if(layer.renderer.colorMap.entries.length>0) {
+      color=layer.renderer.colorMap.noValue;
+    }
+    layer.renderer.colorMap.entries.forEach((entry) => {
+        if(entry.value==value) {
+          color =entry.color;
+          return;
+        }
+    });
+
+    return color;
+  }
+
+  getColor(item: IItem, layer: ILayer, feature): style.Style {
+    var value = layer.indexKey ? feature.get(layer.indexKey) : feature.get(layer.name);
+    var key = item.code + "_" + value;
+    if (!this.styleCache[key]) {
+      var color: IColor;
+      if(layer.renderer.colorMap.colormapType == "manual") {
+        color = this.getColorForValue(layer, value);
+      } else {
+        color = this.getColorFromGradient(layer, value);
+      }
+
+      this.styleCache[key] = new style.Style(
+        {
+          image: new style.Circle({
+            fill: new style.Fill({
+              color: this.rgbaToHex(color.red, color.green, color.blue, color.alpha)
+            }),
+            radius: 3
           }),
-          radius: 3
-        }),
-        fill: new style.Fill({
-          color: this.rgbaToHex(red, green, blue, alpha)
-        }),
-        stroke: new style.Stroke({
-          color: this.rgbaToHex(red, green, blue, 255),
-          width: 1.25
-        }),
-      });
+          fill: new style.Fill({
+            color: this.rgbaToHex(color.red, color.green, color.blue, color.alpha)
+          }),
+          stroke: new style.Stroke({
+            color: this.rgbaToHex(color.red, color.green, color.blue, 255),
+            width: 1.25
+          }),
+        });
     }
     return this.styleCache[key];
   }
 
-  createGeotiffLayer(item:IItem,itemLayer:IItemLayer):Layer {
+  createGeotiffLayer(item:IItem,itemLayer:IItemLayer):Layer<Source> {
     var layerIndex = -1;
-    var layer: Layer = null;  
+    var layer: Layer<Source> = null;  
     layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index;
     let source = new XYZ({ maxZoom: 19, minZoom: 1, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` });
     layer = new Tile({ source: source });
@@ -113,9 +144,9 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     return layer;
   }
 
-  createShapeLayer(item:IItem,itemLayer:IItemLayer):Layer {
+  createShapeLayer(item:IItem,itemLayer:IItemLayer):Layer<Source> {
     var layerIndex = -1;
-    var layer: Layer = null; 
+    var layer: Layer<Source> = null; 
     layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index;
     var data = item.data;
     var l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null;
@@ -130,7 +161,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
           url: `${this._apiEndPoint}/api/v1/items/${item.code}/vectortiles/{z}/{x}/{y}.pbf?v=${Date.parse(item.updated)}`
         }),
         style: (feature) => {
-          return this.getColorFromGradient(item,l, feature);
+          return this.getColor(item,l, feature);
         }
       })
     } else if (l && l.rendering && l.rendering.renderoutputType == "Tiles") {
@@ -148,7 +179,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
       let source = new VectorSource({
         strategy: loadingstrategy.bbox,
         loader: function (extent: Extent, resolution: number, projection: Projection) {
-          var source = this as VectorSource;
+          var source = this as VectorSource<Geometry>;
           __this.itemService.getItemFeatures(item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) {
             var features = format.readFeatures(data);
             for (let f of features) {
@@ -201,9 +232,39 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     return layer;
   }
 
-  createExternalLayer(item:IItem,itemLayer:IItemLayer):Layer {
+  createSelectionLayer(itemLayer:IItemLayer):Layer<Source> {
+    var layerIndex = -1;
+    var layer: Layer<Source> = null; 
+    layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : itemLayer.item.data.layers[0].index;
+    var data = itemLayer.item.data;
+    var l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null;
+    if (l && l.rendering && l.rendering.renderoutputType == "VectorTiles") {
+      return new VectorTileLayer({
+        renderMode: 'vector',
+        source: (itemLayer.layer as VectorTileLayer).getSource(),
+        style: (feature) => {
+          if (feature.getId() in this.selectedFeatures) {
+
+            return new style.Style(
+              {               
+                stroke: new style.Stroke({
+                  color: 'red',
+                  width: 2
+                })
+              }
+            );
+          }
+        },
+        minZoom: itemLayer.layer.getMinZoom(),
+        maxZoom: itemLayer.layer.getMaxZoom()        
+      });
+    }
+    return null;
+  }
+
+  createExternalLayer(item:IItem,itemLayer:IItemLayer):Layer<Source> {
     let data = item.data as ILayerData;
-    var layer: Layer = null; 
+    var layer: Layer<Source> = null; 
     switch (data.interfaceType) {
       case 'OSM': {
         let source = new OSM();
@@ -253,8 +314,8 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     return layer;
   }
 
-  createLayer(itemLayer: IItemLayer): Layer {
-    var layer: Layer = null;   
+  createLayer(itemLayer: IItemLayer): Layer<Source> {
+    var layer: Layer<Source> = null;   
     var layerIndex = -1;
     if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.geotiff.processed') {
       layer = this.createGeotiffLayer(itemLayer.item,itemLayer);
@@ -277,6 +338,9 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     if(this.itemLayers) {
       this.updateLayers(this.itemLayers);
     } else if(this.itemLayer) {
+      if(this.getItemlayer(this.itemLayer).item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
+        this.installMapEventHandler();
+      }
       this.updateLayers([this.itemLayer])
     } else {
       this.updateLayers([]);
@@ -284,7 +348,21 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     this.initialized=true;
   }
 
-  addOrUpdateOlLayer(itemLayer:IItemLayer,index:number):Layer {
+  installMapEventHandler() {
+    if(!this.mapEventHandlerInstalled) {
+      this.map.instance.on(['click', 'pointermove'],this.mapEventHandler);
+      this.mapEventHandlerInstalled=true;
+    }
+  }
+
+  unInstallMapEventHandler() {
+    if(this.mapEventHandlerInstalled) {
+      this.map.instance.un(['click', 'pointermove'],this.mapEventHandler);
+      this.mapEventHandlerInstalled=false;
+    }
+  }
+
+  addOrUpdateOlLayer(itemLayer:IItemLayer,index:number):Layer<Source> {
     if(!itemLayer) return null;
     var olLayers = this.instance.getLayers();
     var layer = itemLayer.layer;
@@ -309,7 +387,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
   }
 
   updateLayers(itemLayers: IItemLayer[]) {
-    let newLayers: IItemLayer[] = [];
+    let newLayers: Layer<Source>[] = [];
     if (itemLayers) {
       itemLayers.forEach((itemLayer, index) => {
         if(itemLayer.item.itemType ==  'vnd.farmmaps.itemtype.temporal') {
@@ -330,23 +408,74 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
       while(olLayers.getLength() > newLayers.length) {
         olLayers.removeAt(newLayers.length);
       }
+      this.selectionLayer=null;
+      if(this.mapEventHandlerInstalled && itemLayers.length==1 && this.getItemlayer(itemLayers[0]).item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
+        this.selectionLayer = this.createSelectionLayer(this.getItemlayer(itemLayers[0]));
+        if(this.selectionLayer) olLayers.push(this.selectionLayer)
+      }
     }
   }
 
+  mapEventHandler = (event) => {
+    // select only when having observers
+    if(event.type === 'click' && !this.onFeatureSelected.observers.length) return;
+    if(event.type === 'pointermove' && !this.onFeatureHover.observers.length) return;
+    let itemLayer= this.getItemlayer(this.itemLayer);
+    if(itemLayer && itemLayer.layer) {
+       this.selectedFeatures = {};
+       if(itemLayer.layer ) {
+        let minZoom = itemLayer.layer.getMinZoom();
+        let currentZoom = this.map.instance.getView().getZoom();
+        if(currentZoom>minZoom) {
+            itemLayer.layer.getFeatures(event.pixel).then((features) => {      
+            if(!features.length) {
+              this.onFeatureHover.emit(null);
+              return;
+            }
+           let fid = features[0].getId();
+           let feature = features[0];
+           if(event.type === 'pointermove') {
+             this.selectedFeatures[fid] = features[0];
+             this.onFeatureHover.emit({ "feature": feature,"itemCode":itemLayer.item.code });
+           } else {
+             this.onFeatureSelected.emit({ "feature": feature,"itemCode":itemLayer.item.code });
+           }
+          })
+          if(this.selectionLayer) this.selectionLayer.changed(); 
+        }      
+       }
+    }    
+  }
+
+  getItemlayer(itemLayer:IItemLayer):IItemLayer {     
+     if((itemLayer as ITemporalItemLayer).selectedItemLayer) return (itemLayer as ITemporalItemLayer).selectedItemLayer;
+     return itemLayer;
+  }
+
   ngOnChanges(changes: SimpleChanges) {
     if (this.instance && this.initialized) {
       if (changes['itemLayers']) {
         var itemLayers = changes['itemLayers'].currentValue as IItemLayer[];
         this.updateLayers(itemLayers);
       }
-      if (changes['itemLayer']) {
+      if (changes['itemLayer']) {      
         var itemLayer = changes['itemLayer'].currentValue as IItemLayer;
+        this.itemLayer = itemLayer
         if(itemLayer) {
+          if(this.getItemlayer(this.itemLayer).item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
+            this.installMapEventHandler();
+          }
           this.updateLayers([itemLayer]);
         } else {
-          this.updateLayers([]);
+          this.unInstallMapEventHandler();
+          this.updateLayers([]);          
         }
       }
     }
   }
+
+  ngOnDestroy() {
+    this.unInstallMapEventHandler();
+    super.ngOnDestroy();
+  }
 }

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

@@ -1,16 +1,17 @@
-import { Component, Host, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges, forwardRef, Inject, InjectionToken } from '@angular/core';
+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 { Point,Geometry } from 'ol/geom';
 import { MapBrowserEvent } from 'ol';
+import { Types } from 'ol/MapBrowserEventType';
 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 {Vector,Cluster,Source} from 'ol/source';
 import {Layer} from 'ol/layer';
 import {GeoJSON} from 'ol/format';
 import {Select} from 'ol/interaction';
@@ -25,25 +26,25 @@ import {FeatureIconService} from '../../../services/feature-icon.service';
   ]
 })
 export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnChanges {
-  instance: Vector;
+  instance: Vector<Geometry>;
   private _format: GeoJSON;
   private _select: Select;
   private _hoverSelect: Select;
   private _iconScale: number = 0.05;
-  @Input() features: Array<Feature>;
-  @Input() selectedFeature: Feature;
+  @Input() features: Array<Feature<Geometry>>;
+  @Input() selectedFeature: Feature<Geometry>;
   @Input() selectedItem: IItem;
   @Input() styles:IStyles;
-  @Output() onFeaturesSelected: EventEmitter<Feature> = new EventEmitter<Feature>();
-  @Output() onFeatureHover: EventEmitter<Feature> = new EventEmitter<Feature>();
+  @Output() onFeatureSelected: EventEmitter<Feature<Geometry>> = new EventEmitter<Feature<Geometry>>();
+  @Output() onFeatureHover: EventEmitter<Feature<Geometry>> = new EventEmitter<Feature<Geometry>>();
   private stylesCache:IStyles = {};
 
-  constructor(@Host() private layer: LayerVectorComponent, private itemService: ItemService, @Host() private map: MapComponent, private itemTypeService: ItemTypeService,private featureIconService$:FeatureIconService) {
+  constructor(@Host() private layer: LayerVectorComponent, private itemService: ItemService, private map: MapComponent, private itemTypeService: ItemTypeService,private featureIconService$:FeatureIconService) {
     super(layer);
     this._format = new GeoJSON();
   }  
 
-  geometry(feature: Feature) {
+  geometry(feature: Feature<Geometry>) {
     let view = this.map.instance.getView();
     let resolution = view.getResolution();
     var geometry = feature.getGeometry();
@@ -55,9 +56,9 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
     return geometry;
    }
 
-  getSelectedStyle(feature:Feature):style.Style {
+  getSelectedStyle(feature:Feature<Geometry>):style.Style {
     let key = feature.get('itemType')+"_selected";
-    let evaluatedStyle =null;
+    let evaluatedStyle: style.Style =undefined;
     var styleEntry = this.stylesCache[key];    
     if(styleEntry) {
       if(typeof styleEntry === 'function')  {
@@ -66,12 +67,12 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
         evaluatedStyle = styleEntry;
       }
     } else {
-      evaluatedStyle = this.stylesCache["selected"];
+      evaluatedStyle = this.stylesCache["selected"] as style.Style;
     }    
     if(evaluatedStyle ) {
-      evaluatedStyle.setGeometry((feature) => this.geometry(feature));
+      evaluatedStyle .setGeometry((feature:Feature<Geometry>) => this.geometry(feature));
     } 
-    return evaluatedStyle
+    return evaluatedStyle as style.Style
   }
 
   ngOnInit() {
@@ -80,25 +81,25 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
     this._select = new Select({
       style:null,
       hitTolerance: 10,
-      layers: [this.layer.instance as Layer]
+      layers: [this.layer.instance as Layer<Source>]
     });
     this._hoverSelect = new Select({
-      style: (feature) => {        
+      style: (feature:Feature<Geometry>) => {        
         return this.getSelectedStyle(feature);
       },
       hitTolerance: 10,
-      condition: (e: MapBrowserEvent) => {
+      condition: (e: MapBrowserEvent<UIEvent>) => {
         return e.type == 'pointermove';
       },
-      layers: [this.layer.instance as Layer]
+      layers: [this.layer.instance as Layer<Source>]
     });
     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]);
+        this.onFeatureSelected.emit(e.selected[0]);
       } else {
-        this.onFeaturesSelected.emit(null);
+        this.onFeatureSelected.emit(null);
       }
     });
     this._hoverSelect.on('select', (e) => {
@@ -112,17 +113,18 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
     this.host.instance.setSource(this.instance);
       
     this.host.instance.setStyle((feature) => {     
-      var key = feature.get('itemType') + (this.selectedItem?"_I":"");
+      var itemType = feature.get('itemType');
+      var key = itemType + (this.selectedItem?"_I":"");
       if (!this.stylesCache[key]) {
-        if (this.itemTypeService.itemTypes[key]) {
-          let itemType = this.itemTypeService.itemTypes[key];
-          let fillColor = color.asArray(itemType.iconColor);
-          fillColor[3] = this.selectedItem?0:0.5;
+        if (this.itemTypeService.itemTypes[itemType]) {
+          let itemTypeEntry = this.itemTypeService.itemTypes[itemType];
+          let fillColor = color.asArray(itemTypeEntry.iconColor);
+          fillColor[3] = 0;
           this.stylesCache[key] = new style.Style({
-              image: itemType.icon ? new style.Icon({
+              image: itemTypeEntry.icon ? new style.Icon({
                   anchor: [0.5, 1],
                   scale: 0.05,
-                  src: this.featureIconService$.getIconImageDataUrl(itemType.icon)
+                  src: this.featureIconService$.getIconImageDataUrl(itemTypeEntry.icon)
                 }):null,
               stroke: new style.Stroke({
                 color: 'red',
@@ -131,7 +133,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
               fill: new style.Fill({
                 color: fillColor
               }),
-              geometry:(feature) => this.geometry(feature)
+              geometry:(feature:Feature<Geometry>) => this.geometry(feature)
             });                   
         } else {
           key = 'file';

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

@@ -11,13 +11,13 @@
               <a title="Transparency 75%" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,0.75)">75%</a>
               <a title="No transparency" *ngIf="itemLayer.visible" href="#" class="btn btn-light btn-sm" (click)="handleSetOpacity($event,itemLayer,1)">100%</a>
             </span>
-            <a href="#" title="Zoom to extent" class="btn btn-light btn-sm" (click)="handleZoomToExtent($event,itemLayer)"><i class="fa fa-search-plus" aria-hidden="true"></i></a>
-            <span *ngIf="firstLayer(itemLayer)"><a href="#" title="Toggle legend" class="btn btn-light btn-sm" (click)="itemLayer.legendVisible=toggleLegend($event,itemLayer.legendVisible)"><i class="fa fa-bar-chart" aria-hidden="true"></i></a></span>
-            <span class="float-right"><a href="#" title="Remove overlay" class="btn btn-light btn-sm" (click)="handleDelete($event,itemLayer)"><i class="fa fa-minus" aria-hidden="true"></i></a></span>
+            <a href="#" title="Zoom to extent" class="btn btn-light btn-sm" (click)="handleZoomToExtent($event,itemLayer)"><i class="far fa-search-plus" aria-hidden="true"></i></a>
+            <span *ngIf="firstLayer(itemLayer)"><a href="#" title="Toggle legend" class="btn btn-light btn-sm" (click)="itemLayer.legendVisible=toggleLegend($event,itemLayer.legendVisible)"><i class="far fa-chart-bar" aria-hidden="true"></i></a></span>
+            <span *ngIf="!dataLayers" class="float-right"><a href="#" title="Remove overlay" class="btn btn-light btn-sm" (click)="handleDelete($event,itemLayer)"><i class="fas fa-layer-minus" aria-hidden="true"></i></a></span>
           </div>
           <div *ngIf="itemLayer.legendVisible">
             <div class="card legend">
-              <fm-map-layer-legend [layer]="firstLayer(itemLayer)" (click)="handleLegendClick($event,itemLayer);"></fm-map-layer-legend>
+              <fm-map-layer-legend [layer]="firstLayer(itemLayer)" (click)="handleLegendClick($event,itemLayer);" [histogramenabled]="true"></fm-map-layer-legend>
             </div>
           </div>
       </div>

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

@@ -10,6 +10,7 @@ import { IItemLayer } from '../../../models/item.layer';
 export class LayerListComponent  {
   @Input() itemLayers: IItemLayer[] = [];
   @Input() baseLayers: boolean = false;
+  @Input() dataLayers: boolean = false;
   @Output() onToggleVisibility = new EventEmitter<IItemLayer>();
   @Output() onSetOpacity = new EventEmitter<{layer: IItemLayer,opacity:number }>();
   @Output() onDelete = new EventEmitter<IItemLayer>();

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

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

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

@@ -0,0 +1,37 @@
+.layer-values {
+    position: absolute;
+    left: 50%;
+    top: 30%;
+}
+
+.cross {
+    display: block;
+    position: relative;
+    width: 1em;
+    height: 1em;    
+    left: -0.5em;
+    top: -0.5em;
+}
+
+.values-container {
+    position: relative;
+    background-color: white;
+    left: calc( 1em - 1px);
+    top: -1.3em;
+    min-width: 15em;
+}
+
+.value-list {
+    list-style: none;
+}
+
+.pointer {
+    position: relative;
+    width: 0px;
+    height: 0px;
+    left: 0.5em;
+    border-top: 0.5em solid transparent;
+    border-bottom: 0.5em solid transparent;
+    border-right: 0.5em solid  black;
+}
+

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

@@ -1,20 +1,20 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { GradientComponent } from './gradient.component';
+import { LayerValuesComponent } from './layer-values.component';
 
-describe('GradientComponent', () => {
-  let component: GradientComponent;
-  let fixture: ComponentFixture<GradientComponent>;
+describe('LayerValuesComponent', () => {
+  let component: LayerValuesComponent;
+  let fixture: ComponentFixture<LayerValuesComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ GradientComponent ]
+      declarations: [ LayerValuesComponent ]
     })
     .compileComponents();
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(GradientComponent);
+    fixture = TestBed.createComponent(LayerValuesComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

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

@@ -0,0 +1,62 @@
+import { Component, OnInit,Input,ViewChild,ElementRef,AfterViewInit } 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 { MapComponent } from 'ngx-openlayers';
+import { ILayervalue } from '../../../models/layer.value';
+import { Observable,interval,Subject } from 'rxjs';
+import { debounce, throttle } from 'rxjs/operators';
+import { toLonLat } from 'ol/proj';
+import { toStringHDMS } from 'ol/coordinate';
+import { ClipboardService } from 'ngx-clipboard'
+import {GeoJSON,WKT} from 'ol/format';
+import { Point } from 'ol/geom';
+
+@Component({
+  selector: 'fm-map-layer-values',
+  templateUrl: './layer-values.component.html',
+  styleUrls: ['./layer-values.component.scss']
+})
+export class LayerValuesComponent implements OnInit,AfterViewInit {
+
+  @ViewChild('layerValues') containerRef:ElementRef;
+  offsetX$:number =0;
+  offsetY$:number =0;
+  lonlat$: string="";
+  wkt$= "";
+  layerValues$:Observable<Array<ILayervalue>> = this.store.select(mapReducers.selectGetLayerValues);
+  enabled$:Observable<boolean> = this.store.select(mapReducers.selectGetLayerValuesEnabled);
+  wktFormat$:WKT;
+
+  constructor( private store: Store<mapReducers.State>,private map: MapComponent,private clipboardService$:ClipboardService) {   
+    this.wktFormat$=new WKT();
+  }
+
+  ngOnInit(): void {
+   
+  }
+
+  moveEndSubject = new Subject<any>();
+
+  ngAfterViewInit():void {
+    this.offsetY$ = this.containerRef.nativeElement.offsetTop;
+    this.offsetX$ = this.containerRef.nativeElement.offsetLeft;
+    this.map.instance.on('moveend', () => {
+      this.moveEndSubject.next({});     
+    });
+    this.moveEndSubject.pipe(throttle(ev => interval(100))).subscribe(() =>  this.updateValuesLocation());
+  }
+
+  updateValuesLocation() {
+    var xy = this.map.instance.getCoordinateFromPixel([this.offsetX$,this.offsetY$])
+    var lonlat = toLonLat(xy);
+    this.wkt$ = this.wktFormat$.writeGeometry(new Point(lonlat))
+    this.lonlat$ = toStringHDMS(lonlat);
+    this.store.dispatch(new mapActions.SetLayerValuesLocation(xy[0],xy[1]));
+  }  
+
+  copyToClipboard() {
+    this.clipboardService$.copy(this.wkt$);
+  }
+}

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

@@ -1,9 +1,8 @@
-import { Component, OnDestroy, OnInit, Input, Optional, OnChanges, SimpleChanges } from '@angular/core';
-import { Vector } from 'ol/layer';
-import { Style } from 'ol/style';
-import { StyleFunction } from 'ol/style/Style';
-import { LayerVectorComponent, LayerGroupComponent, MapComponent } from 'ngx-openlayers';
-import { RenderType  } from 'ol/layer/Vector';
+import { Component, OnDestroy, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
+import { LayerVectorComponent, MapComponent } from 'ngx-openlayers';
+import  RenderType  from 'ol/layer/Vector';
+import { Vector as VectorSource } from 'ol/source';
+import { Geometry } from 'ol/geom';
 
 @Component({
   selector: 'fm-map-aol-layer-vector-image',
@@ -12,10 +11,10 @@ import { RenderType  } from 'ol/layer/Vector';
   `,
 })
 export class LayerVectorImageComponent extends LayerVectorComponent implements OnInit, OnDestroy, OnChanges {
-  public source: Vector;
+  //public source: Vector;
 
   @Input()
-  renderMode: RenderType | string = "image";  
+  renderMode: RenderType<VectorSource<Geometry>> | string = "image";  
 
   constructor(map: MapComponent) {
     super(map);

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

@@ -1,4 +1,4 @@
-<div (click)="handleClick($event)" class="btn btn-outline-secondary gps-location">
+<div (click)="handleClick($event)" class="btn btn-outline-primary gps-location">
   <svg height="100%" width="100%" viewBox="0 0 96 96">
     <g
     id="XMLID_1_"><circle      

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

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

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

@@ -1,4 +1,4 @@
-<div (click)="handleClick($event)" class="btn btn-outline-secondary compass" [style.transform]="Rotation()" [ngClass]="{'compass-n':IsNorth()}">
+<div (click)="handleClick($event)" class="btn btn-outline-primary 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"

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

@@ -8,6 +8,7 @@
   border-radius:1.75em;
   padding:0;
   margin-top:0.5em;
+  display: block;
 }
 
 #north {

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

@@ -29,7 +29,7 @@ export class RotationResetComponent implements OnInit {
     });
   }
 
-  constructor( @Host() private map: MapComponent, private changeDetectorRef$: ChangeDetectorRef ) {
+  constructor( private map: MapComponent, private changeDetectorRef$: ChangeDetectorRef ) {
   }
 
   handleClick(event:Event) {

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

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

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

@@ -1,5 +1,6 @@
 import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject} from '@angular/core';
 import { Feature } from 'ol';
+import { Geometry} from 'ol/geom';
 import { FeatureListComponent,AbstractFeatureListComponent } from '../feature-list/feature-list.component';
 import { WidgetHostDirective } from '../widget-host/widget-host.directive';
 import  {IQueryState,PackageService } from '@farmmaps/common';
@@ -17,12 +18,13 @@ import { Observable } from 'rxjs';
 export class FeatureListContainerComponent {
 
   constructor(private store: Store<mapReducers.State>,private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractFeatureListComponent) public featureLists: AbstractFeatureListComponent[],private packageService:PackageService ) {
+    this.featureLists = [...this.featureLists].reverse();
   }
 
-  @Input() features: Array<Feature>
+  @Input() features: Array<Feature<Geometry>>
   @Input() queryState: IQueryState;
-  @Input() selectedFeature: Feature;
-  @Input() clickedFeature:Observable<Feature>;
+  @Input() selectedFeature: Feature<Geometry>;
+  @Input() clickedFeature:Observable<Feature<Geometry>>;
 
   @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; 
   componentRef:any;
@@ -37,7 +39,7 @@ export class FeatureListContainerComponent {
       let criteria=0;
       if (this.featureLists[i]['forItemType']) {
         criteria++;
-        if( this.featureLists[i]['forItemType'].indexOf(queryState.itemType) >= 0) {
+        if( this.featureLists[i]['forItemType'].split(",").filter(part => part == queryState.itemType).length == 1) {
           matches++;
         }
       }
@@ -80,9 +82,11 @@ export class FeatureListContainerComponent {
     }
     if ((changes["features"] && changes["features"].currentValue)) {
       (<AbstractFeatureListComponent>this.componentRef.instance).features = changes["features"].currentValue;
+      this.componentRef.changeDetectorRef.detectChanges();
     }
     if(changes["selectedFeature"]) {
       (<AbstractFeatureListComponent>this.componentRef.instance).selectedFeature = changes["selectedFeature"].currentValue;
+      this.componentRef.changeDetectorRef.detectChanges();
     }
   }
 }

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

@@ -1,6 +1,6 @@
 <div class="card border-0">
   <div class="card-body" *ngIf="(schemeItem|async);let schemeItem">
-    <div><a href="#" (click)="handleBackClick($event)" i18n>back</a></div>
+    <fm-back-button></fm-back-button>
     <h4 i18n>Farm</h4>
     <h3>{{schemeItem.name}}</h3>
     <div *ngIf="features;let features">

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

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

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

@@ -9,6 +9,7 @@ import * as mapActions from '../../actions/map.actions';
 import { tassign } from 'tassign';
 import { Router } from '@angular/router';
 import { Feature } from 'ol';
+import { Geometry} from 'ol/geom';
 
 @ForItemType("vnd.farmmaps.itemtype.croppingscheme")
 @Injectable()
@@ -23,7 +24,7 @@ export class FeatureListCroppingschemeComponent extends AbstractFeatureListCompo
         super(store, itemTypeService, location);
     }
 
-    getAction(feature:Feature):Action {
+    getAction(feature:Feature<Geometry>):Action {
         var queryState = tassign(mapReducers.initialState.queryState, { parentCode: feature.get('code'), itemType: "vnd.farmmaps.itemtype.cropfield" });
         return new mapActions.DoQuery(queryState);
     }

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

@@ -1,5 +1,6 @@
 import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject, Type} from '@angular/core';
 import { Feature } from 'ol';
+import { Geometry } from 'ol/geom';
 import { AbstractFeatureListFeatureComponent,FeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component';
 import { WidgetHostDirective } from '../widget-host/widget-host.directive';
 
@@ -15,9 +16,10 @@ import { WidgetHostDirective } from '../widget-host/widget-host.directive';
 export class FeatureListFeatureContainerComponent {
 
   constructor(private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractFeatureListFeatureComponent) public featureLists: AbstractFeatureListFeatureComponent[] ) {
+    this.featureLists = [...this.featureLists].reverse();
   }
 
-  @Input() feature: Feature;
+  @Input() feature: Feature<Geometry>;
 
   @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; 
 
@@ -31,7 +33,7 @@ export class FeatureListFeatureContainerComponent {
       let criteria=0;
       if (this.featureLists[i]['forItemType']) {
         criteria++;
-        if(this.featureLists[i]['forItemType'].indexOf(this.feature.get("itemType")) >= 0) {
+        if(this.featureLists[i]['forItemType'].split(",").filter(part => part == this.feature.get("itemType")).length == 1) {
           matches++;
         }
       }         

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

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

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

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

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

@@ -1,5 +1,6 @@
 import { Component, Input, Injectable,Directive} from '@angular/core';
 import { Feature } from 'ol';
+import { Geometry } from 'ol/geom';
 import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
 import { commonReducers,ItemTypeService,AppConfig } from '@farmmaps/common';
@@ -9,7 +10,7 @@ import { commonReducers,ItemTypeService,AppConfig } from '@farmmaps/common';
 @Injectable()
 @Directive()
 export abstract class AbstractFeatureListFeatureComponent {
-  @Input() feature: Feature
+  @Input() feature: Feature<Geometry>
 
   constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService,public config:AppConfig) {
   } 

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

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

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

@@ -1,6 +1,7 @@
 import { Component, Input, Injectable,Directive,SimpleChanges } from '@angular/core';
 import { Location } from '@angular/common';
 import { Feature } from 'ol';
+import { Geometry} from 'ol/geom';
 import { Store,Action} from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
 import { commonReducers,ItemTypeService, IItem, Item } from '@farmmaps/common';
@@ -14,20 +15,20 @@ import { IQueryState } from '@farmmaps/common';
 @Injectable()
 @Directive()
 export abstract class AbstractFeatureListComponent {
-  @Input() features: Array<Feature>;
+  @Input() features: Array<Feature<Geometry>>;
   @Input() queryState: IQueryState;
-  @Input() selectedFeature: Feature;
+  @Input() selectedFeature: Feature<Geometry>;
   constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, private location: Location) {
   }
 
-  handleFeatureClick(feature:Feature) {
+  handleFeatureClick(feature:Feature<Geometry>) {
     if(feature) {
       let action = this.getAction(feature);
       this.store.dispatch(action);  
     }
   }
 
-  getAction(feature:Feature):Action {
+  getAction(feature:Feature<Geometry>):Action {
       var newQuery: any = tassign(mapReducers.initialState.queryState);
       newQuery.parentCode = feature.get('parentCode');
       newQuery.itemCode = feature.get('code');
@@ -48,7 +49,7 @@ export abstract class AbstractFeatureListComponent {
     this.location.back();
   }
 
-  isFeatureSelected(feature:Feature):boolean {
+  isFeatureSelected(feature:Feature<Geometry>):boolean {
     if(!this.selectedFeature) return false;
     return feature.getId() == this.selectedFeature.getId();
   }  

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

@@ -0,0 +1,4 @@
+<div #container class="container">
+    <canvas  #canvas ></canvas>
+</div>
+

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

@@ -0,0 +1,5 @@
+.container {
+    padding: 0;
+    width: 100%;
+    height: 100%;
+}

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

@@ -1,20 +1,20 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TestComponent } from './test.component';
+import { GeometryThumbnailComponent } from './feature-thumbnail.component';
 
-describe('TestComponent', () => {
-  let component: TestComponent;
-  let fixture: ComponentFixture<TestComponent>;
+describe('GeometryThumbnailComponent', () => {
+  let component: GeometryThumbnailComponent;
+  let fixture: ComponentFixture<GeometryThumbnailComponent>;
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [ TestComponent ]
+      declarations: [ GeometryThumbnailComponent ]
     })
     .compileComponents();
   });
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(TestComponent);
+    fixture = TestBed.createComponent(GeometryThumbnailComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

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

@@ -0,0 +1,95 @@
+import { Component, Input, AfterViewInit, ViewChild } from '@angular/core';
+import { Feature} from 'ol';
+import { Geometry,Polygon,MultiPolygon } from 'ol/geom';
+import * as extent from 'ol/extent';
+import * as render from 'ol/render';
+import * as style from 'ol/style';
+
+@Component({
+  selector: 'fm-map-feature-thumbnail',
+  templateUrl: './feature-thumbnail.component.html',
+  styleUrls: ['./feature-thumbnail.component.scss']
+})
+export class GeometryThumbnailComponent implements AfterViewInit {
+
+
+  constructor() { }
+
+  @ViewChild('canvas') canvas;
+  @ViewChild('container') container;
+
+  private geometry:Geometry = null;
+  @Input() set feature(value:Feature<Geometry>) {
+    if(value) {
+      this.geometry = value.getGeometry();
+    } else {
+      this.geometry = null;
+    }
+    this.render(this.canvas,
+      this.geometryStyle,
+      this.geometry,
+      this.width, 
+      this.height);
+  };
+
+  private defaultStyle:style.Style = new style.Style({
+    stroke: new style.Stroke({ color: 'black',width:1.5 })
+  });  
+  private geometryStyle:style.Style = this.defaultStyle;
+  @Input() set fillColor(value:string) {
+    if(style) {
+      this.geometryStyle = new style.Style({
+        stroke: new style.Stroke({ color: 'black',width:1.5 }),
+        fill: new style.Fill({color: value})
+      });  
+    } else {
+      this.geometryStyle = this.defaultStyle
+    }
+    this.render(this.canvas,
+      this.geometryStyle,
+      this.geometry,
+      this.width, 
+      this.height);
+  }
+
+  private width:number = 0;
+  private height:number = 0;
+
+  render(canvas,style:style.Style,geometry:Geometry,width:number,height:number) {  
+    if(canvas && canvas.nativeElement && geometry && style) {
+      let renderContext = render.toContext(canvas.nativeElement.getContext( '2d'),{ size: [width, height] });  
+
+      let geom   = geometry.clone() as Polygon,
+      line   = geom.getCoordinates()[0],
+      e = extent.boundingExtent( line );
+  
+      let dxy = extent.getCenter(e),
+      sxy = [ 
+          (width - 2 ) / extent.getWidth(e),
+          (height - 2 ) / extent.getHeight(e)
+      ];
+  
+      let dx = dxy[0], 
+          dy = dxy[1],
+          sx = sxy[0],
+          sy = sxy[1];
+  
+      geom.translate( -dx, -dy );
+      geom.scale( Math.min(sx, sy), -Math.min(sx, sy));
+      geom.translate(width / 2,height / 2 );
+      renderContext.setStyle( style );  
+      renderContext.drawGeometry( geom );
+    }
+  }
+
+  ngAfterViewInit() {
+    this.width = this.container.nativeElement.offsetWidth;
+    this.height = this.container.nativeElement.offsetHeight;
+    this.render(this.canvas,
+      this.geometryStyle,
+      this.geometry,
+      this.width, 
+      this.height);
+  }  
+
+}

projects/common-map/src/fm-map/components/if-zoom-to-show/if-zoom-to-show.directive.ts

@@ -0,0 +1,60 @@
+import { Directive, ViewContainerRef,TemplateRef,OnInit,Input, OnChanges } from '@angular/core';
+import { Layer } from 'ol/layer';
+import { Source } from 'ol/source';
+import { MapComponent } from 'ngx-openlayers';
+
+@Directive({
+  selector: '[fmMapIfZoomToShow]',
+})
+export class ifZoomToShowDirective  implements OnInit {
+  @Input() 
+  set fmMapIfZoomToShow(layer:Layer<Source>) {
+    this.layer$=layer;
+    this.checkZoom();
+  }
+
+  @Input() 
+  set fmMapIfZoomToShowThen(templateRef: TemplateRef<any>) {
+    this.thenTemplate$ = templateRef;
+    this.checkZoom();
+  }
+
+  @Input() 
+  set fmMapIfZoomToShowElse(templateRef: TemplateRef<any>) {
+    this.elseTemplate$ = templateRef;
+    this.checkZoom();
+  }
+  
+  private layer$:Layer<Source>;
+  private thenTemplate$:TemplateRef<any>;
+  private elseTemplate$:TemplateRef<any>;
+  private showView = false;
+
+  constructor(private templateRef$: TemplateRef<any>,private viewContainerRef$: ViewContainerRef,private map$: MapComponent) { 
+    this.thenTemplate$ = templateRef$;
+    this.checkZoom();
+  }
+
+  ngOnInit() {    
+    this.map$.instance.on('moveend', (e) => {
+      this.checkZoom();     
+    });
+  }
+
+  checkZoom() {
+    if(this.layer$ && this.map$.instance) {
+      let minZoom = this.layer$.getMinZoom();
+      let currentZoom = this.map$.instance.getView().getZoom();
+      let view = currentZoom < minZoom;
+      if(view!= this.showView) {
+        this.viewContainerRef$.clear();
+        this.showView=view;
+        if (this.showView && this.thenTemplate$ ) {
+          this.viewContainerRef$.createEmbeddedView(this.templateRef$);          
+        } else if(this.elseTemplate$ ) {
+          this.viewContainerRef$.createEmbeddedView(this.elseTemplate$);
+        }  
+      }      
+    }      
+  }
+}

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

@@ -15,6 +15,7 @@ import { IItem, IListItem } from '@farmmaps/common';
 export class ItemListItemContainerComponent {
 
   constructor(private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractItemListItemComponent) public itemComponentList: AbstractItemListItemComponent[] ) {
+    this.itemComponentList = [...this.itemComponentList].reverse();
   }
 
   @Input() item: IListItem;
@@ -32,13 +33,13 @@ export class ItemListItemContainerComponent {
       let criteria=0;
       if (this.itemComponentList[i]['forItemType']) {
         criteria++;
-        if(this.itemComponentList[i]['forItemType'].indexOf(this.item.itemType) >= 0) {
+        if(this.itemComponentList[i]['forItemType'].split(",").filter(part => part ==this.item.itemType).length == 1) {
           matches++;
         }
       }
       if (this.itemComponentList[i]['forSourceTask']) {
         criteria++;
-        if(this.itemComponentList[i]['forSourceTask'].indexOf(this.item.sourceTask) >= 0) {
+        if(this.itemComponentList[i]['forSourceTask'].split(",").filter(part => part ==this.item.sourceTask).length ==1) {
           matches++;
         }
       }

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

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

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

@@ -16,6 +16,7 @@ export class LayerSwitcher  implements OnInit,OnChanges{
   public showLayerSwitcher:Observable<boolean>;
   public overlayLayers: Observable<Array<IItemLayer>>;
   public selectedOverlayLayer: Observable<IItemLayer>;
+  public selectedItemLayer$: Observable<IItemLayer>;
   public baseLayers: Observable<Array<IItemLayer>>;
   public selectedBaseLayer: Observable<IItemLayer>;
 
@@ -27,6 +28,7 @@ export class LayerSwitcher  implements OnInit,OnChanges{
     this.selectedOverlayLayer = this.store.select(mapReducers.selectGetSelectedOverlayLayer);
     this.baseLayers = this.store.select(mapReducers.selectGetBaseLayers);
     this.selectedBaseLayer = this.store.select(mapReducers.selectGetSelectedBaseLayer);
+    this.selectedItemLayer$ = this.store.select(mapReducers.selectGetSelectedItemLayer)
     this.showLayerSwitcher = this.store.select(mapReducers.selectGetShowLayerSwitcher);
   }
 

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

@@ -7,7 +7,7 @@
       </div>
     </td>
     <td>
-      <a i18n-title title="more info"><i class="fa fa-info-circle text-primary" (click)="hideHistogramDetails = !hideHistogramDetails"></i></a>
+      <a i18n-title title="more info"><i class="fal fa-info-circle text-primary" (click)="hideHistogramDetails = !hideHistogramDetails"></i></a>
     </td>
     <td colspan="2">
       <div class="title" *ngIf="histogramenabled">
@@ -23,7 +23,7 @@
       <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>
+        <span *ngIf="getPercentage(layer.renderer,i) as percentage" class="bar-label">{{percentage | number:'1.0-2'}} %</span>
       </div>
     </td>
   </tr>

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

@@ -78,10 +78,10 @@ export class LegendComponent implements OnInit,AfterViewInit {
      return v;
   }
 
-  public getLabel(renderer: IRenderer, index: number): string {
+  public getPercentage(renderer: IRenderer, index: number): number {
     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) + " %";
+    return percent < 0.1 ? null : percent;
   }
 
   showLegend(): boolean {
@@ -89,12 +89,10 @@ export class LegendComponent implements OnInit,AfterViewInit {
   }
 
   showHistogram(): boolean {
-    return this.histogramenabled && this.layer.renderer.band.histogram.entries && this.layer.renderer.band.histogram.entries.length > 0 && this.layer.renderer.colorMap.colormapType == "minmax";
+    return this.histogramenabled && this.layer.renderer.band.histogram.entries && this.layer.renderer.band.histogram.entries.length > 0 && this.layer.renderer.band.histogram.entries.length == this.layer.renderer.colorMap.entries.length;
   }
 
   bandContainsStatistics(): boolean {
     return this.layer.renderer.band.statistics != null;
   }
-}
-
-
+}

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

@@ -1,5 +1,5 @@
 <ng-template #rt let-r="result" let-t="term">
-  <i class="fa fa-search" aria-hidden="true" style="width:2rem"></i>
+  <i [class]="getIcon(r.type)" aria-hidden="true" style="width:2rem"></i>
   <ngb-highlight [result]="formatter(r)" [term]="t"></ngb-highlight> 
 </ng-template>
 
@@ -8,12 +8,12 @@
     <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>
+          <button type="button" class="btn btn-outline-secondary" (click)="handleToggleMenu($event)"><i class="fal fa-bars" aria-hidden="true"></i></button>
         </div>
         <input #searchText class="form-control" type="text" (focus)="handleFocus($event)" [ngModel]="searchTextLocal" name="searchTextLocal" (ngModelChange)="handleChange($event)" [ngbTypeahead]="search" [resultTemplate]="rt" [inputFormatter]="formatter" (selectItem)="handleSelect($event)" placeholder="Search" i18n-placeholder />
         <div class="input-group-append">
-          <button type="submit" class="btn btn-outline-secondary" [disabled]="disabled"><i class="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>
+          <button type="submit" class="btn btn-outline-secondary" [disabled]="disabled"><i class="fal fa-search"></i></button>
+          <button type="button" class="clear btn btn-outline-secondary" [disabled]="!clearEnabled" (click)="handleClearClick($event)"><i class="fas fa-times"></i></button>
         </div>
       </div>
       <div class="options">
@@ -33,4 +33,4 @@
     <ng-content></ng-content>
   </div>  
 </div>
-<fm-map-select-period-modal [modalState]="openedModalName" (onCloseModal)="handleCloseModal()" (onSelect)="handleSelectPeriod($event)" [startDate]="startDate" [endDate]="endDate"></fm-map-select-period-modal>
+<fm-map-select-period-modal [modalState]="openedModalName" (onCloseModal)="handleCloseModal()" (onSelect)="handleSelectPeriod($event)" [startDate]="periodLocal.startDate" [endDate]="periodLocal.endDate"></fm-map-select-period-modal>

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

@@ -1,6 +1,6 @@
 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 { Observable ,  of,merge,forkJoin } from 'rxjs';
+import { debounceTime,distinctUntilChanged,tap,switchMap,catchError,map} from 'rxjs/operators';
 import { TypeaheadService, TimespanService } from '@farmmaps/common';
 import { IQueryState } from '@farmmaps/common';
 import { IPeriodState } from '../../models/period.state';
@@ -22,14 +22,19 @@ export class MapSearchComponent {
   @Input() set searchMinified(minified: boolean) {
     this.searchMinifiedLocal = minified;
   }
-  @Input() period: IPeriodState
-  @Output() onSearch = new EventEmitter<IQueryState>();
+  @Input() set period(period:IPeriodState) {
+    this.periodLocal =  tassign(this.periodLocal,{startDate: period.startDate,endDate:period.endDate});
+    this.startEndCaption = this.timespanService.getCaption(period.startDate, period.endDate, 4)
+  }
+  @Output() onSearch = new EventEmitter<IQueryState>()
+  @Output() onCitySearch = new EventEmitter<string>()
   @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>();
+  @Output() onPeriodChange = new EventEmitter<IPeriodState>();
   @Input() openedModalName: string;
   @Input() set filterOptions(filterOptions: IQueryState) {
     if (filterOptions && filterOptions.query && filterOptions.query.length > 0) {
@@ -42,23 +47,18 @@ export class MapSearchComponent {
       this.searchTextLocal = { name: filterOptions.tags };
     } else {
       this.searchTextLocal = { name: filterOptions.query };
-    }
-    if (this.dateFilter) {
-      this.filterOptionsLocal.startDate = this.startDate;
-      this.filterOptionsLocal.endDate = this.endDate;
-    }
+    } 
   }
 
   public collapsedLocal: boolean = true;
   public searchMinifiedLocal: boolean = false;
+  public periodLocal: IPeriodState = { startDate:new Date(new Date(Date.now()).getFullYear(), new Date(Date.now()).getMonth() - 3, 1), endDate:new Date(Date.now())};
   public filterOptionsLocal: IQueryState;
   private extent: number[];
   public searchTextLocal: any;
   public searchTextLocalOutput: string; 
-  public dateFilter: boolean = true;
-  public startDate: Date = new Date(new Date(Date.now()).getFullYear(), new Date(Date.now()).getMonth() - 3, 1);
-  public endDate: Date = new Date(Date.now());
-  public startEndCaption: string = this.timespanService.getCaption(this.startDate, this.endDate, 4);
+  public dateFilter: boolean = true; 
+  public startEndCaption: string = this.timespanService.getCaption(this.periodLocal.startDate, this.periodLocal.endDate, 4);
 
   searching = false;
   searchFailed = false;
@@ -70,20 +70,27 @@ export class MapSearchComponent {
     this.filterOptionsLocal = { query: "", tags: "", startDate: null, endDate: null, bboxFilter: false, itemType: null, itemCode:null,level:0,parentCode:null,bbox:[] };   
   }
 
-  search = (text$: Observable<string>) =>
+  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),
+      tap(() => {this.searching = true;this.searchFailed=false;}),
+      switchMap(term => term.length < 1 ? of([]) : 
+      forkJoin(
+        this.typeaheadService.getTagTypeaheadItems(term).pipe(
           catchError(() => {
             this.searchFailed = true;
             return of([]);
-          })) ),
+          }),map( (sa:string[]) => sa.map((s,i) => ({"name":s,"type":"tag"})))),
+          this.typeaheadService.getCityTypeaheadItems(term).pipe(
+            catchError(() => {
+              this.searchFailed = true;
+              return of([]);
+            }),map( (sa:string[]) => sa.map((s,i) => ({"name":s,"type":"city"})))),
+        ).pipe(map(([a1,a2]) => [...a1, ...a2] ),map(a => a.sort((a, b) => (a.name.toUpperCase() > b.name.toUpperCase()) ? 1 : -1)))
+      ),
       tap(() => this.searching = false),
-      merge(this.hideSearchingWhenUnsubscribed));
+      );
 
   formatter = (x: { name: string }) => x.name;
 
@@ -94,8 +101,8 @@ export class MapSearchComponent {
     this.filterOptionsLocal.parentCode = null;
     this.filterOptionsLocal.query = this.searchTextLocalOutput;
     if (this.dateFilter) {
-      this.filterOptionsLocal.startDate = this.startDate;
-      this.filterOptionsLocal.endDate = this.endDate;
+      this.filterOptionsLocal.startDate = this.periodLocal.startDate;
+      this.filterOptionsLocal.endDate = this.periodLocal.endDate;
     }
     this.onSearch.emit(this.filterOptionsLocal);
   }
@@ -110,33 +117,42 @@ export class MapSearchComponent {
   }
 
   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;
+    if(event.item.type == "tag") {
+      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.periodLocal.startDate;
+        this.filterOptionsLocal.endDate = this.periodLocal.endDate;
+      }
+      this.onSearch.emit(this.filterOptionsLocal);
+      this.searchTextLocal = { name: this.filterOptionsLocal.tags };  
+    } else if (event.item.type == "city") {
+      this.clearEnabled = true;
+      this.onCitySearch.emit(event.item.name);
     }
-    this.onSearch.emit(this.filterOptionsLocal);
-    this.searchTextLocal = { name: this.filterOptionsLocal.tags };
   }
 
   handleSelectPeriod(event: { startDate: Date, endDate: Date }) {
-    this.startDate = event.startDate;
-    this.endDate = event.endDate;   
-    this.handleCloseModal();
+    this.periodLocal = { startDate: event.startDate, endDate: event.endDate}
+    this.onPeriodChange.emit(this.periodLocal);
     this.startEndCaption = this.timespanService.getCaption(event.startDate, event.endDate, 4);
-    this.onSearch.emit(this.filterOptionsLocal);
+    if(this.dateFilter) {
+      this.filterOptionsLocal.startDate =event.startDate;
+      this.filterOptionsLocal.endDate = event.endDate;
+      this.onSearch.emit(this.filterOptionsLocal);
+    }
+    this.handleCloseModal();
   }
 
   handleChangeEnableDateFilter(enabled) {
     this.dateFilter = enabled;
     if (enabled) {
-      this.filterOptionsLocal.startDate = this.startDate;
-      this.filterOptionsLocal.endDate = this.endDate;
+      this.filterOptionsLocal.startDate = this.periodLocal.startDate;
+      this.filterOptionsLocal.endDate = this.periodLocal.endDate;
     } else {
       this.filterOptionsLocal.startDate = null;
       this.filterOptionsLocal.endDate = null;
@@ -174,5 +190,15 @@ export class MapSearchComponent {
   handleClearClick(event) {
     this.onClear.emit({});
   }
+
+  getIcon(type):string {
+    if(type == "tag")
+      return "fal fa-tag";
+    else if(type == "city")
+      return "fal fa-map-marker-alt";
+    else if(type == "search")
+      return "fal fa-search";
+
+  }
 }