Fix build

Merge branch 'develop'
# Conflicts: # package.json # projects/common-map/src/fm-map/common-map.module.ts # projects/common/src/fm/reducers/app-common.reducer.ts
2022-01-31 21:38:23 +01:00 · 2022-01-31 21:04:52 +01:00 · 2022-01-27 11:40:16 +01:00 · 2022-01-27 10:11:51 +01:00 · 2022-01-20 08:39:18 +01:00 · 2022-01-19 13:47:13 +01:00
50 changed files with 6177 additions and 6113 deletions
--- a/Jenkinsfile.develop
+++ b/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'){
--- a/angular.json
+++ b/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",
--- a/custom-webpack.config.js
+++ b/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"
    }
-  };
+  }
+};
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "farmmaps-lib-app",
-  "version": "1.1.12",
+  "version": "2.0.0",
  "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.4",
-    "@farmmaps/common-map": "1.1.4",
-    "@farmmaps/common-map3d": "1.1.4",
+    "@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"
  }
 }
--- a/projects/common-map/ng-package.json
+++ b/projects/common-map/ng-package.json
@ -4,7 +4,7 @@
  "lib": {
    "entryFile": "src/public-api.ts"
  },
-  "whitelistedNonPeerDependencies": [
+  "allowedNonPeerDependencies": [
    "."
  ]
 }
--- a/projects/common-map/package.json
+++ b/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"
  }
 }
--- a/projects/common-map/src/fm-map/actions/map.actions.ts
+++ b/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 {
--- a/projects/common-map/src/fm-map/common-map.module.ts
+++ b/projects/common-map/src/fm-map/common-map.module.ts
@ -277,7 +277,7 @@ export {
       ZoomToExtentComponent,
       ifZoomToShowDirective,
       ZoomToShowAlert,
-      GeometryThumbnailComponent
+       GeometryThumbnailComponent
  ],
  providers: [
    FeatureIconService,
--- a/projects/common-map/src/fm-map/components/aol/file-drop-target/file-drop-target.component.ts
+++ b/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) {
  }
--- a/projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.ts
+++ b/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();
    });
--- a/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
+++ b/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') {
--- a/projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts
+++ b/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';
--- a/projects/common-map/src/fm-map/components/aol/layer-vector-image/layer-vector-image.component.ts
+++ b/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);
--- a/projects/common-map/src/fm-map/components/feature-list-container/feature-list-container.component.ts
+++ b/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;
--- a/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.html
+++ b/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)">
--- a/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.ts
+++ b/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);
    }
--- a/projects/common-map/src/fm-map/components/feature-list-feature-container/feature-list-feature-container.component.ts
+++ b/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; 

--- a/projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.ts
+++ b/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;
  }
 }
--- a/projects/common-map/src/fm-map/components/feature-list-feature/feature-list-feature.component.ts
+++ b/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) {
  } 
--- a/projects/common-map/src/fm-map/components/feature-list/feature-list.component.ts
+++ b/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();
  }  
--- a/projects/common-map/src/fm-map/components/feature-thumbnail/feature-thumbnail.component.ts
+++ b/projects/common-map/src/fm-map/components/feature-thumbnail/feature-thumbnail.component.ts
@ -1,6 +1,6 @@
 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';
@ -19,7 +19,7 @@ export class GeometryThumbnailComponent implements AfterViewInit {
  @ViewChild('container') container;

  private geometry:Geometry = null;
-  @Input() set feature(value:Feature) {
+  @Input() set feature(value:Feature<Geometry>) {
    if(value) {
      this.geometry = value.getGeometry();
    } else {
@ -59,7 +59,7 @@ export class GeometryThumbnailComponent implements AfterViewInit {
    if(canvas && canvas.nativeElement && geometry && style) {
      let renderContext = render.toContext(canvas.nativeElement.getContext( '2d'),{ size: [width, height] });  

-      let geom   = geometry.clone(),
+      let geom   = geometry.clone() as Polygon,
      line   = geom.getCoordinates()[0],
      e = extent.boundingExtent( line );
  
--- a/projects/common-map/src/fm-map/components/if-zoom-to-show/if-zoom-to-show.directive.ts
+++ b/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;
--- a/projects/common-map/src/fm-map/components/map/map.component.ts
+++ b/projects/common-map/src/fm-map/components/map/map.component.ts
@ -30,6 +30,7 @@ import {commonReducers} from '@farmmaps/common';
 import {commonActions} from '@farmmaps/common';

 import {Feature} from 'ol';
+import {Geometry} from 'ol/geom';
 import {Extent,createEmpty,extend } from 'ol/extent';
 import {transform} from 'ol/proj';
 import { tassign } from 'tassign';
@ -47,7 +48,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);
@ -64,8 +65,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);
@ -164,11 +165,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));
  }

--- a/projects/common-map/src/fm-map/components/zoom-to-show-alert/zoom-to-show-alert.component.ts
+++ b/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;
  }
 }
