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

@@ -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'){

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

@@ -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",

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"
     }
-  };
+  }
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "1.1.1",
+  "version": "2.1.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -11,47 +11,49 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~11.2.14",
-    "@angular/common": "~11.2.14",
-    "@angular/compiler": "~11.2.14",
-    "@angular/core": "~11.2.14",
-    "@angular/forms": "~11.2.14",
-    "@angular/platform-browser": "~11.2.14",
-    "@angular/platform-browser-dynamic": "~11.2.14",
-    "@angular/router": "~11.2.14",
-    "@farmmaps/common": "1.1.1-prerelease.2031",
-    "@farmmaps/common-map": "1.1.1-prerelease.2031",
-    "@farmmaps/common-map3d": "1.1.1-prerelease.2031",
+    "@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": "^11.0",
-    "@ngrx/router-store": "^11.0",
-    "@ngrx/store": "^11.0",
-    "angular-oauth2-oidc": "^10.0.3",
+    "@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": "^11.0.0",
+    "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.17",
+    "ngx-openlayers": "1.0.0-next.19",
     "ngx-uploadx": "^3.5.1",
-    "ol": "6.5.0",
+    "ol": "6.8.1",
     "ol-cesium": "^2.13.0",
     "resumablejs": "^1.1.0",
     "rxjs": "^6.6.7",
     "tassign": "^1.0.0",
     "tslib": "^2.2.0",
-    "zone.js": "~0.10.2"
+    "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "^11.1.1",
-    "@angular-devkit/build-angular": "^0.1102.14",
-    "@angular/cli": "^11.2.14",
-    "@angular/compiler-cli": "~11.2.14",
-    "@angular/language-service": "~11.2.14",
+    "@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.9",
     "@types/node": "^12.20.15",
@@ -63,10 +65,10 @@
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.6.0",
-    "ng-packagr": "^11.2.4",
+    "ng-packagr": "^12.2.2",
     "protractor": "~7.0.0",
     "ts-node": "^8.8.1",
     "tslint": "~6.1.0",
-    "typescript": "~4.1.0"
+    "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": "1.0.0",
+  "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.2.4",
-    "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": "~1.0",
-    "ngx-openlayers": "1.0.0-next.17",
-    "ol": "6.4.3"
+    "@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