--- a/projects/common-map/src/fm-map/effects/map.effects.ts
+++ b/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;
--- a/projects/common-map/src/fm-map/models/item.layer.ts
+++ b/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;
--- a/projects/common-map/src/fm-map/models/style.cache.ts
+++ b/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);
 };
--- a/projects/common-map/src/fm-map/reducers/map.reducer.ts
+++ b/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,
--- a/projects/common-map/src/test.ts
+++ b/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,
--- a/projects/common-map/tsconfig.lib.json
+++ b/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",
--- a/projects/common-map/tsconfig.lib.prod.json
+++ b/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"
+  ]
+}
--- a/projects/common-map3d/package.json
+++ b/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"
--- a/projects/common-map3d/src/test.ts
+++ b/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,
--- a/projects/common-map3d/tsconfig.lib.json
+++ b/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",
--- a/projects/common-map3d/tsconfig.lib.prod.json
+++ b/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"
+  ]
 }
--- a/projects/common/ng-package.json
+++ b/projects/common/ng-package.json
@ -7,7 +7,7 @@
      "my-data": "my-data"
    }
  },
-  "whitelistedNonPeerDependencies": [
+  "allowedNonPeerDependencies": [
    "."
  ]
 }
--- a/projects/common/package.json
+++ b/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",
--- a/projects/common/src/fm/common.module.ts
+++ b/projects/common/src/fm/common.module.ts
@ -110,7 +110,9 @@ export {
  IGradientstop,
  BackButtonComponent,
  AvatarComponent,
-  EditImageModalComponent
+  EditImageModalComponent,
+  GradientComponent,
+  GradientSelectComponent
 };

@NgModule({
--- a/projects/common/src/fm/components/avatar/avatar.component.ts
+++ b/projects/common/src/fm/components/avatar/avatar.component.ts
@ -40,6 +40,7 @@ export class AvatarComponent implements OnInit {

  refresh(user: IUser) {
    if (!user) return null;
+    debugger;
    const apiEndpoint = this.appConfig.getConfig("apiEndPoint");
    this.src = `${apiEndpoint}/api/v1/users/${user.code}/avatar`;
    this.name = user.firstName && user.lastName ? 
--- a/projects/common/src/fm/services/weather.service.ts
+++ b/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');
--- a/projects/common/src/test.ts
+++ b/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,
--- a/projects/common/tsconfig.lib.json
+++ b/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",
--- a/projects/common/tsconfig.lib.prod.json
+++ b/projects/common/tsconfig.lib.prod.json
@ -31,7 +31,7 @@
    "fullTemplateTypeCheck": true,
    "strictInjectionParameters": true,
    "enableResourceInlining": true,
-    "enableIvy": false
+    "compilationMode": "partial"
  },
  "exclude": [
    "src/test.ts",
--- a/src/configuration.json
+++ b/src/configuration.json
@ -1,7 +1,7 @@
 {
    "issuer": "http://localhost:8094",
    "clientId": "farmmapsdev",
-    "audience": "http://localhost:8082/",
+    "audience": "http://localhost:8082",
    "requireHttps": false,
    "apiEndPoint": "http://localhost:8082",
    "grantType":"code"
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@ -13,4 +13,4 @@ export const environment = {
 * 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.
+// import 'zone.js/plugins/zone-error';  // Included with Angular CLI.
--- a/src/polyfills.ts
+++ b/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';


 /***************************************************************************************************
--- a/src/test.ts
+++ b/src/test.ts
@ -1,6 +1,6 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files

-import 'zone.js/dist/zone-testing';
+import 'zone.js/testing';
 import { getTestBed } from '@angular/core/testing';
 import {
  BrowserDynamicTestingModule,
--- a/src/tsconfig.app.json
+++ b/src/tsconfig.app.json
@ -10,8 +10,5 @@
  ],
  "include": [
    "src/**/*.d.ts"
-  ],
-  "angularCompilerOptions": {
-    "enableIvy": false
-  }
+  ]
 }
--- a/tsconfig.json
+++ b/tsconfig.json
@ -12,6 +12,7 @@
    "experimentalDecorators": true,
    "allowSyntheticDefaultImports": true,
    "importHelpers": true,
+    "skipLibCheck": true,
    "target": "es2015",
    "typeRoots": [
      "node_modules/@types"
Author	SHA1	Message	Date
Willem Dantuma	37854d43fc	Fix build Some checks failed FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details FarmMaps/FarmMapsLib/pipeline/head There was a failure building this commit Details	2022-01-31 21:38:23 +01:00
Willem Dantuma	2161951cbb	Merge branch 'develop' Some checks failed FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details # Conflicts: # package.json # projects/common-map/src/fm-map/common-map.module.ts # projects/common/src/fm/reducers/app-common.reducer.ts	2022-01-31 21:04:52 +01:00
Willem Dantuma	77d2433d63	Export GeometryThumbnailComponent All checks were successful FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details	2022-01-27 11:40:16 +01:00
Willem Dantuma	9bc78dc302	Export GeometryThumbnailComponent All checks were successful FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details	2022-01-27 10:11:51 +01:00
Francisco Salas	ac0fe962a0	aw3299: hide help on mobile All checks were successful FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details	2022-01-20 08:39:18 +01:00
Willem Dantuma	c22cede59b	Fix build All checks were successful FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details	2022-01-19 13:47:13 +01:00
Willem Dantuma	48574dc0b0	Merge tag 'AW-3412' into develop Some checks failed FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details # Conflicts: # package.json # projects/common-map/src/fm-map/components/feature-thumbnail/feature-thumbnail.component.ts # src/configuration.json	2022-01-19 13:29:44 +01:00
Wilco Krikke	aa1ad9f844	AW-3135 All checks were successful FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details	2021-12-21 21:01:10 +01:00
Willem Dantuma	cc4726e85c	Inject clicked feature in component All checks were successful FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details	2021-12-02 11:13:03 +01:00
Willem Dantuma	e28564c88a	Fix matching All checks were successful FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details	2021-11-26 11:57:24 +01:00
Willem Dantuma	90c3fa25a4	Fix publish All checks were successful FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details	2021-11-25 11:35:27 +01:00
Willem Dantuma	3b8b812c55	Fix build Some checks failed FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details	2021-11-25 11:15:34 +01:00
Willem Dantuma	025889b390	Merge branch 'feature/update_openlayers_to_6.8' into develop Some checks failed FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit Details	2021-11-25 10:53:55 +01:00
Willem Dantuma	eabaa1db19	oauth2 fixes	2021-10-05 20:56:27 +02:00
Willem Dantuma	ba541c4e08	Use local environment	2021-10-05 20:55:51 +02:00
Willem Dantuma	b994bc51cd	Add development configuration	2021-10-05 20:55:08 +02:00
Willem Dantuma	960275dd38	Fix localize polyfill	2021-10-05 16:59:04 +02:00
Willem Dantuma	5b7fef689a	Update versions	2021-10-05 16:35:12 +02:00
Willem Dantuma	1c1315a580	More type fixes	2021-10-05 16:13:25 +02:00
Willem Dantuma	5d21d66589	More type fixes	2021-10-05 14:08:55 +02:00
Willem Dantuma	160eb10aba	Refactoring types	2021-10-05 13:46:10 +02:00
Willem Dantuma	4ef077f8d7	Update to angular 12	2021-10-05 06:39:38 +02:00
Willem Dantuma	df84a7c217	Update packages	2021-10-05 06:27:18 +02:00