@@ -5,7 +5,9 @@ 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';
@@ -103,13 +105,13 @@ export class StartSearch implements Action {
 export class StartSearchSuccess implements Action {
   readonly type = STARTSEARCHSUCCESS;
 
-  constructor(public features: Array<Feature>, public query:IQueryState) { }
+  constructor(public features: Array<Feature<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 {
@@ -151,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 {
@@ -271,7 +273,7 @@ export class DoQuery implements Action {
 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 {
@@ -287,7 +289,7 @@ export class SetReplaceUrl implements Action {
 export class SetFeatures implements Action {
   readonly type = SETFEATURES;
 
-  constructor(public features: Array<Feature>) { }
+  constructor(public features: Array<Feature<Geometry>>) { }
 }
 
 export class SetLayerValuesLocation implements Action {

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

@@ -19,6 +19,7 @@ import * as mapEffects from './effects/map.effects';
 import { IMapState} from './models/map.state';
 import { ISelectedFeatures } from './models/selected.features';
 import { IItemLayer,ItemLayer,ITemporalItemLayer,TemporalItemLayer } from './models/item.layer';
+import { IClickedFeature } from './models/clicked.feature';
 import { IPeriodState } from './models/period.state';
 
 // components
@@ -163,7 +164,9 @@ export {
   ITemporalItemLayer,
   TemporalItemLayer,
   ifZoomToShowDirective,
-  ZoomToShowAlert
+  ZoomToShowAlert,
+  IClickedFeature,
+  GeometryThumbnailComponent
 }
 
 @NgModule({
@@ -273,7 +276,8 @@ export {
        FeatureListFeatureContainerComponent,
        ZoomToExtentComponent,
        ifZoomToShowDirective,
-       ZoomToShowAlert
+       ZoomToShowAlert,
+       GeometryThumbnailComponent
   ],
   providers: [
     FeatureIconService,

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.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';
 
 
@@ -52,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();
     });

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

@@ -10,12 +10,14 @@ 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 { Geometry } from 'ol/geom';
+import TileSource from 'ol/source/Tile';
 
 @Component({
   selector: 'fm-map-item-layers',
@@ -34,7 +36,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
   private initialized:boolean = false;
   private mapEventHandlerInstalled = false;
   private selectedFeatures = {};
-  private selectionLayer:Layer = null;
+  private selectionLayer:Layer<Source> = null;
   
   constructor(private itemService: ItemService, private map: MapComponent, public appConfig: AppConfig) {
     super(map);
@@ -119,9 +121,9 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     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 });
@@ -142,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;
@@ -177,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) {
@@ -230,16 +232,16 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     return layer;
   }
 
-  createSelectionLayer(itemLayer:IItemLayer):Layer {
+  createSelectionLayer(itemLayer:IItemLayer):Layer<Source> {
     var layerIndex = -1;
-    var layer: Layer = null; 
+    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.getSource(),
+        source: (itemLayer.layer as VectorTileLayer).getSource(),
         style: (feature) => {
           if (feature.getId() in this.selectedFeatures) {
 
@@ -260,9 +262,9 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     return null;
   }
 
-  createExternalLayer(item:IItem,itemLayer:IItemLayer):Layer {
+  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();
@@ -312,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);
@@ -360,7 +362,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     }
   }
 
-  addOrUpdateOlLayer(itemLayer:IItemLayer,index:number):Layer {
+  addOrUpdateOlLayer(itemLayer:IItemLayer,index:number):Layer<Source> {
     if(!itemLayer) return null;
     var olLayers = this.instance.getLayers();
     var layer = itemLayer.layer;
@@ -385,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') {

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,17 +26,17 @@ 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() onFeatureSelected: 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, private map: MapComponent, private itemTypeService: ItemTypeService,private featureIconService$:FeatureIconService) {
@@ -43,7 +44,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
     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,17 +81,17 @@ 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);      
@@ -132,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

@@ -13,7 +13,7 @@
             </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 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>
+            <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">

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-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/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';
@@ -20,10 +21,10 @@ export class FeatureListContainerComponent {
     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;
@@ -38,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++;
         }
       }

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">
       <fm-back-button></fm-back-button>
-      <h3><i class="fm fm-farm"></i>&nbsp;<span i18n>Farms</span></h3>
+      <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';
 
@@ -18,7 +19,7 @@ export class FeatureListFeatureContainerComponent {
     this.featureLists = [...this.featureLists].reverse();
   }
 
-  @Input() feature: Feature;
+  @Input() feature: Feature<Geometry>;
 
   @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; 
 
@@ -32,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.ts

@@ -1,5 +1,6 @@
 import { Component, Injectable,ViewChild,AfterViewInit} 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';
@@ -23,11 +24,11 @@ export class FeatureListFeatureCropfieldComponent extends AbstractFeatureListFea
     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;
   }
 }

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

@@ -1,6 +1,6 @@
-import { Component, Input, OnInit,ViewChild } from '@angular/core';
+import { Component, Input, AfterViewInit, ViewChild } from '@angular/core';
 import { Feature} from 'ol';
-import { Geometry } from 'ol/geom';
+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';
@@ -10,51 +10,86 @@ import * as style from 'ol/style';
   templateUrl: './feature-thumbnail.component.html',
   styleUrls: ['./feature-thumbnail.component.scss']
 })
-export class GeometryThumbnailComponent implements OnInit {
+export class GeometryThumbnailComponent implements AfterViewInit {
+
 
   constructor() { }
 
   @ViewChild('canvas') canvas;
   @ViewChild('container') container;
-  @Input('feature') feature:Feature;
 
-  ngOnInit(): void {
+  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);
   }
 
-  render(canvas,width,height,geometry:Geometry) {  
-    let renderContext = render.toContext(canvas.getContext( '2d'),{ size: [width, height] });  
-   
-    let strokeStyle  = new style.Style({
-      stroke: new style.Stroke({ color: 'black',width:1.5 })
-    });
+  private width:number = 0;
+  private height:number = 0;
 
-    let geom   = geometry.clone(),
-        line   = geom.getCoordinates()[0],
-        e = extent.boundingExtent( line );
+  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 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 );
+      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.render(this.canvas.nativeElement,
-      this.container.nativeElement.offsetWidth, 
-      this.container.nativeElement.offsetHeight,
-      this.feature.getGeometry());
+    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

@@ -1,5 +1,6 @@
 import { Directive, ViewContainerRef,TemplateRef,OnInit,Input, OnChanges } from '@angular/core';
-import { layer } from 'ol';
+import { Layer } from 'ol/layer';
+import { Source } from 'ol/source';
 import { MapComponent } from 'ngx-openlayers';
 
 @Directive({
@@ -7,7 +8,7 @@ import { MapComponent } from 'ngx-openlayers';
 })
 export class ifZoomToShowDirective  implements OnInit {
   @Input() 
-  set fmMapIfZoomToShow(layer:layer) {
+  set fmMapIfZoomToShow(layer:Layer<Source>) {
     this.layer$=layer;
     this.checkZoom();
   }
@@ -24,7 +25,7 @@ export class ifZoomToShowDirective  implements OnInit {
     this.checkZoom();
   }
   
-  private layer$:layer;
+  private layer$:Layer<Source>;
   private thenTemplate$:TemplateRef<any>;
   private elseTemplate$:TemplateRef<any>;
   private showView = false;

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

@@ -33,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

@@ -19,6 +19,13 @@
             <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/map-search/map-search.component.html

@@ -1,5 +1,5 @@
 <ng-template #rt let-r="result" let-t="term">
-  <i class="fal 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>
 

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';
@@ -26,7 +26,8 @@ export class MapSearchComponent {
     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() onSearch = new EventEmitter<IQueryState>()
+  @Output() onCitySearch = new EventEmitter<string>()
   @Output() onClear = new EventEmitter<any>();
   @Output() onSearchCollapse = new EventEmitter<any>();
   @Output() onSearchExpand = new EventEmitter<any>();
@@ -69,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;
 
@@ -109,18 +117,23 @@ 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.periodLocal.startDate;
-      this.filterOptionsLocal.endDate = this.periodLocal.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 }) {
@@ -177,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";
+
+  }
 }
 

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

@@ -50,7 +50,7 @@
     <fm-map-file-drop-target [parentCode]="state.parentCode" (onFileDropped)="handleFileDropped($event)"></fm-map-file-drop-target>
 
     <div *ngIf="noContent">
-      <fm-map-map-search #mapSearch [openedModalName]="state.openedModalName" (onOpenModal)="handleOpenModal($event)" (onCloseModal)="handleCloseModal()" [ngClass]="{'menuVisible':state.menuVisible}" (onToggleMenu)="handleToggleMenu($event)" (onSearchCollapse)="handleSearchCollapse($event)" (onSearchExpand)="handleSearchExpand($event)" [collapsed]="state.searchCollapsed" [searchMinified]="state.searchMinified" (onSearch)="handleSearch($event)" (onClear)="handleClearSearch($event)" [filterOptions]="state.queryState" [clearEnabled]="state.clearEnabled" [period]="state.period" (onPeriodChange)="handlePeriodChange($event)"></fm-map-map-search>
+      <fm-map-map-search #mapSearch [openedModalName]="state.openedModalName" (onOpenModal)="handleOpenModal($event)" (onCloseModal)="handleCloseModal()" [ngClass]="{'menuVisible':state.menuVisible}" (onToggleMenu)="handleToggleMenu($event)" (onSearchCollapse)="handleSearchCollapse($event)" (onSearchExpand)="handleSearchExpand($event)" [collapsed]="state.searchCollapsed" [searchMinified]="state.searchMinified" (onSearch)="handleSearch($event)" (onClear)="handleClearSearch($event)" [filterOptions]="state.queryState" [clearEnabled]="state.clearEnabled" [period]="state.period" (onPeriodChange)="handlePeriodChange($event)" (onCitySearch)="handleCitySearch($event)"></fm-map-map-search>
     </div>
     <div class="side-panel-container">
       <fm-side-panel [resizeable]="true" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false">
@@ -74,7 +74,7 @@
         </div>  
       </fm-side-panel>
       <fm-side-panel [resizeable]="true" [visible]="!noContent">
-        <router-outlet></router-outlet>
+        <router-outlet (activate)="handleSidepaneloutletActivate($event)" (deactivate)="handleSidepaneloutletDeactivate($event)"></router-outlet>
       </fm-side-panel>
     </div>   
   </aol-map>  

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

@@ -11,6 +11,7 @@ import { DeviceService } from '@farmmaps/common';
 import * as mapReducers from '../../reducers/map.reducer';
 import * as mapActions from '../../actions/map.actions';
 import { IMapState} from '../../models/map.state';
+import { IClickedFeature} from '../../models/clicked.feature';
 import { IQuery } from '../../reducers/map.reducer'
 import { ISelectedFeatures } from '../../models/selected.features';
 import { IItemLayer } from '../../models/item.layer';
@@ -20,6 +21,7 @@ import {IStyles} from '../../models/style.cache';
 import { IDroppedFile } from '../aol/file-drop-target/file-drop-target.component';
 import { StateSerializerService } from '@farmmaps/common';
 import { GeolocationService} from '../../services/geolocation.service';
+import { GeolocatorService } from '@farmmaps/common';
 import {DeviceOrientationService} from '../../services/device-orientation.service';
 
 // AppCommon
@@ -29,6 +31,7 @@ import {commonReducers} from '@farmmaps/common';
 import {commonActions} from '@farmmaps/common';
 
 import {Feature} from 'ol';
+import {Geometry,Point,Circle} from 'ol/geom';
 import {Extent,createEmpty,extend } from 'ol/extent';
 import {transform} from 'ol/proj';
 import { tassign } from 'tassign';
@@ -46,7 +49,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   public openedModalName$: Observable<string> = this.store.select(commonReducers.selectOpenedModalName);
   public itemTypes$: Observable<{ [id: string]: IItemType }>;
   public mapState$: Observable<IMapState> = this.store.select(mapReducers.selectGetMapState);
-  public features$: Observable<Array<Feature>> = this.store.select(mapReducers.selectGetFeatures);
+  public features$: Observable<Array<Feature<Geometry>>> = this.store.select(mapReducers.selectGetFeatures);
   public overlayLayers$: Observable<Array<IItemLayer>> = this.store.select(mapReducers.selectGetOverlayLayers);
   public selectedOverlayLayer$: Observable<IItemLayer> = this.store.select(mapReducers.selectGetSelectedOverlayLayer);
   public selectedItemLayer$: Observable<IItemLayer> = this.store.select(mapReducers.selectGetSelectedItemLayer);
@@ -63,8 +66,8 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   public parentCode$: Observable<string> =this.store.select(mapReducers.selectGetParentCode);
   public panelVisible$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelVisible);
   public panelCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelCollapsed);
-  public selectedFeature$: Observable<Feature> = this.store.select(mapReducers.selectGetSelectedFeature);
-  public clickedFeature: Subject<Feature> = new Subject<Feature>();
+  public selectedFeature$: Observable<Feature<Geometry>> = this.store.select(mapReducers.selectGetSelectedFeature);
+  public clickedFeature: Subject<Feature<Geometry>> = new Subject<Feature<Geometry>>();
   public selectedItem$: Observable<IItem> = this.store.select(mapReducers.selectGetSelectedItem);
   public parentItem$: Observable<IItem> =this.store.select(mapReducers.selectGetParentItem);
   public queryState$: Observable<IQueryState> = this.store.select(mapReducers.selectGetQueryState);
@@ -99,6 +102,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     public itemTypeService: ItemTypeService,
     private location: Location,
     private geolocationService: GeolocationService,
+    private geolocaterService: GeolocatorService,
     private zone: NgZone,
     private deviceorientationService:DeviceOrientationService,
     public devicesService:DeviceService) {
@@ -163,11 +167,11 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     this.uploadService.addFiles(droppedFile.files, droppedFile.event, { parentCode:droppedFile.parentCode, geometry:droppedFile.geometry });
   }
 
-  handleFeatureClick(feature: Feature) {
+  handleFeatureClick(feature: Feature<Geometry>) {
     this.clickedFeature.next(feature);
   }
 
-  handleFeatureHover(feature: Feature) {
+  handleFeatureHover(feature: Feature<Geometry>) {
     this.store.dispatch(new mapActions.SelectFeature(feature));
   }
 
@@ -175,6 +179,18 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     this.store.dispatch(new mapActions.DoQuery(queryState));
   }
 
+  handleSidepaneloutletActivate(component:any) {
+   if(component && component.hasOwnProperty('clickedFeature')) {
+     (component as IClickedFeature).clickedFeature = this.clickedFeature;
+   }
+  }
+
+  handleSidepaneloutletDeactivate(component:any) {
+    if(component && component.hasOwnProperty('clickedFeature')) {
+      (component as IClickedFeature).clickedFeature = null;
+    }
+  }
+
   ngOnInit() {    
     this.initialized = false;
     console.debug("Init");
@@ -438,6 +454,19 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     this.store.dispatch(new mapActions.SetPeriod(period));
   }
 
+  handleCitySearch(location:string) {
+    this.geolocaterService.geocode(location).subscribe(locations => {
+      if( locations.length > 0) {
+        let point = new  Point([locations[0].coordinates.lon,locations[0].coordinates.lat]);
+        point.transform('EPSG:4326', 'EPSG:3857');
+        let circle = new Circle(point.getCoordinates(),5000);// 
+        let extent = createEmpty();
+        extend(extent, circle.getExtent());
+        this.store.dispatch(new mapActions.SetExtent(extent))
+      }
+     });
+  }
+
   ngOnDestroy() {
     if (this.paramSub) this.paramSub.unsubscribe();
     if (this.itemTypeSub) this.itemTypeSub.unsubscribe();

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

@@ -34,13 +34,13 @@ export class SelectedItemContainerComponent {
       let criteria=0;
       if (this.selectedItemComponents[i]['forItemType'] ) {
         criteria++;
-        if(this.selectedItemComponents[i]['forItemType'].indexOf(this.item.itemType) >= 0) {
+        if(this.selectedItemComponents[i]['forItemType'].split(",").filter(part => part ==this.item.itemType).length == 1) {
           matches++;
         }
       }
       if (this.selectedItemComponents[i]['forSourceTask']) {
         criteria++;
-        if( this.selectedItemComponents[i]['forSourceTask'].indexOf(this.item.sourceTask) >= 0) {
+        if( this.selectedItemComponents[i]['forSourceTask'].split(",").filter(part => part ==this.item.sourceTask).length == 1) {
           matches++;
         }
       }

projects/common-map/src/fm-map/components/zoom-to-show-alert/zoom-to-show-alert.component.ts

@@ -1,14 +1,15 @@
 import { Component, Input } from '@angular/core';
-import { layer } from 'ol';
+import { Layer } from 'ol/layer';
+import { Source } from 'ol/source';
 
 @Component({
   selector: 'fm-map-zoom-to-show-alert',
   template: '<div *fmMapIfZoomToShow="layer$" class="alert alert-info"><i class="fas fa-search-plus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Zoom in to show layer</span></div>'
 })
 export class ZoomToShowAlert {
-  public layer$: layer;
+  public layer$: Layer<Source>;
   @Input() 
-  set layer(layer:layer) {
+  set layer(layer:Layer<Source>) {
      this.layer$ = layer;
   }
 }

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

@@ -11,7 +11,7 @@ import { withLatestFrom, switchMap, map, catchError, mergeMap } from 'rxjs/opera
 import {GeoJSON,WKT} from 'ol/format';
 import {Feature} from 'ol';
 import { getCenter,createEmpty,extend } from 'ol/extent';
-import {Point} from 'ol/geom'
+import {Point,Geometry} from 'ol/geom'
 
 
 import * as mapActions from '../actions/map.actions';
@@ -50,7 +50,7 @@ export class MapEffects {
   private _wktFormat: WKT;
   private overrideSelectedItemLayer: boolean = false;
 
-  private updateFeatureGeometry(feature:Feature, updateEvent:commonActions.DeviceUpdateEvent): Feature {
+  private updateFeatureGeometry(feature:Feature<Geometry>, updateEvent:commonActions.DeviceUpdateEvent): Feature<Geometry> {
     let newFeature = feature.clone();
     var f = this._wktFormat.readFeature(updateEvent.attributes["geometry"],{
       dataProjection: 'EPSG:4326',
@@ -153,7 +153,7 @@ export class MapEffects {
       if (!action.query.bboxFilter) {
          if (extent) {
           for (let f of action.features) {
-            extend(extent, (f as Feature).getGeometry().getExtent());
+            extend(extent, (f as Feature<Geometry>).getGeometry().getExtent());
           }
           if(action.features && action.features.length >0) {
             actions.push(new mapActions.SetExtent(extent));
@@ -169,7 +169,7 @@ export class MapEffects {
         let extent = createEmpty();
         if (extent) {
           for (let f of action.features) {
-            extend(extent, (f as Feature).getGeometry().getExtent());
+            extend(extent, (f as Feature<Geometry>).getGeometry().getExtent());
           }
           if(action.features.length>0) return of(new mapActions.SetExtent(extent));
         }        
@@ -256,7 +256,7 @@ export class MapEffects {
     withLatestFrom(this.store$.select(mapReducers.selectGetFeatures)),
     mergeMap(([action, features]) => {
       let deviceUpdateEventAction = action as commonActions.DeviceUpdateEvent;
-      var feature: Feature = null;
+      var feature: Feature<Geometry> = null;
       for (let f of features) {
         if (f.getId() == deviceUpdateEventAction.itemCode) {
           feature = f;

projects/common-map/src/fm-map/models/clicked.feature.ts

@@ -0,0 +1,10 @@
+import {Feature} from 'ol';
+import {Geometry} from 'ol/geom';
+import { Observable } from 'rxjs';
+
+/**
+ * @deprecated This interface will be removed soon
+ */
+export interface IClickedFeature  {
+    clickedFeature: Observable<Feature<Geometry>> 
+}

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

@@ -1,9 +1,10 @@
 import { IItem,IListItem } from '@farmmaps/common';
 import {Layer} from 'ol/layer';
+import { Source } from 'ol/source';
 
 export interface IItemLayer  {
   item: IItem,
-  layer: Layer,
+  layer: Layer<Source>,
   visible: boolean,
   legendVisible:boolean,
   projection: string,
@@ -13,7 +14,7 @@ export interface IItemLayer  {
 
 export class ItemLayer implements IItemLayer {
   public item: IItem;
-  public layer: Layer = null;
+  public layer: Layer<Source> = null;
   public visible: boolean = true;
   public legendVisible: boolean = false;
   public projection: string;

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

@@ -1,5 +1,7 @@
-import {Style,Feature} from 'ol';
+import {Feature} from 'ol';
+import { Style } from 'ol/style';
+import {Geometry } from 'ol/geom';
 
 export interface IStyles{
-  [id: string]: Style | (Feature);
+  [id: string]: Style | ((featue:Feature<Geometry>) => Style);
 };

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

@@ -11,6 +11,7 @@ import {commonActions} from '@farmmaps/common';
 import { createSelector, createFeatureSelector } from '@ngrx/store';
 
 import {Feature} from 'ol';
+import {Geometry} from 'ol/geom';
 
 
 import { ROUTER_NAVIGATION, RouterNavigationAction } from '@ngrx/router-store';
@@ -45,10 +46,10 @@ export interface State {
   queryState: IQueryState,
   query:IQuery,
   parentCode: string,
-  features: Array<Feature>,
+  features: Array<Feature<Geometry>>,
   panelVisible: boolean,
   panelCollapsed: boolean,
-  selectedFeature: Feature,
+  selectedFeature: Feature<Geometry>,
   selectedItem:IItem,
   parentItem:IItem,
   clearEnabled: boolean,
@@ -384,17 +385,25 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
     }
     case mapActions.SETVISIBILITY: {
       let a = action as mapActions.SetVisibility;
-      let newLayers = state.overlayLayers.slice(0);
-      let i = state.overlayLayers.indexOf(a.itemLayer);
-      newLayers[i].visible = a.visibility;
-      return tassign(state, { overlayLayers: newLayers });
+      if(state.selectedItemLayer == a.itemLayer) {
+        return tassign(state,{selectedItemLayer: tassign(state.selectedItemLayer,{visible:a.visibility})});
+      } else {
+        let newLayers = state.overlayLayers.slice(0);
+        let i = state.overlayLayers.indexOf(a.itemLayer);
+        newLayers[i].visible = a.visibility;
+        return tassign(state, { overlayLayers: newLayers });  
+      }
     }
     case mapActions.SETOPACITY: {
       let a = action as mapActions.SetOpacity;
-      let newLayers = state.overlayLayers.slice(0);
-      let i = state.overlayLayers.indexOf(a.itemLayer);
-      newLayers[i].opacity = a.opacity;
-      return tassign(state, { overlayLayers: newLayers });
+      if(state.selectedItemLayer == a.itemLayer) {
+         return tassign(state,{selectedItemLayer: tassign(state.selectedItemLayer,{opacity:a.opacity})});
+      } else {
+        let newLayers = state.overlayLayers.slice(0);
+        let i = state.overlayLayers.indexOf(a.itemLayer);
+        newLayers[i].opacity = a.opacity;
+        return tassign(state, { overlayLayers: newLayers });  
+      }
     }
     case mapActions.SETLAYERINDEX: {
       let a = action as mapActions.SetLayerIndex;

projects/common-map/src/test.ts

@@ -1,8 +1,8 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
 import 'core-js/es7/reflect';
-import 'zone.js/dist/zone';
-import 'zone.js/dist/zone-testing';
+import 'zone.js';
+import 'zone.js/testing';
 import { getTestBed } from '@angular/core/testing';
 import {
   BrowserDynamicTestingModule,

projects/common-map/tsconfig.lib.json

@@ -22,8 +22,7 @@
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true,
-    "enableResourceInlining": true,
-    "enableIvy": false
+    "enableResourceInlining": true
   },
   "exclude": [
     "src/test.ts",

projects/common-map/tsconfig.lib.prod.json

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

projects/common-map3d/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@farmmaps/common-map3d",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "publishConfig": {
     "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
   },
   "peerDependencies": {
-    "@angular/common": "^10.1.3",
-    "@angular/core": "^10.1.3",
-    "ngx-openlayers": "1.0.0-next.16",
-    "cesium": "^1.73.0",
-    "ol-cesium": "^2.11.3"
+    "@angular/common":  "~12.2.8",
+    "@angular/core":  "~12.2.8",
+    "ngx-openlayers": "1.0.0-next.19",
+    "cesium": "^1.82.1",
+    "ol-cesium": "^2.13.0"
   },
   "dependencies": {
     "tslib": "^2.0.0"

projects/common-map3d/src/test.ts

@@ -1,7 +1,7 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
-import 'zone.js/dist/zone';
-import 'zone.js/dist/zone-testing';
+import 'zone.js';
+import 'zone.js/testing';
 import { getTestBed } from '@angular/core/testing';
 import {
   BrowserDynamicTestingModule,

projects/common-map3d/tsconfig.lib.json

@@ -22,8 +22,7 @@
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true,
-    "enableResourceInlining": true,
-    "enableIvy": false
+    "enableResourceInlining": true
   },
   "exclude": [
     "src/test.ts",

projects/common-map3d/tsconfig.lib.prod.json

@@ -1,10 +1,40 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-  "extends": "./tsconfig.lib.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "declarationMap": false
+    "outDir": "../../out-tsc/lib",
+    "target": "es2015",
+    "module": "es2015",
+    "moduleResolution": "node",
+    "declaration": true,
+    "sourceMap": true,
+    "inlineSources": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "importHelpers": true,
+    "esModuleInterop": true,
+    "types": [],
+    "lib": [
+      "dom",
+      "es2018"
+    ],
+    "paths": {
+      "@angular/*": [
+
+      "node_modules/@angular/*"
+
+      ]
+    }
   },
   "angularCompilerOptions": {
-    "enableIvy": false
-  }
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true,
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true,
+    "enableResourceInlining": true,
+    "compilationMode": "partial"
+  },
+  "exclude": [
+    "src/test.ts",
+    "**/*.spec.ts"
+  ]
 }

projects/common/ng-package.json

@@ -7,7 +7,7 @@
       "my-data": "my-data"
     }
   },
-  "whitelistedNonPeerDependencies": [
+  "allowedNonPeerDependencies": [
     "."
   ]
 }

projects/common/package.json

@@ -1,22 +1,22 @@
 {
   "name": "@farmmaps/common",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "publishConfig": {
     "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
   },
   "peerDependencies": {
     "@ng-bootstrap/ng-bootstrap": "^7.0",
-    "@angular/common": "~10.2.4",
-    "@angular/core": "~10.2.4",
-    "@angular/forms": "~10.2.4",
-    "@ngrx/effects": "^10.0",
-    "@ngrx/router-store": "^10.0",
-    "@ngrx/store": "^10.0",
+    "@angular/common": "~12.2.8",
+    "@angular/core": "~12.2.8",
+    "@angular/forms": "~12.2.8",
+    "@ngrx/effects": "^12.0",
+    "@ngrx/router-store": "^12.0",
+    "@ngrx/store": "^12.0",
     "tassign": "^1.0.0",
     "bootstrap": "^4.4.1",
     "@microsoft/signalr": "^3.1.3",
     "ngx-uploadx": "^3.3.4",
-    "angular-oauth2-oidc": "^10.0.3",
+    "angular-oauth2-oidc": "^12.0",
     "moment": "^2.27.0",
     "ngx-avatar": "^4.0.0",
     "ngx-image-cropper": "^3.3.5",

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

@@ -12,6 +12,9 @@ export const INITUSERSUCCESS = '[AppCommon] InitUserSuccess';
 export const INITUSERPACKAGES = '[AppCommon] InitUserPackages';
 export const INITUSERPACKAGESSUCCESS = '[AppCommon] InitUserPackagesSuccess';
 
+export const INITPACKAGES = '[AppCommon] InitPackages';
+export const INITPACKAGESSUCCESS = '[AppCommon] InitPackagesSuccess';
+
 export const INITUSERSETTINGSROOT = '[AppCommon] InitUserSettingsRoot';
 export const INITUSERSETTINGSROOTSUCCESS = '[AppCommon] InitUserSettingsRootSuccess';
 
@@ -102,6 +105,18 @@ export class InitUserPackagesSuccess implements Action {
   constructor(public items:IItem[] ) { }
 }
 
+export class InitPackages implements Action {
+  readonly type = INITPACKAGES;
+
+  constructor() {}
+}
+
+export class InitPackagesSuccess implements Action {
+  readonly type = INITPACKAGESSUCCESS;
+
+  constructor(public items:IItem[] ) { }
+}
+
 export class InitUserSettingsRoot implements Action {
   readonly type = INITUSERSETTINGSROOT;
 
@@ -381,6 +396,8 @@ export type Actions = OpenModal
   | SetMenuVisible
   | InitUserPackages
   | InitUserPackagesSuccess
+  | InitPackages
+  | InitPackagesSuccess
   | InitUserSettingsRoot
   | InitUserSettingsRootSuccess
   | ToggleAccountMenu

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

@@ -35,6 +35,7 @@ import { PackageService } from './services/package.service';
 import { PackagePreloadStrategy } from './services/package-preload-strategy.service';
 import { SenmlService } from './services/senml-service';
 import { DeviceService } from './services/device.service';
+import { GradientService} from './services/gradient.service';
 
 export {
   FolderService,
@@ -61,7 +62,8 @@ export {
   PackageService,
   SenmlService,
   PackagePreloadStrategy,
-  DeviceService
+  DeviceService,
+  GradientService
 };
 
 @NgModule({

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

@@ -1,5 +1,5 @@
 // angular modules
-import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector, Optional, SkipSelf } from '@angular/core';
+import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector, Optional, SkipSelf,InjectionToken } from '@angular/core';
 import { CommonModule, DatePipe } from '@angular/common';
 import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { FormsModule } from '@angular/forms';
@@ -32,6 +32,7 @@ import { TimespanComponent } from './components/timespan/timespan.component';
 import { TagInputComponent } from './components/tag-input/tag-input.component';
 import { MenuBackgroundComponent } from './components/menu-background/menu-background.component';
 import { HasPackageDirective} from './components/has-package/has-package.directive';
+import { PackageExistsDirective} from './components/package-exists/package-exists.directive';
 import { HasClaimDirective} from './components/has-claim/has-claim.directive';
 import { UserMenuComponent} from './components/user-menu/user-menu.component';
 import { ThumbnailComponent } from './components/thumbnail/thumbnail.component';
@@ -66,6 +67,7 @@ import { AvatarComponent } from './components/avatar/avatar.component';
 import { AvatarModule } from 'ngx-avatar';
 import { ImageCropperModule } from 'ngx-image-cropper';
 
+export const FM_COMMON_STARTPAGE = new InjectionToken<string>('fm-common-startpage');
 
 export {
   SafePipe,
@@ -81,6 +83,7 @@ export {
   UserMenuComponent,
   ThumbnailComponent,
   HasPackageDirective,
+  PackageExistsDirective,
   HasClaimDirective,
   Alert,
   IEventMessage,
@@ -110,7 +113,9 @@ export {
   IGradientstop,
   BackButtonComponent,
   AvatarComponent,
-  EditImageModalComponent
+  EditImageModalComponent,
+  GradientComponent,
+  GradientSelectComponent
 };
 
 @NgModule({
@@ -141,6 +146,7 @@ export {
     SessionClearedComponent,
     MenuBackgroundComponent,
     HasPackageDirective,
+    PackageExistsDirective,
     HasClaimDirective,
     UserMenuComponent,
     GradientComponent,
@@ -171,6 +177,7 @@ export {
     SessionClearedComponent,
     MenuBackgroundComponent,
     HasPackageDirective,
+    PackageExistsDirective,
     HasClaimDirective,
     UserMenuComponent,
     GradientComponent,

projects/common/src/fm/components/app-menu/app-menu.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AppMenuComponent } from './app-menu.component';
-
-describe('AppMenuComponent', () => {
-  let component: AppMenuComponent;
-  let fixture: ComponentFixture<AppMenuComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ AppMenuComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AppMenuComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

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

@@ -4,7 +4,7 @@
     <button type="button" class="btn btn-outline-secondary apponly" (click)="handleToggleMenu($event)"><i class="fal fa-bars" aria-hidden="true"></i></button>
     <router-outlet name="menu" class="ml-4"></router-outlet>
     <div class="collapse navbar-collapse pageonly">      
-      <a class="btn btn-primary ml-auto" role="button" [routerLink]="['/map']">
+      <a class="btn btn-primary ml-auto" role="button" [routerLink]="[ startPage == null?'/map':startPage]">
         <span *ngIf="(user|async)==null" i18n>Sign in</span>
         <span *ngIf="(user|async)!=null" i18n>To app</span>
       </a>

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

@@ -1,4 +1,4 @@
-import { Component, OnInit, OnDestroy, Inject, ViewEncapsulation, RendererFactory2, PLATFORM_ID, ChangeDetectionStrategy, HostListener, Input } from '@angular/core';
+import { Component, OnInit, OnDestroy, Inject, Optional,ViewEncapsulation, RendererFactory2, PLATFORM_ID, ChangeDetectionStrategy, HostListener, Input } from '@angular/core';
 import { Router, NavigationStart, NavigationEnd, RouteConfigLoadStart, RouteConfigLoadEnd, ActivatedRoute, PRIMARY_OUTLET } from '@angular/router';
 import { Meta, Title, MetaDefinition } from '@angular/platform-browser'; import { DOCUMENT } from "@angular/common";
 import { Subscription, Observable } from 'rxjs';
@@ -6,6 +6,7 @@ import { distinctUntilChanged } from 'rxjs/operators';
 import { Store, Action } from '@ngrx/store';
 import { IUser } from '../../models/user';
 import { OAuthService, OAuthErrorEvent } from 'angular-oauth2-oidc';
+import { FM_COMMON_STARTPAGE} from '../../common.module';
 
 //AppCommon
 import { IEventMessage } from '../../models/event.message';
@@ -51,6 +52,7 @@ export class AppComponent implements OnInit, OnDestroy {
   @Input() showUploadProgress: boolean = true;
 
   constructor(
+    @Optional() @Inject(FM_COMMON_STARTPAGE) public startPage: string,
     public router: Router,
     private activatedRoute$: ActivatedRoute,
     private title$: Title,

projects/common/src/fm/components/avatar/avatar.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AvatarComponent } from './avatar.component';
-
-describe('AvatarComponent', () => {
-  let component: AvatarComponent;
-  let fixture: ComponentFixture<AvatarComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ AvatarComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AvatarComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { EditImageModalComponent } from './edit-image-modal.component';
-
-describe('EditImageModalComponent', () => {
-  let component: EditImageModalComponent;
-  let fixture: ComponentFixture<EditImageModalComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ EditImageModalComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EditImageModalComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

projects/common/src/fm/components/gradient-select/gradient-select.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { GradientSelectComponent } from './gradient-select.component';
-
-describe('GradientSelectComponent', () => {
-  let component: GradientSelectComponent;
-  let fixture: ComponentFixture<GradientSelectComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ GradientSelectComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(GradientSelectComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

projects/common/src/fm/components/gradient/gradient.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { GradientComponent } from './gradient.component';
-
-describe('GradientComponent', () => {
-  let component: GradientComponent;
-  let fixture: ComponentFixture<GradientComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ GradientComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(GradientComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

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

@@ -1,6 +1,7 @@
 import { Component, Input, OnInit ,OnChanges, SimpleChanges,ChangeDetectorRef} from '@angular/core';
 import { IItem} from '../../models/item'
 import { IGradientstop } from '../../models/gradient';
+import { GradientService } from '../../common-service.module';
 
 
 
@@ -14,23 +15,12 @@ export class GradientComponent implements OnInit,OnChanges {
   @Input() gradientItem:IItem;
   public gradientStyle:any = {};
 
-  constructor(private ref: ChangeDetectorRef) { }
+  constructor(private ref: ChangeDetectorRef,private gradientService:GradientService) { }
 
   getGradientStyle(item:IItem):any {
     if(item.data && item.data.gradient) {
       let gradient = item.data.gradient as IGradientstop[];
-      let gd = '{ "background": "linear-gradient(to right,';
-      for(var i=0;i<gradient.length;i++) {
-        let gs = gradient[i];
-        if(i>0) gd+=",";
-        gd += `rgba(${gs.color.red},${gs.color.green},${gs.color.blue},${gs.color.alpha/255})`;          
-        gd +=` ${gs.relativestop*100}%`
-      }
-      gradient.forEach((gs) => {
-      });
-      gd+=')"}';
-      
-      return JSON.parse(gd);
+      return this.gradientService.getGradientStyle(gradient);
     }
   }
 
@@ -49,5 +39,4 @@ export class GradientComponent implements OnInit,OnChanges {
       }      
     }
   }
-
 }

projects/common/src/fm/components/has-package/has-package.directive.ts

@@ -1,61 +1,61 @@
-import { Directive, ViewContainerRef,TemplateRef,OnInit,Input,OnDestroy } from '@angular/core';
-import { Store} from '@ngrx/store';
-import * as appCommonReducer from '../../reducers/app-common.reducer'
-import { IPackages } from '../../models/package';
-import { Observable, Subscription } from 'rxjs';
+import {AfterViewInit, Directive, Input, OnDestroy, TemplateRef, ViewContainerRef} from '@angular/core';
+import {Subscription} from 'rxjs';
+import {PackageService} from '../../services/package.service';
+import * as appCommonReducer from '../../reducers/app-common.reducer';
+import {Store} from '@ngrx/store';
 
 @Directive({
   selector: '[fmHasPackage]',
 })
-export class HasPackageDirective  implements OnDestroy{
+export class HasPackageDirective implements OnDestroy, AfterViewInit {
+
   @Input()
-  set fmHasPackage(packageIdentifier:string) {
-    this.packageIdentifier$ = packageIdentifier;
-    this.updateView(); 
+  set fmHasPackage(packageIdentifier: string) {
+    this.packageIdentifier = packageIdentifier;
+    this.updateView();
   }
 
   @Input()
-  set fmHasPackageThen(thenTemplate:TemplateRef<any>) {
-    this.thenTemplate$ = thenTemplate;
-    this.updateView(); 
+  set fmHasPackageThen(thenTemplate: TemplateRef<any>) {
+    this.thenTemplate = thenTemplate;
+    this.updateView();
   }
 
   @Input()
-  set fmHasPackageElse(thenTemplate:TemplateRef<any>) {
-    this.elseTemplate$ = thenTemplate;
-    this.updateView(); 
+  set fmHasPackageElse(thenTemplate: TemplateRef<any>) {
+    this.elseTemplate = thenTemplate;
+    this.updateView();
   }
 
-  private packageIdentifier$:string;
-  private thenTemplate$:TemplateRef<any>;
-  private elseTemplate$:TemplateRef<any>;
-  private packages$:any = {};
-  private packagesObservable$:Observable<IPackages> = this.store$.select(appCommonReducer.SelectGetUserPackages);
-  private packSub:Subscription;
+  private packageIdentifier: string;
+  private thenTemplate: TemplateRef<any>;
+  private elseTemplate: TemplateRef<any>;
+  private packSub: Subscription;
 
-  constructor(private templateRef$: TemplateRef<any>,private viewContainerRef$: ViewContainerRef,private store$: Store<appCommonReducer.State>) { 
-    this.thenTemplate$=templateRef$;
-    this.packSub = this.store$.select(appCommonReducer.SelectGetUserPackages).subscribe((packages) => {
-      this.packages$ = packages;
-        this.updateView();     
+  constructor(private hostTemplateRef: TemplateRef<any>, private viewContainerRef: ViewContainerRef,
+              private store: Store<appCommonReducer.State>, private packageService: PackageService) {
+    this.thenTemplate = hostTemplateRef;
+    this.packSub = this.store.select(appCommonReducer.SelectGetValidUserPackages).subscribe((_) => {
+      this.updateView();
     });
-    this.updateView(); 
   }
 
+  ngAfterViewInit() {
+    this.updateView();
+  }
 
   updateView() {
-    this.viewContainerRef$.clear();
-    const today = new Date(new Date(Date.now()).toUTCString()).setHours(0, 0, 0, 0);
-    if (this.packages$[this.packageIdentifier$] &&
-      (this.packages$[this.packageIdentifier$].dataDate && new Date(this.packages$[this.packageIdentifier$].dataDate).setHours(0, 0, 0, 0) <= today) &&
-      (this.packages$[this.packageIdentifier$].dataEndDate == null || new Date(this.packages$[this.packageIdentifier$].dataEndDate).setHours(0, 0, 0, 0) >= today)) {
-      this.viewContainerRef$.createEmbeddedView(this.thenTemplate$);
-    } else if (this.elseTemplate$) {
-      this.viewContainerRef$.createEmbeddedView(this.elseTemplate$);
-    } 
+    this.viewContainerRef.clear();
+    if (this.packageService.hasPackage(this.packageIdentifier)) {
+      this.viewContainerRef.createEmbeddedView(this.thenTemplate);
+    } else if (this.elseTemplate) {
+      this.viewContainerRef.createEmbeddedView(this.elseTemplate);
+    }
   }
 
   ngOnDestroy() {
-    if(this.packSub) this.packSub.unsubscribe();
+    if (this.packSub) {
+      this.packSub.unsubscribe();
+    }
   }
-}
+}

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

@@ -1,4 +1,4 @@
-<div>
+<div class="mobile-hide">
     <div   (click)="toggle($event)" class="rounded-circle menu-button hidden"  [ngClass]="{'hidden':!user || noContent}">
         <span i18n-title title="Help"><i class="fas fa-question" aria-hidden="true"></i></span>
         <div class="menu hidden" [ngClass]="{'hidden':!showMenu}">                                     

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

@@ -68,6 +68,16 @@ div.menu-button > span {
     }
 }    
 
+.mobile-hide {
+    display: inherit;
+}
+
+@media screen and (max-width: 768px) {
+    .mobile-hide {
+        display: none;
+    }
+}
+
 .unread {
     display: block;
     position: absolute;

projects/common/src/fm/components/help-menu/help-menu.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HelpMenuComponent } from './help-menu.component';
-
-describe('HelpMenuComponent', () => {
-  let component: HelpMenuComponent;
-  let fixture: ComponentFixture<HelpMenuComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ HelpMenuComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(HelpMenuComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

projects/common/src/fm/components/notification-menu/notification-menu.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { NotificationMenuComponent } from './notification-menu.component';
-
-describe('NotificationMenuComponent', () => {
-  let component: NotificationMenuComponent;
-  let fixture: ComponentFixture<NotificationMenuComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ NotificationMenuComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(NotificationMenuComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

projects/common/src/fm/components/package-exists/package-exists.directive.ts

@@ -0,0 +1,61 @@
+import {AfterViewInit, Directive, Input, OnDestroy, TemplateRef, ViewContainerRef} from '@angular/core';
+import {Subscription} from 'rxjs';
+import {PackageService} from '../../services/package.service';
+import * as appCommonReducer from '../../reducers/app-common.reducer';
+import {Store} from '@ngrx/store';
+
+@Directive({
+  selector: '[fmPackageExists]',
+})
+export class PackageExistsDirective implements OnDestroy, AfterViewInit {
+
+  @Input()
+  set fmPackageExists(packageIdentifier: string) {
+    this.packageIdentifier = packageIdentifier;
+    this.updateView();
+  }
+
+  @Input()
+  set fmPackageExistsThen(thenTemplate: TemplateRef<any>) {
+    this.thenTemplate = thenTemplate;
+    this.updateView();
+  }
+
+  @Input()
+  set fmPackageExistsElse(thenTemplate: TemplateRef<any>) {
+    this.elseTemplate = thenTemplate;
+    this.updateView();
+  }
+
+  private packageIdentifier: string;
+  private thenTemplate: TemplateRef<any>;
+  private elseTemplate: TemplateRef<any>;
+  private packSub: Subscription;
+
+  constructor(private hostTemplateRef: TemplateRef<any>, private viewContainerRef: ViewContainerRef,
+              private store: Store<appCommonReducer.State>, private packageService: PackageService) {
+    this.thenTemplate = hostTemplateRef;
+    this.packSub = this.store.select(appCommonReducer.SelectGetPackages).subscribe((_) => {
+      this.updateView();
+    });
+  }
+
+  ngAfterViewInit() {
+    this.updateView();
+  }
+
+  updateView() {
+    this.viewContainerRef.clear();
+    if (this.packageService.packageExists(this.packageIdentifier)) {
+      this.viewContainerRef.createEmbeddedView(this.thenTemplate);
+    } else if (this.elseTemplate) {
+      this.viewContainerRef.createEmbeddedView(this.elseTemplate);
+    }
+  }
+
+  ngOnDestroy() {
+    if (this.packSub) {
+      this.packSub.unsubscribe();
+    }
+  }
+}

projects/common/src/fm/components/tag-input/tag-input.component.html

@@ -1,3 +1,11 @@
-<div class="tags">
-  <span class="tag rounded bg-primary text-white" *ngFor="let tag of tags;"><span>{{tag}}</span> <i (click)="handleDeleteTag(tag)" class="fal fa-times" aria-hidden="true"></i></span><input type="text" #taginput (blur)="handleAddTag($event)" (keyup)="handleCheckAddTag($event)" [(ngModel)]="tag" [ngbTypeahead]="findTag" (selectItem)="handleSelect($event)" placeholder="New tag"/>
-</div>
+<div class="tags">
+  <span class="tag rounded bg-primary text-white" *ngFor="let tag of tags;"><span>{{tag}}</span> <i
+    (click)="handleDeleteTag(tag)" class="fal fa-times" aria-hidden="true"></i></span><input
+  type="text" #tagInputElement
+  (blur)="handleBlur($event, false)"
+  (keyup)="handleKeyUp($event)"
+  [(ngModel)]="tag"
+  [ngbTypeahead]="findTag"
+  (selectItem)="handleSelect($event)"
+  placeholder="New tag"/>
+</div>

projects/common/src/fm/components/tag-input/tag-input.component.ts

@@ -1,104 +1,122 @@
-import { Component, Input, forwardRef,ElementRef,ViewChild } from '@angular/core';
-import { ControlValueAccessor, NG_VALUE_ACCESSOR,NgModel } from '@angular/forms';
-import { Observable,of } from 'rxjs';
-import { tap,catchError,debounceTime,distinctUntilChanged,switchMap } from 'rxjs/operators'
-import { TypeaheadService } from '../../services/typeahead.service';
-
-@Component({
-  selector: 'fm-tag-input',
-  templateUrl: 'tag-input.component.html',
-  styleUrls: ['tag-input.component.scss'],
-  providers: [
-    {
-      provide: NG_VALUE_ACCESSOR,
-      useExisting: forwardRef(() => TagInputComponent),
-      multi: true
-    }
-  ]
-})
-
-export class TagInputComponent implements ControlValueAccessor  {
-  @Input() tags: string[]
-  @ViewChild('taginput', { static: true }) tagInputElement: ElementRef;
-  public tag: string;
-  searching = false;
-  searchFailed = false;
-
-  constructor(private typeaheadService: TypeaheadService) {
-  }
-
-  tagExists(tag) {
-    if (tag.length == 0) return true;
-    for (let t of this.tags) {
-      if (t.toLowerCase() == tag.toLowerCase()) return true;
-    }
-    return false;
-  }
-
-  handleDeleteTag(tag) {
-    let tags = [];
-    for (let t of this.tags) {
-      if (t != tag) tags.push(t);
-    }
-    this.tags = tags;
-    this.propagateChange(tags);
-  }
-
-  handleAddTag(event) {
-    if (!this.tagExists(this.tag)) {
-      this.tags.push(this.tag);
-      this.propagateChange(this.tags);
-    }
-    this.tag = "";
-    this.tagInputElement.nativeElement.focus();
-  }
-
-  handleCheckAddTag(event: KeyboardEvent) {
-    if (event.keyCode == 188) {
-      let tag = this.tag.substr(0, this.tag.length - 1); // strip ,
-      if (!this.tagExists(tag)) {
-        this.tags.push(tag);
-        this.propagateChange(this.tags);
-      }
-      this.tag = "";
-    }
-  }
-
-  handleSelect(event) {
-    if (!this.tagExists(event.item)) {
-      this.tags.push(event.item);
-      this.propagateChange(this.tags);
-    }
-    event.preventDefault();
-    this.tag = "";
-  }
-
-  propagateChange = (_: any) => { };
-
-  registerOnChange(fn) {
-    this.propagateChange = fn;
-  }
-
-  findTag = (text$: Observable<string>) =>
-  text$.pipe(
-        debounceTime(200),
-        distinctUntilChanged(), 
-        tap(() => this.searching = true),
-        switchMap(term => term.length < 1 ? of([]) :
-           this.typeaheadService.getTagTypeaheadItems(term).pipe(
-            tap(() => this.searchFailed = false),
-            catchError(() => {
-                this.searchFailed = true;
-                return of([]);
-            }))
-         ),
-         tap(() => this.searching = false)
-  );
-
-  writeValue(value: any) {
-    this.tags = value;
-    this.tag = "";
-  }
-
-  registerOnTouched() { }
-}
+import {Component, ElementRef, forwardRef, Input, ViewChild} from '@angular/core';
+import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
+import {Observable, of} from 'rxjs';
+import {catchError, debounceTime, distinctUntilChanged, switchMap, tap} from 'rxjs/operators';
+import {TypeaheadService} from '../../services/typeahead.service';
+import {NgbTypeahead} from '@ng-bootstrap/ng-bootstrap';
+
+@Component({
+  selector: 'fm-tag-input',
+  templateUrl: 'tag-input.component.html',
+  styleUrls: ['tag-input.component.scss'],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => TagInputComponent),
+      multi: true
+    }
+  ]
+})
+
+export class TagInputComponent implements ControlValueAccessor {
+  @Input() tags: string[] = [];
+  @ViewChild('tagInputElement', {static: true}) tagInputElement: ElementRef;
+  @ViewChild(NgbTypeahead, {static: true}) typeahead: NgbTypeahead;
+
+  public tag: string;
+  searching = false;
+  searchFailed = false;
+
+  constructor(private typeaheadService: TypeaheadService) {
+  }
+
+  tagExists(tag) {
+    if (tag.length === 0) {
+      return true;
+    }
+    for (const t of this.tags) {
+      if (t.toLowerCase() === tag.toLowerCase()) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  addTag(tag, keepFocus = true) {
+    if (!this.tagExists(tag)) {
+      this.tags.push(tag);
+      this.propagateChange(this.tags);
+    }
+    this.tag = '';
+
+    if (keepFocus) {
+      this.tagInputElement.nativeElement.focus();
+    }
+  }
+
+  handleDeleteTag(tag) {
+    const tags = [];
+    for (const t of this.tags) {
+      if (t !== tag) {
+        tags.push(t);
+      }
+    }
+    this.tags = tags;
+    this.propagateChange(tags);
+  }
+
+  handleBlur(event, keepFocus = true) {
+    if (!this.typeahead.isPopupOpen()) {
+      this.addTag(this.tag, keepFocus);
+    } else {
+      this.tag = '';
+    }
+  }
+
+  handleKeyUp(event: KeyboardEvent) {
+    if (event.keyCode === 188) {
+      const tag = this.tag.substr(0, this.tag.length - 1); // strip ,
+      this.addTag(tag);
+    }
+  }
+
+  handleSelect(event) {
+    if (!this.tagExists(event.item)) {
+      this.tags.push(event.item);
+      this.propagateChange(this.tags);
+    }
+    event.preventDefault();
+    this.tag = '';
+  }
+
+  propagateChange = (_: any) => {
+  };
+
+  registerOnChange(fn) {
+    this.propagateChange = fn;
+  }
+
+  findTag = (text$: Observable<string>) =>
+    text$.pipe(
+      distinctUntilChanged(),
+      debounceTime(200),
+      tap(() => this.searching = true),
+      switchMap(term => term.length < 1 ? of([]) :
+        this.typeaheadService.getTagTypeaheadItems(term).pipe(
+          tap(() => this.searchFailed = false),
+          catchError(() => {
+            this.searchFailed = true;
+            return of([]);
+          }))
+      ),
+      tap(() => this.searching = false)
+    );
+
+  writeValue(value: any) {
+    this.tags = value;
+    this.tag = '';
+  }
+
+  registerOnTouched() {
+  }
+}

projects/common/src/fm/components/user-menu/user-menu.component.spec.ts

@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { UserMenuComponent } from './user-menu.component';
-
-describe('UserMenuComponent', () => {
-  let component: UserMenuComponent;
-  let fixture: ComponentFixture<UserMenuComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ UserMenuComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(UserMenuComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

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

@@ -62,6 +62,15 @@ export class AppCommonEffects {
       )
     })
   ));
+  initPackages$ =  createEffect(() => this.actions$.pipe(
+    ofType(appCommonActions.INITPACKAGES),
+    switchMap(() => {
+      return this.itemService$.getItemList('vnd.farmmaps.itemtype.package.template').pipe(
+        switchMap((items) => of(new appCommonActions.InitPackagesSuccess(items))),
+        catchError(error =>  of(new appCommonActions.Fail(error)))
+      )
+    })
+  ));
 
   userPackagesChanged$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.ITEMCHANGEDEVENT),
@@ -99,7 +108,7 @@ export class AppCommonEffects {
   initUserSuccess$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.INITUSERSUCCESS),
     switchMap(() => {
-      return [new appCommonActions.InitRoot(),new appCommonActions.InitUserPackages(),new appCommonActions.InitUserSettingsRoot()];
+      return [new appCommonActions.InitRoot(),new appCommonActions.InitUserPackages(),new appCommonActions.InitPackages(),new appCommonActions.InitUserSettingsRoot()];
     }
     )));
 

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

@@ -7,5 +7,10 @@ export interface IPackage {
 }
 
 export interface IPackages {
+    [id: string]: IPackage[];
+}
+
+export interface IPackageMap {
     [id: string]: IPackage;
-}
+}
+

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

@@ -2,12 +2,13 @@ import { tassign } from 'tassign';
 import { IItemTypes} from '../models/item.types';
 import { IListItem } from '../models/list.item';
 import { IUser } from '../models/user';
-import { IPackage,IPackages} from '../models/package';
+import { IPackage,IPackageMap,IPackages} from '../models/package';
 import * as appCommonActions from '../actions/app-common.actions';
 import { createSelector, createFeatureSelector, ActionReducerMap } from '@ngrx/store';
 
 import { MODULE_NAME } from '../module-name';
 import { IItem } from '../models/item';
+import {getValidPackages, isValidPackage} from '../services/package.service';
 
 export interface State {
   openedModalName: string,
@@ -19,6 +20,7 @@ export interface State {
   routeLoading:boolean,
   menuVisible: boolean,
   userPackages: IPackages,
+  packages: IPackageMap,
   userSettingsRoot: IItem,
   accountMenuVisible: boolean,
   appMenuVisible: boolean,
@@ -39,6 +41,7 @@ export const initialState: State = {
   routeLoading: false,
   menuVisible: false,
   userPackages: {},
+  packages: {},
   userSettingsRoot: null,
   accountMenuVisible: false,
   appMenuVisible: false,
@@ -57,16 +60,16 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
     case appCommonActions.INITUSERSUCCESS: {
       let a = action as appCommonActions.InitUserSuccess;
       let claims = {}
-      Object.getOwnPropertyNames(a.userinfo).forEach((k) => {
+      Object.getOwnPropertyNames(a.userinfo.info).forEach((k) => {
          claims[k] = a.userinfo[k];
       });
       var user:IUser = {
         code:a.user.code,
-        email:a.userinfo["email"],
-        name:a.userinfo["name"],
+        email:claims["email"]!== undefined ? claims["email"] : a.user.name,
+        name:claims["name"]!== undefined?claims["name"] : a.user.email,
         claims:claims,
         searchable: false
-      };     
+      };
       return tassign(state, { user: user });
     }
     case appCommonActions.INITROOTSUCCESS: {
@@ -75,10 +78,10 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
     }
     case appCommonActions.OPENMODAL: {
       return tassign(state, { openedModalName: action.modalName });
-    }      
+    }
     case appCommonActions.CLOSEMODAL: {
       return tassign(state, { openedModalName: null });
-    }    
+    }
     case appCommonActions.LOADITEMTYPESSUCCESS: {
       let a = action as appCommonActions.LoadItemTypesSuccess;
       return tassign(state, { itemTypes: a.itemTypes });
@@ -131,11 +134,23 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
       a.items.forEach((item) => {
         item.data.dataDate = item.dataDate;
         item.data.dataEndDate = item.dataEndDate;
-        packages[item.data.id]=item.data;
+        if (!packages[item.data.id]) {
+          packages[item.data.id] = [];
+        }
+        packages[item.data.id].push(item.data);
       });
 
       return tassign(state,{userPackages:packages});
     }
+    case appCommonActions.INITPACKAGESSUCCESS:{
+      let a = action as appCommonActions.InitPackagesSuccess;
+      let packages = {}
+      a.items.forEach((item) => {
+        packages[item.data.id] = item.data;
+      });
+
+      return tassign(state,{packages:packages});
+    }
     case appCommonActions.INITUSERSETTINGSROOTSUCCESS:{
       let a = action as appCommonActions.InitUserSettingsRootSuccess;
       return tassign(state, { userSettingsRoot : a.item });
@@ -183,6 +198,7 @@ export const getRouteLoading = (state: State) => state.routeLoading;
 export const getMenuVisible = (state: State) => state.menuVisible;
 export const getUser = (state: State) => state.user;
 export const getUserPackages = (state: State) => state.userPackages;
+export const getPackages = (state: State) => state.packages;
 export const getUserSettingsRoot = (state: State) => state.userSettingsRoot;
 export const getAccountMenuVisible = (state: State) => state.accountMenuVisible;
 export const getAppMenuVisible = (state: State) => state.appMenuVisible;
@@ -203,6 +219,10 @@ export const selectGetRouteLoading = createSelector(selectAppCommonState, getRou
 export const SelectGetMenuVisible = createSelector(selectAppCommonState,getMenuVisible);
 export const SelectGetUser = createSelector(selectAppCommonState,getUser);
 export const SelectGetUserPackages = createSelector(selectAppCommonState,getUserPackages);
+export const SelectGetPackages = createSelector(selectAppCommonState,getPackages);
+export const SelectGetValidUserPackages = createSelector(SelectGetUserPackages, (packageMap) => {
+  return getValidPackages(packageMap);
+});
 export const SelectGetUserSettingsRoot = createSelector(selectAppCommonState,getUserSettingsRoot);
 export const SelectGetAccountMenuVisible = createSelector(selectAppCommonState,getAccountMenuVisible);
 export const SelectGetAppMenuVisible = createSelector(selectAppCommonState,getAppMenuVisible);
@@ -213,3 +233,4 @@ export const SelectgetUnreadNotifications = createSelector(selectAppCommonState,
 export const SelectGetIsOnline = createSelector(selectAppCommonState,getIsOnline);
 export const SelectGetIsPageMode = createSelector(selectAppCommonState,getIsPageMode);
 
+

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

@@ -0,0 +1,25 @@
+import { Injectable } from '@angular/core';
+import {IGradientstop } from '../models/gradient'
+
+@Injectable({
+  providedIn: 'root',
+})
+export class GradientService {
+  constructor() {
+  }
+
+  getGradientStyle(gradient:IGradientstop[],portrait:boolean = false ):any {
+      let gd = '{ "background": "linear-gradient(to ' + (portrait?'bottom':'right') +',';
+      for(var i=0;i<gradient.length;i++) {
+        let gs = gradient[i];
+        if(i>0) gd+=",";
+        gd += `rgba(${gs.color.red},${gs.color.green},${gs.color.blue},${gs.color.alpha/255})`;          
+        gd +=` ${gs.relativestop*100}%`
+      }
+      gradient.forEach((gs) => {
+      });
+      gd+=')"}';
+      
+      return JSON.parse(gd);
+    }  
+}

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

@@ -24,7 +24,7 @@ export class ItemService {
     return this.httpClient.get<{ [id: string]: IItemType }>(`${this.ApiEndpoint()}/api/v1/itemtypes/`);
   }
 
-  getFeatures(extent: number[], crs: string, searchText?: string, searchTags?:string,startDate?:Date,endDate?:Date,itemType?:string,parentCode?:string,dataFilter?:string,level?:number): Observable<any> {
+  getFeatures(extent: number[], crs: string, searchText?: string, searchTags?:string,startDate?:Date,endDate?:Date,itemType?:string,parentCode?:string,dataFilter?:string,level?:number,indexed?:boolean): Observable<any> {
     var params = new HttpParams();
     params = params.append("crs", crs);
     if (extent) params =params.append("bbox", extent.join(","));
@@ -42,6 +42,7 @@ export class ItemService {
     if (parentCode) params = params.append("pc", parentCode);
     if (dataFilter) params = params.append("df", dataFilter);
     if (level) params = params.append("lvl", level.toString());
+    params = params.append("ind", indexed ?? true);
     return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/items/features/`, {params:params});
   }
 
@@ -73,16 +74,17 @@ export class ItemService {
 
   getItemList(itemType?: string, dataFilter?: any, level?: number, atItemLocationItemCode?: string, indexed?: boolean, validToday?: boolean): Observable<IItem[]> {
     var params = new HttpParams();
-    if(itemType)  params = params.append("it", itemType);   
-    if(dataFilter) params = params.append("df", JSON.stringify(dataFilter));    
-    if(atItemLocationItemCode) params = params.append("ail",atItemLocationItemCode);    
-    if(indexed) params = params.append("ind",indexed?"true":"false");    
+    if(itemType)  params = params.append("it", itemType);
+    if(dataFilter) params = params.append("df", JSON.stringify(dataFilter));
+    if(atItemLocationItemCode) params = params.append("ail",atItemLocationItemCode);
+    if(indexed) params = params.append("ind",indexed?"true":"false");
     if (level) params = params.append("lvl", level.toFixed());
     if (validToday) params = params.append("vt", validToday ? "true" : "false");
     return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/`, { params: params });
   }
 
-  getChildItemList(parentcode: string, itemType: string, dataFilter?: any, level: number = 1, deep: boolean = true): Observable<IItem[]> {
+  getChildItemList(parentcode: string, itemType: string, dataFilter?: any, level: number = 1, deep: boolean = true,
+                   startDate?: Date, endDate?: Date): Observable<IItem[]> {
     var params = new HttpParams();
     if(itemType != null) {
       params = params.append("it", itemType);
@@ -92,6 +94,8 @@ export class ItemService {
     }
     params = params.append("lvl", level.toString());
     params = params.append("deep", deep.toString());
+    if (startDate) params = params.append("sDate", startDate.toISOString());
+    if (endDate) params = params.append("eDate", endDate.toISOString());
     return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params });
   }
 
@@ -127,11 +131,11 @@ export class ItemService {
     else
       return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/items/${code}/features`, { params: params });
   }
-  
+
   postItem(item:IItem): Observable<IItem> {
     return this.httpClient.post<IItem>(`${this.ApiEndpoint()}/api/v1/items`,item);
   }
-  
+
   putItem(item:IItem): Observable<IItem> {
     return this.httpClient.put<IItem>(`${this.ApiEndpoint()}/api/v1/items/${item.code}`,item);
   }
@@ -158,7 +162,7 @@ export class ItemService {
   postItemTask(item: IItem, task: IItemTask): Observable<IItemTask> {
     return this.httpClient.post<IItemTask>(`${this.ApiEndpoint()}/api/v1/items/${item.code}/tasks`, task);
   }
-  
+
   getItemTaskList(itemcode: string, unfinishedOnly?: boolean): Observable<IItemTask[]> {
     var params = new HttpParams();
     if (unfinishedOnly) params = params.append("unfinishedOnly", unfinishedOnly.toString());
@@ -167,8 +171,8 @@ export class ItemService {
 
   getItemListUsingRelationship(itemType: string, relationshipItemType: string, relationshipDataFilter: any): Observable<IItem[]> {
     var params = new HttpParams();
-    params = params.append("it", itemType);   
-    params = params.append("rsit", relationshipItemType);   
+    params = params.append("it", itemType);
+    params = params.append("rsit", relationshipItemType);
     params = params.append("rsdf", JSON.stringify(relationshipDataFilter));
     return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/userelationship`, { params: params });
   }
@@ -177,4 +181,4 @@ export class ItemService {
     return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/items/${itemCode}/value/layer/${layerIndex}?c=${x},${y}&crs=${crs}`);
   }
 
-}
+}

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

@@ -0,0 +1,122 @@
+import {getValidPackages, isValidPackage, PackageService} from './package.service';
+import {MockStore, provideMockStore} from '@ngrx/store/testing';
+import {TestBed} from '@angular/core/testing';
+import * as appCommonReducer from '../reducers/app-common.reducer';
+import {reducer, State} from '../reducers/app-common.reducer';
+import * as appCommonActions from '../actions/app-common.actions';
+import {IItem} from '../models/item';
+import {IPackage} from '../models/package';
+
+describe('PackageService', () => {
+  const initialState = {userPackages: {}} as State;
+  let serviceUnderTest: PackageService;
+  let items;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        provideMockStore({
+          initialState,
+          selectors: [
+            {
+              selector: appCommonReducer.SelectGetValidUserPackages,
+              value: {
+                'vnd.farmmaps.package.zoning': {
+                  id: 'vnd.farmmaps.package.zoning',
+                  name: 'zoning package',
+                  dataDate: '2022-01-25T00:00:00.000000Z'
+                }
+              }
+            }
+          ]
+        }),
+      ]
+    });
+
+    const store = TestBed.inject(MockStore);
+    serviceUnderTest = new PackageService(store, null, null);
+
+    items = [
+      {
+        code: '123132',
+        dataDate: '2021-01-25T00:00:00Z',
+        dataEndDate: '2021-05-25T00:00:00Z',
+        data: {
+          id: 'vnd.farmmaps.package.zoning'
+        }
+      } as IItem,
+      {
+        code: '1231325',
+        dataDate: '2021-01-25T00:00:00Z',
+        dataEndDate: null,
+        data: {
+          id: 'vnd.farmmaps.package.zoning'
+        }
+      } as IItem,
+      {
+        code: '1231325',
+        dataDate: '2022-01-25T00:00:00Z',
+        dataEndDate: '2022-05-25T00:00:00Z',
+        data: {
+          id: 'vnd.farmmaps.package.tipstar'
+        }
+      } as IItem,
+      {
+        code: '1231325',
+        dataDate: '2022-01-25T00:00:00Z',
+        dataEndDate: null,
+        data: {
+          id: 'vnd.farmmaps.package.weather'
+        }
+      } as IItem
+    ];
+  });
+
+  it('Does not have a tipstar package', () => {
+    const hasPackage = serviceUnderTest.hasPackage('vnd.farmmaps.package.tipstar');
+    expect(hasPackage).toBe(false);
+  });
+
+  it('Does have a zoning package', () => {
+    const hasPackage = serviceUnderTest.hasPackage('vnd.farmmaps.package.zoning');
+    expect(hasPackage).toBe(true);
+  });
+
+  it('reducer.INITUSERPACKAGESSUCCESS alter state correctly', () => {
+    const action = new appCommonActions.InitUserPackagesSuccess(items);
+
+    expect(Object.keys(initialState.userPackages).length).toBe(0);
+    const state = reducer(initialState, action);
+    expect(Object.keys(state.userPackages).length).toBe(3);
+    expect(state.userPackages['vnd.farmmaps.package.zoning'].length).toBe(2);
+    expect(state.userPackages['vnd.farmmaps.package.tipstar'].length).toBe(1);
+    expect(state.userPackages['vnd.farmmaps.package.weather'].length).toBe(1);
+  });
+
+  it('to validatePackage', () => {
+    const action = new appCommonActions.InitUserPackagesSuccess(items);
+    const state = reducer(initialState, action);
+
+    expect(isValidPackage(null)).toBe(false);
+    expect(isValidPackage(state.userPackages['vnd.farmmaps.package.tipstar'][0])).toBe(true);
+    expect(isValidPackage(state.userPackages['vnd.farmmaps.package.zoning'][0])).toBe(false);
+    expect(isValidPackage(state.userPackages['vnd.farmmaps.package.zoning'][1])).toBe(true);
+    expect(isValidPackage(state.userPackages['vnd.farmmaps.package.weather'][0])).toBe(true);
+  });
+
+  it('to getValidPackages', () => {
+    const action = new appCommonActions.InitUserPackagesSuccess(items);
+    const state = reducer(initialState, action);
+
+    const validPackages = getValidPackages(state.userPackages);
+
+    expect(Object.keys(validPackages).length).toBe(3);
+
+    // today is 27-01-2022, so the below package is not valid
+    expect(validPackages['vnd.farmmaps.package.zoning']).not.toEqual({
+      id: 'vnd.farmmaps.package.zoning',
+      dataDate: '2021-01-25T00:00:00Z',
+      dataEndDate: '2021-05-25T00:00:00Z'
+    } as unknown as IPackage);
+  });
+});

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

@@ -1,37 +1,77 @@
-import { Injectable } from '@angular/core';
-import { Store} from '@ngrx/store';
-import * as appCommonReducer from '../reducers/app-common.reducer'
-import { IPackages } from '../models/package';
+import {Injectable} from '@angular/core';
+import {Store} from '@ngrx/store';
+import * as appCommonReducer from '../reducers/app-common.reducer';
+import {IPackage, IPackages} from '../models/package';
 
-import { IItem } from '../models/item';
-import { IItemTask } from '../models/itemTask';
-import { HttpClient } from "@angular/common/http";
-import { AppConfig } from "../shared/app.config";
-import { Observable } from 'rxjs';
+import {IItem} from '../models/item';
+import {IItemTask} from '../models/itemTask';
+import {HttpClient} from '@angular/common/http';
+import {AppConfig} from '../shared/app.config';
+import {Observable,iif,of} from 'rxjs';
+import {switchMap} from 'rxjs/operators';
 
 @Injectable({
   providedIn: 'root',
 })
 
 export class PackageService {
-    private packages$:IPackages = {};
+  private userPackages: { [key: string]: IPackage } = {};
+  private packages: { [key: string]: IPackage } = {};
+  private packagesObservable = this.store$.select(appCommonReducer.SelectGetPackages);
 
-    constructor(private store$: Store<appCommonReducer.State>, public httpClient: HttpClient, public appConfig: AppConfig) {
-        store$.select(appCommonReducer.SelectGetUserPackages).subscribe((packages) => {
-            this.packages$ = packages;
-        })
-    }
+  constructor(private store$: Store<appCommonReducer.State>, public httpClient: HttpClient, public appConfig: AppConfig) {
+    store$.select(appCommonReducer.SelectGetValidUserPackages).subscribe((packages) => {
+      this.userPackages = packages;
+    });
+    this.packagesObservable.subscribe((packages) => {
+      this.packages = packages;
+    });
+  }
 
-    ApiEndpoint() {
-        return this.appConfig.getConfig("apiEndPoint");
-    }
-    
-    hasPackage(id:string):boolean {
-       if(!this.packages$[id]) return false;
-       return this.packages$[id].enabled ? this.packages$[id].enabled == true : true;
-    }
+  ApiEndpoint() {
+    return this.appConfig.getConfig('apiEndPoint');
+  }
 
-    postItemPackageTask(item: IItem, task: IItemTask): Observable<IItemTask> {
-        return this.httpClient.post<IItemTask>(`${this.ApiEndpoint()}/api/v1/items/${item.code}/packagetasks`, task);
-    } 
-}
+  hasPackage(id: string): boolean {
+    return id in this.userPackages;
+  }
+
+  packageExists(id: string): boolean {
+    return id in this.packages;
+  }
+
+  postItemPackageTask(item: IItem, task: IItemTask): Observable<IItemTask> {
+    return this.httpClient.post<IItemTask>(`${this.ApiEndpoint()}/api/v1/items/${item.code}/packagetasks`, task);
+  }
+
+  ifPackageListExists<Type>(packageList: Array<string>, ifTrue:Observable<Type>,ifFalse:Observable<Type>):Observable<Type> {
+    return this.packagesObservable.pipe(switchMap(packages => 
+        iif(( )=> Object.keys(packages).some(id => packageList.includes(id)),
+            ifTrue,
+            ifFalse) 
+    )); 
+  }
+}
+
+export function getValidPackages(packageMap: IPackages): {[key: string]: IPackage} {
+  const keys = Object.keys(packageMap);
+  return keys.filter(k => {
+    const packages = packageMap[k]
+      .filter((p) => isValidPackage(p));
+
+    return packages.length > 0;
+  }).reduce((map, key) => {
+    const packages = packageMap[key];
+    const newMap = {...map};
+    newMap[key] = packages.find(p => isValidPackage(p));
+    return newMap;
+  }, {});
+}
+
+export function isValidPackage(pack: IPackage): boolean {
+  const now = new Date(Date.now());
+  const utcToday = Date.UTC(now.getUTCFullYear(),now.getUTCMonth(),now.getUTCDate());
+  return pack !== null && new Date(pack.dataDate).getTime() <= utcToday
+    && (!pack.dataEndDate || new Date(pack.dataEndDate).getTime() >= utcToday);
+
+}

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

@@ -22,4 +22,8 @@ export class TypeaheadService {
   getTagTypeaheadItems(searchText: string, skip: number = 0, take: number = 10): Observable<ITypeaheadItem[]> {
     return this.httpClient.get<ITypeaheadItem[]>(`${this.ApiEndpoint()}/api/v1/typeahead/tag/?q=${searchText}&skip=${skip}&take=${take}`);
   }  
+
+  getCityTypeaheadItems(searchText: string, skip: number = 0, take: number = 10): Observable<ITypeaheadItem[]> {
+    return this.httpClient.get<ITypeaheadItem[]>(`${this.ApiEndpoint()}/api/v1/typeahead/city/?q=${searchText}&skip=${skip}&take=${take}`);
+  }  
 }

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

@@ -49,6 +49,22 @@ export class WeatherService {
     return this.getWeatherRange(centroid, startDateString, endDateString);
   }
 
+  public getDailyHistoricalObservations(centroid: number[], startDate: string, endDate: string): Observable<HourlyWeatherData[]> {
+    const endpoint = this.appConfig.getConfig('weatherApiEndPoint');
+    const apiKey = this.appConfig.getConfig('weatherApiKey');
+
+    // weather does not support UTC format, also remove Z
+    const sd = encodeURIComponent(startDate);
+
+    const edHistoricalDate = new Date();
+    edHistoricalDate.setHours(edHistoricalDate.getHours(), 0, 0, 0);
+    const edHistorical = moment(edHistoricalDate).local().format('YYYY-MM-DD[T]HH:mm:ss');
+
+    const historical = `${endpoint}${this.apiObservation}/?c=${centroid[0]},${centroid[1]}&sd=${sd}&ed=${edHistorical}&t=cleanedobservation&interval=daily&key=${apiKey}`;
+
+    return this.httpClient.get<any[]>(historical);
+  }
+
   public getWeatherRange(centroid: number[], startDate: string, endDate: string): Observable<HourlyWeatherData[]> {
     const endpoint = this.appConfig.getConfig('weatherApiEndPoint');
     const apiKey = this.appConfig.getConfig('weatherApiKey');

projects/common/src/test.ts

@@ -1,8 +1,8 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
 import 'core-js/es7/reflect';
-import 'zone.js/dist/zone';
-import 'zone.js/dist/zone-testing';
+import 'zone.js';
+import 'zone.js/testing';
 import { getTestBed } from '@angular/core/testing';
 import {
   BrowserDynamicTestingModule,

projects/common/tsconfig.lib.json

@@ -30,8 +30,7 @@
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true,
-    "enableResourceInlining": true,
-    "enableIvy": false
+    "enableResourceInlining": true
   },
   "exclude": [
     "src/test.ts",

projects/common/tsconfig.lib.prod.json

@@ -31,7 +31,7 @@
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true,
     "enableResourceInlining": true,
-    "enableIvy": false
+    "compilationMode": "partial"
   },
   "exclude": [
     "src/test.ts",

src/app/app.module.ts

@@ -6,8 +6,7 @@ import {
 } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 
-import { AppCommonModule,AppCommonServiceModule,AuthConfigFactory  } from '@farmmaps/common';
-import { AppCommonMapModule} from '@farmmaps/common-map';
+import { AppCommonModule,AppCommonServiceModule,AuthConfigFactory,FM_COMMON_STARTPAGE } from '@farmmaps/common';
 
 import {AppRootComponent} from './app.component';
 
@@ -90,7 +89,11 @@ export const metaReducers: MetaReducer<any>[] = [debug];
     {
        provide:AuthConfigFactory,
        useClass:Id4AuthconfigFactory
-     }
+    },
+    {
+       provide: FM_COMMON_STARTPAGE,
+       useValue: '/map'
+    }
    ],
   bootstrap: [AppRootComponent]
 })

src/app/landingpage/landingpage.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TestComponent } from './landingpage.component';
-
-describe('TestComponent', () => {
-  let component: TestComponent;
-  let fixture: ComponentFixture<TestComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ TestComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(TestComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/menu/menu.component.spec.ts

@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MenuComponent } from './menu.component';
-
-describe('MenuComponent', () => {
-  let component: MenuComponent;
-  let fixture: ComponentFixture<MenuComponent>;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ MenuComponent ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(MenuComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/test/test.component.html

@@ -2,7 +2,7 @@
     <div class="row">
         <fm-gradient-select [gradientItems]="gradientItems|async" [showLabel]="false" [showAdd]="true"></fm-gradient-select>
     </div>
-    <div class="row mt-3">
+    <div class="row mt-3" *fmPackageExists="'vnd.farmmaps.itemtype.package.dacom'">
         <button class="btn btn-primary" (click)="onTest($event)">Test</button>
     </div>
 </div>

src/app/test/test.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TestComponent } from './test.component';
-
-describe('TestComponent', () => {
-  let component: TestComponent;
-  let fixture: ComponentFixture<TestComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ TestComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(TestComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/configuration.json

@@ -1,8 +1,8 @@
 {
-    "issuer": "https://accounts.test.farmmaps.eu",
+    "issuer": "http://localhost:8094",
     "clientId": "farmmapsdev",
     "audience": "http://localhost:8082",
-    "requireHttps": true,
+    "requireHttps": false,
     "apiEndPoint": "http://localhost:8082",
     "grantType":"code"
 }

src/environments/environment.ts

@@ -1,16 +1,16 @@
-// This file can be replaced during build by using the `fileReplacements` array.
-// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
-// The list of file replacements can be found in `angular.json`.
-
-export const environment = {
-  production: false
-};
-
-/*
- * For easier debugging in development mode, you can import the following file
- * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
- *
- * This import should be commented out in production mode because it will have a negative impact
- * on performance if an error is thrown.
- */
-// import 'zone.js/dist/zone-error';  // Included with Angular CLI.
+// This file can be replaced during build by using the `fileReplacements` array.
+// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
+// The list of file replacements can be found in `angular.json`.
+
+export const environment = {
+  production: false
+};
+
+/*
+ * For easier debugging in development mode, you can import the following file
+ * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
+ *
+ * This import should be commented out in production mode because it will have a negative impact
+ * on performance if an error is thrown.
+ */
+// import 'zone.js/plugins/zone-error';  // Included with Angular CLI.

src/polyfills.ts

@@ -55,7 +55,8 @@
 /***************************************************************************************************
  * Zone JS is required by default for Angular itself.
  */
-import 'zone.js/dist/zone';  // Included with Angular CLI.
+import 'zone.js';  // Included with Angular CLI.
+import '@angular/localize/init';
 
 
 /***************************************************************************************************

src/test.ts

@@ -1,20 +1,20 @@
-// This file is required by karma.conf.js and loads recursively all the .spec and framework files
-
-import 'zone.js/dist/zone-testing';
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
-} from '@angular/platform-browser-dynamic/testing';
-
-declare const require: any;
-
-// First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
-);
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+declare const require: any;
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting()
+);
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);

src/tsconfig.app.json

@@ -10,8 +10,5 @@
   ],
   "include": [
     "src/**/*.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "enableIvy": false
-  }
+  ]
 }

tsconfig.json

@@ -12,6 +12,7 @@
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
     "importHelpers": true,
+    "skipLibCheck": true,
     "target": "es2015",
     "typeRoots": [
       "node_modules/@types"