Merge branch 'develop'

# Conflicts:
#	package-lock.json
#	package.json

.gitignore

@@ -51,5 +51,5 @@ projects/common-map/node_modules/
 .angular/*
 projects/common-map3d/node_modules/
 projects/common-map/node_modules/
-projects/common-aol/node_modules/
+projects/ng-openlayers/node_modules/
 projects/common/node_modules/

README.md

@@ -2,7 +2,6 @@
 
 This is a sample FarmMaps client in Angular 7.x.
 
-
 ## Quick start
 
 Use one of the two options below to get started.
@@ -51,7 +50,7 @@ npm install -g @angular/cli
 npm install
 ng serve
 ```
-*Go*
+*Go*`
 
 Point your browser to http://localhost:4200 
 

angular.json

@@ -209,13 +209,13 @@
           "options": {
             "tsConfig": "projects/common-map/tsconfig.lib.json",
             "project": "projects/common-map/ng-package.json"
-          }
-        ,          "configurations": {
+          },
+          "configurations": {
               "production": {
                 "tsConfig": "projects/common-map/tsconfig.lib.prod.json"
               }
           }
-},
+        },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
@@ -254,30 +254,39 @@
         }
       }
     },
-    "common-aol": {
+    "ng-openlayers": {
       "projectType": "library",
-      "root": "projects/common-aol",
-      "sourceRoot": "projects/common-aol/src",
-      "prefix": "fm-aol",
+      "root": "projects/ng-openlayers",
+      "sourceRoot": "projects/ng-openlayers/src",
+      "prefix": "ng-openlayers",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:ng-packagr:build",
+          "builder": "@angular-devkit/build-angular:ng-packagr",
           "options": {
-            "tsConfig": "projects/common-aol/tsconfig.lib.json",
-            "project": "projects/common-aol/ng-package.json"
+            "tsConfig": "projects/ng-openlayers/tsconfig.lib.json",
+            "project": "projects/ng-openlayers/ng-package.json"
           },
           "configurations": {
             "production": {
-              "tsConfig": "projects/common-aol/tsconfig.lib.prod.json"
+              "tsConfig": "projects/ng-openlayers/tsconfig.lib.prod.json"
             }
           }
         },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "projects/common-aol/src/test.ts",
-            "tsConfig": "projects/common-aol/tsconfig.spec.json",
-            "karmaConfig": "projects/common-aol/karma.conf.js"
+            "main": "projects/ng-openlayers/src/test.ts",
+            "tsConfig": "projects/ng-openlayers/tsconfig.spec.json",
+            "karmaConfig": "projects/ng-openlayers/karma.conf.js"
+          }
+        },
+        "lint": {
+          "builder": "@angular-eslint/builder:lint",
+          "options": {
+            "lintFilePatterns": [
+              "projects/ng-openlayers/**/*.ts",
+              "projects/ng-openlayers/**/*.html"
+            ]
           }
         }
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "4.2.0",
+  "version": "4.18.0",
   "scripts":   {
     "ng": "ng",
     "start": "ng serve",
@@ -11,40 +11,40 @@
   },
   "private": true,
   "dependencies":   {
-    "@angular-eslint/eslint-plugin": "^15.2.1",
-    "@angular/animations": "^16.2.12",
-    "@angular/common": "^16.2.12",
-    "@angular/compiler": "^16.2.12",
-    "@angular/core": "^16.2.12",
-    "@angular/forms": "^16.2.12",
-    "@angular/platform-browser": "^16.2.12",
-    "@angular/platform-browser-dynamic": "^16.2.12",
-    "@angular/router": "^16.2.12",
+    "@angular-eslint/eslint-plugin": "^18.2.0",
+    "@angular/animations": "18.2.3",
+    "@angular/common": "18.2.3",
+    "@angular/compiler": "18.2.3",
+    "@angular/core": "18.2.3",
+    "@angular/forms": "18.2.3",
+    "@angular/platform-browser": "18.2.3",
+    "@angular/platform-browser-dynamic": "18.2.3",
+    "@angular/router": "18.2.3",
     "@farmmaps/common": "file:dist/common",
-    "@farmmaps/common-aol": "file:dist/common-aol",
     "@farmmaps/common-map": "file:dist/common-map",
     "@farmmaps/common-map3d": "file:dist/common-map3d",
-    "@microsoft/signalr": "^8.0.0",
-    "@ng-bootstrap/ng-bootstrap": "^15.0.0",
-    "@ngrx/effects": "^15",
-    "@ngrx/router-store": "^15",
-    "@ngrx/store": "^14",
-    "@popperjs/core": "^2.11.6",
-    "angular-oauth2-oidc": "^13",
+    "@farmmaps/ng-openlayers": "file:dist/ng-openlayers",
+    "@microsoft/signalr": "^3.1.16",
+    "@ng-bootstrap/ng-bootstrap": "^17.0.1",
+    "@ngrx/effects": "^18.0.2",
+    "@ngrx/router-store": "^18.0.2",
+    "@ngrx/store": "^18.0.2",
+    "@popperjs/core": "^2.11.8",
+    "angular-oauth2-oidc": "^17.0.2",
     "assert": "^2.0.0",
-    "bootstrap": "^5.2.0",
+    "bootstrap": "^5.3.3",
     "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "cesium": "^1.97.0",
     "core-js": "^2.6.12",
     "https-browserify": "^1.0.0",
     "moment": "^2.29.4",
-    "ngrx-store-localstorage": "^14",
-    "ngx-avatars": "^1.7.0",
-    "ngx-clipboard": "^15.1.0",
-    "ngx-image-cropper": "^6.0.2",
-    "ngx-uploadx": "^5.2.0",
-    "ol": "6.14.1",
+    "ngrx-store-localstorage": "^18.0.0",
+    "ngx-avatars": "^1.8.0",
+    "ngx-clipboard": "^16.0.0",
+    "ngx-image-cropper": "^7.0.0",
+    "ngx-uploadx": "^6.2.0",
+    "ol": "^8.2.0",
     "olcs": "^2.13.1",
     "resumablejs": "^1.1.0",
     "rxjs": "^7.8.1",
@@ -54,22 +54,27 @@
     "tslib": "^2.4.0",
     "url": "^0.11.0",
     "util": "^0.12.4",
-    "zone.js": "~0.13.3"
+    "zone.js": "~0.14.10"
+  },
+  "optionalDependencies":   {
+    "@lmdb/lmdb-linux-x64": "^3.1.0",
+    "@rollup/rollup-linux-x64-gnu": "^4.21.2"
   },
   "devDependencies":   {
-    "@angular-builders/custom-webpack": "^16.0.1",
-    "@angular-devkit/build-angular": "^16.2.11",
-    "@angular/cli": "^16.2.11",
-    "@angular/compiler-cli": "^16.2.12",
-    "@angular/language-service": "^16.2.12",
-    "@angular/localize": "^16.2.12",
+    "@angular-builders/custom-webpack": "^18.0.0",
+    "@angular-devkit/build-angular": "18.2.3",
+    "@angular/cli": "18.2.3",
+    "@angular/compiler-cli": "18.2.3",
+    "@angular/language-service": "18.2.3",
+    "@angular/localize": "18.2.3",
     "@types/arcgis-rest-api": "^10.4.5",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "^2.0.9",
-    "@types/node": "^12.20.15",
-    "@typescript-eslint/eslint-plugin": "^5.54.0",
-    "@typescript-eslint/eslint-plugin-tslint": "^5.54.0",
-    "@typescript-eslint/parser": "^5.54.0",
+    "@types/node": "^22.5.4",
+    "@typescript-eslint/eslint-plugin": "^6.18.0",
+    "@typescript-eslint/eslint-plugin-tslint": "^6.18.0",
+    "@typescript-eslint/parser": "^6.18.0",
+    "codelyzer": "^6.0.2",
     "eslint": "^8.35.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-import": "^2.27.5",
@@ -80,9 +85,9 @@
     "karma-coverage-istanbul-reporter": "^3.0.3",
     "karma-jasmine": "^5.1.0",
     "karma-jasmine-html-reporter": "^2.0.0",
-    "ng-packagr": "^16.2.3",
-    "protractor": "^7.0.0",
+    "ng-packagr": "^18.2.1",
+    "protractor": "~7.0.0",
     "ts-node": "^8.8.1",
-    "typescript": "~5.1.6"
+    "typescript": "~5.4.4"
   }
 }

projects/common-aol/.eslintrc.js

@@ -1,22 +0,0 @@
-module.exports = {
-    "env": {
-        "browser": true,
-        "es2021": true
-    },
-    "extends": [
-        "eslint:recommended",
-        "plugin:@typescript-eslint/recommended"
-    ],
-    "overrides": [
-    ],
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "ecmaVersion": "latest",
-        "sourceType": "module"
-    },
-    "plugins": [
-        "@typescript-eslint"
-    ],
-    "rules": {
-    }
-}

projects/common-aol/README.MD

@@ -1,24 +0,0 @@
-# CommonAol
-
-This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.2.0.
-
-## Code scaffolding
-
-Run `ng generate component component-name --project common-aol` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project common-aol`.
-> Note: Don't forget to add `--project common-aol` or else it will be added to the default project in your `angular.json` file. 
-
-## Build
-
-Run `ng build common-aol` to build the project. The build artifacts will be stored in the `dist/` directory.
-
-## Publishing
-
-After building your library with `ng build common-aol`, go to the dist folder `cd dist/common-aol` and run `npm publish`.
-
-## Running unit tests
-
-Run `ng test common-aol` to execute the unit tests via [Karma](https://karma-runner.github.io).
-
-## Further help
-
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

projects/common-aol/package.json

@@ -1,21 +0,0 @@
-{
-    "name": "@farmmaps/common-aol",
-    "version": "2.1.0",
-    "publishConfig": {
-        "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
-    },
-    "dependencies": {
-        "tslib": "^2.0.0",
-        "@types/openlayers": "4.3.x || 4.4.x",
-        "openlayers": "4.3.x || 4.4.x"
-    },
-    "peerDependencies": {
-        "@angular/core": ">=16.0.0",
-        "ngrx-store-localstorage": ">=16.0.0",
-        "@ngrx/effects": ">=16.0.0",
-        "@ngrx/router-store":">=16.0.0",
-        "@ngrx/store":">=16.0.0",
-        "tassign": ">=1.0.0",
-        "ol": ">=6.8.1"
-    }
-}

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

@@ -1,114 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import {
-  MapComponent, ViewComponent, GraticuleComponent,
-  LayerGroupComponent, LayerTileComponent, LayerVectorComponent, LayerVectorTileComponent, LayerImageComponent,
-  SourceClusterComponent, SourceRasterComponent,
-  SourceBingmapsComponent, SourceOsmComponent, SourceVectorComponent, SourceVectorTileComponent, SourceXYZComponent, SourceTileUTFGridComponent, SourceTileWMSComponent,
-  SourceGeoJSONComponent, SourceTileWMTSComponent, SourceTileJSONComponent, SourceImageStaticComponent, SourceImageWMSComponent, FeatureComponent,
-  GeometryLinestringComponent, GeometryPointComponent, GeometryPolygonComponent,
-  CollectionCoordinatesComponent, CoordinateComponent,
-  StyleCircleComponent, StyleComponent, StyleFillComponent, StyleIconComponent, StyleStrokeComponent, StyleTextComponent,
-  ControlAttributionComponent, ControlMousePositionComponent,
-  // ControlFullScreenComponent, ControlRotateComponent, ControlZoomSliderComponent,
-  ControlOverviewMapComponent, ControlScaleLineComponent, ControlZoomComponent, 
-  ControlZoomToExtentComponent, DefaultControlComponent, ControlComponent,
-  FormatMVTComponent,
-  TileGridComponent, TileGridWMTSComponent,
-  DefaultInteractionComponent, DragRotateInteractionComponent, DragRotateAndZoomInteractionComponent,
-  DoubleClickZoomInteractionComponent, DragAndDropInteractionComponent, DragBoxInteractionComponent,
-  DragPanInteractionComponent, DragZoomInteractionComponent, MouseWheelZoomInteractionComponent,
-  PinchZoomInteractionComponent,  DrawInteractionComponent, SelectInteractionComponent, ModifyInteractionComponent, TranslateInteractionComponent,
-  OverlayComponent,
-  ContentComponent,
-  AttributionComponent,
-  AttributionsComponent
-} from './components';
-
-export * from './components';
-
-const COMPONENTS = [
-  MapComponent,
-
-  ViewComponent,
-  GraticuleComponent,
-
-  LayerGroupComponent,
-  LayerImageComponent,
-  LayerTileComponent,
-  LayerVectorComponent,
-  LayerVectorTileComponent,
-
-  SourceClusterComponent,
-  SourceRasterComponent,
-  SourceOsmComponent,
-  SourceBingmapsComponent,
-  SourceVectorComponent,
-  SourceXYZComponent,
-  SourceVectorTileComponent,
-  SourceTileUTFGridComponent,
-  SourceTileWMSComponent,
-  SourceTileWMTSComponent,
-  SourceTileJSONComponent,
-  SourceGeoJSONComponent,
-  SourceImageStaticComponent,
-  SourceImageWMSComponent,
-  FeatureComponent,
-  GeometryLinestringComponent,
-  GeometryPointComponent,
-  GeometryPolygonComponent,
-  CoordinateComponent,
-  CollectionCoordinatesComponent,
-
-  StyleComponent,
-  StyleCircleComponent,
-  StyleFillComponent,
-  StyleIconComponent,
-  StyleStrokeComponent,
-  StyleTextComponent,
-
-  DefaultControlComponent,
-  ControlComponent,
-  ControlAttributionComponent,
-  //ControlFullScreenComponent,
-  ControlMousePositionComponent,
-  ControlOverviewMapComponent,
-  //ControlRotateComponent,
-  ControlScaleLineComponent,
-  ControlZoomComponent,
-  //ControlZoomSliderComponent,
-  ControlZoomToExtentComponent,
-
-  FormatMVTComponent,
-  TileGridComponent,
-  TileGridWMTSComponent,
-
-  DefaultInteractionComponent,
-  DoubleClickZoomInteractionComponent,
-  DragAndDropInteractionComponent,
-  DragBoxInteractionComponent,
-  DragPanInteractionComponent,
-  DragRotateInteractionComponent,
-  DragRotateAndZoomInteractionComponent,
-  DragZoomInteractionComponent,
-  MouseWheelZoomInteractionComponent,
-  PinchZoomInteractionComponent,
-  DrawInteractionComponent,
-  SelectInteractionComponent,
-  ModifyInteractionComponent,
-  TranslateInteractionComponent,
-
-  OverlayComponent,
-  ContentComponent,
-  AttributionComponent,
-  AttributionsComponent
-];
-
-@NgModule({
-  declarations: COMPONENTS,
-  imports: [CommonModule],
-  exports: COMPONENTS
-})
-
-export class AppCommonAolModule {  
-}

projects/common-aol/src/fm-aol/components/attribution.component.ts

@@ -1,21 +0,0 @@
-import { Component, ElementRef, OnInit } from '@angular/core';
-import { Attribution } from 'openlayers';
-
-@Component({
-  selector: 'aol-attribution',
-  template: '<ng-content></ng-content>'
-})
-export class AttributionComponent implements OnInit {
-  instance: Attribution;
-  html: string;
-
-  constructor(
-    private elementRef: ElementRef
-  ) {
-  }
-
-  ngOnInit() {
-    this.html = this.elementRef.nativeElement.innerHTML;
-    this.instance = new Attribution(this);
-  }
-}

projects/common-aol/src/fm-aol/components/controls/default.component.ts

@@ -1,31 +0,0 @@
-import { Component, OnDestroy, OnInit, Input } from '@angular/core';
-import { control, Collection } from 'openlayers';
-import { MapComponent } from '../map.component';
-
-@Component({
-  selector: 'aol-control-defaults',
-  template: ''
-})
-export class DefaultControlComponent implements OnInit, OnDestroy {
-  instance: Collection<control.Control>;
-  @Input() attribution: boolean;
-  @Input() attributionOptions: olx.control.AttributionOptions;
-  @Input() rotate: boolean;
-  @Input() rotateOptions: olx.control.RotateOptions;
-  @Input() zoom: boolean;
-  @Input() zoomOptions: olx.control.ZoomOptions;
-
-  constructor(private map: MapComponent) {
-  }
-
-  ngOnInit() {
-    // console.log('ol.control.defaults init: ', this);
-    this.instance = control.defaults(this);
-    this.instance.forEach((control) => this.map.instance.addControl(control));
-  }
-
-  ngOnDestroy() {
-    // console.log('removing aol-control-defaults');
-    this.instance.forEach((control) => this.map.instance.removeControl(control));
-  }
-}

projects/common-aol/src/fm-aol/components/controls/fullscreen.component.ts

@@ -1,28 +0,0 @@
-// Commented-out due to error TS2345: Argument of type 'this' is not assignable to parameter of type 'FullScreenOptions'.
-
-// import { Component, OnDestroy, OnInit } from '@angular/core';
-// import { control } from 'openlayers';
-// import { MapComponent } from '../map.component';
-
-// @Component({
-//   selector: 'aol-control-fullscreen',
-//   template: `<ng-content></ng-content>`
-// })
-// export class ControlFullScreenComponent implements OnInit, OnDestroy {
-//   instance: control.FullScreen;
-
-//   constructor(private map: MapComponent) {
-//     // console.log('instancing aol-control-fullscreen');
-//   }
-
-//   ngOnInit() {
-//     this.instance = new control.FullScreen(this);
-//     this.map.instance.addControl(this.instance);
-//   }
-  
-
-//   ngOnDestroy() {
-//     // console.log('removing aol-control-fullscreen');
-//     this.map.instance.removeControl(this.instance);
-//   }
-// }

projects/common-aol/src/fm-aol/components/controls/index.ts

@@ -1,11 +0,0 @@
-export * from './attribution.component';
-export * from './control.component';
-export * from './default.component';
-//export * from './fullscreen.component';
-export * from './mouseposition.component';
-export * from './overviewmap.component';
-//export * from './rotate.component';
-export * from './scaleline.component';
-export * from './zoom.component';
-//export * from './zoomslider.component';
-export * from './zoomtoextent.component';

projects/common-aol/src/fm-aol/components/controls/overviewmap.component.ts

@@ -1,33 +0,0 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { control, View, layer } from 'openlayers';
-import { MapComponent } from '../map.component';
-
-@Component({
-  selector: 'aol-control-overviewmap',
-  template: `<ng-content></ng-content>`
-})
-export class ControlOverviewMapComponent implements OnInit, OnDestroy {
-  instance: control.OverviewMap;
-  @Input() collapsed: boolean;
-  @Input() collapseLabel: string;
-  @Input() collapsible: boolean;
-  @Input() label: string;
-  @Input() layers: layer.Layer[];
-  @Input() target: Element;
-  @Input() tipLabel: string;
-  @Input() view: View;
-
-  constructor(private map: MapComponent) {
-    // console.log('instancing aol-control-overviewmap');
-  }
-
-  ngOnInit() {
-    this.instance = new control.OverviewMap(this);
-    this.map.instance.addControl(this.instance);
-  }
-
-  ngOnDestroy() {
-    // console.log('removing aol-control-overviewmap');
-    this.map.instance.removeControl(this.instance);
-  }
-}

projects/common-aol/src/fm-aol/components/controls/rotate.component.ts

@@ -1,27 +0,0 @@
-// Commented-out due to error TS2345: Argument of type 'this' is not assignable to parameter of type 'RotateOptions'.
-
-// import { Component, OnDestroy, OnInit } from '@angular/core';
-// import { control } from 'openlayers';
-// import { MapComponent } from '../map.component';
-
-// @Component({
-//   selector: 'aol-control-rotate',
-//   template: `<ng-content></ng-content>`
-// })
-// export class ControlRotateComponent implements OnInit, OnDestroy {
-//   instance: control.Rotate;
-
-//   constructor(private map: MapComponent) {
-//     // console.log('instancing aol-control-rotate');
-//   }
-
-//   ngOnInit() {
-//     this.instance = new control.Rotate(this);
-//     this.map.instance.addControl(this.instance);
-//   }
-
-//   ngOnDestroy() {
-//     // console.log('removing aol-control-rotate');
-//     this.map.instance.removeControl(this.instance);
-//   }
-// }

projects/common-aol/src/fm-aol/components/controls/zoomslider.component.ts

@@ -1,27 +0,0 @@
-// Commented-out due to error TS2345: Argument of type 'this' is not assignable to parameter of type 'ZoomSliderOptions'.
-
-// import { Component, OnDestroy, OnInit } from '@angular/core';
-// import { control } from 'openlayers';
-// import { MapComponent } from '../map.component';
-
-// @Component({
-//   selector: 'aol-control-zoomslider',
-//   template: `<ng-content></ng-content>`
-// })
-// export class ControlZoomSliderComponent implements OnInit, OnDestroy {
-//   instance: control.ZoomSlider;
-
-//   constructor(private map: MapComponent) {
-//     // console.log('instancing aol-control-zoomslider');
-//   }
-
-//   ngOnInit() {
-//     this.instance = new control.ZoomSlider(this);
-//     this.map.instance.addControl(this.instance);
-//   }
-
-//   ngOnDestroy() {
-//     // console.log('removing aol-control-zoomslider');
-//     this.map.instance.removeControl(this.instance);
-//   }
-// }

projects/common-aol/src/fm-aol/components/coordinate.component.ts

@@ -1,118 +0,0 @@
-import { Component, Optional, OnChanges, Input, SimpleChanges } from '@angular/core';
-import { proj, Coordinate } from 'openlayers';
-import { MapComponent } from './map.component';
-import { GeometryPointComponent, GeometryLinestringComponent, GeometryPolygonComponent } from './geometry.components';
-import { ViewComponent } from './view.component';
-import { OverlayComponent } from './overlay.component';
-
-@Component({
-  selector: 'aol-coordinate',
-  template: `<div class="aol-coordinate"></div>`
-})
-export class CoordinateComponent implements OnChanges {
-  private host: any;
-
-  @Input() x: number;
-  @Input() y: number;
-  @Input() srid: string = 'EPSG:3857';
-
-  constructor(
-    private map: MapComponent,
-    @Optional() viewHost: ViewComponent,
-    @Optional() geometryPointHost: GeometryPointComponent,
-    @Optional() overlayHost: OverlayComponent
-  ) {
-    // console.log('instancing aol-coordinate');
-    if (geometryPointHost !== null) {
-      this.host = geometryPointHost;
-    } else if (viewHost !== null) {
-      this.host = viewHost;
-    } else if (overlayHost !== null) {
-      this.host = overlayHost;
-    }
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    let referenceProjection: proj.Projection;
-    let referenceProjectionCode: string;
-    let transformedCoordinates: number[];
-
-    referenceProjection = this.map.instance.getView().getProjection();
-    referenceProjectionCode = referenceProjection ? referenceProjection.getCode() : 'EPSG:3857';
-
-    if (this.srid === referenceProjectionCode) {
-      transformedCoordinates = [this.x, this.y];
-    } else {
-      transformedCoordinates = proj.transform([this.x, this.y], this.srid, referenceProjectionCode);
-    }
-
-    switch (this.host.componentType) {
-      case 'geometry-point':
-        this.host.instance.setCoordinates(transformedCoordinates);
-        break;
-      case 'view':
-        this.host.instance.setCenter(transformedCoordinates);
-        break;
-      case 'overlay':
-        this.host.instance.setPosition(transformedCoordinates);
-        break;
-    }
-  }
-}
-
-@Component({
-  selector: 'aol-collection-coordinates',
-  template: `<div class="aol-collection-coordinates"></div>`
-})
-export class CollectionCoordinatesComponent implements OnChanges {
-  private host: any;
-
-  @Input() coordinates: [number, number][];
-  @Input() srid: string = 'EPSG:3857';
-
-  constructor(
-      private map: MapComponent,
-      @Optional() geometryLinestring: GeometryLinestringComponent,
-      @Optional() geometryPolygon: GeometryPolygonComponent
-  ) {
-    // console.log('creating aol-collection-coordinates');
-    if (!!geometryLinestring) {
-      this.host = geometryLinestring;
-    } else if (!!geometryPolygon) {
-      this.host = geometryPolygon;
-    } else {
-      throw new Error('aol-collection-coordinates must be a child of a geometry component');
-    }
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    let referenceProjection: proj.Projection;
-    let referenceProjectionCode: string;
-    let transformedCoordinates: Array<Coordinate>;
-
-    // console.log('coordinates change: ', this.coordinates);
-
-    referenceProjection = this.map.instance.getView().getProjection();
-    referenceProjectionCode = referenceProjection ? referenceProjection.getCode() : 'EPSG:3857';
-
-    if (this.srid === referenceProjectionCode) {
-      transformedCoordinates = this.coordinates;
-    } else {
-      transformedCoordinates = [];
-      this.coordinates.forEach(function (coordinate: Coordinate) {
-        transformedCoordinates.push(proj.transform(coordinate, this.srid, referenceProjectionCode));
-      }.bind(this));
-    }
-    switch (this.host.componentType) {
-      case 'geometry-linestring':
-        this.host.instance.setCoordinates(transformedCoordinates);
-        break;
-      case 'geometry-polygon':
-        this.host.instance.setCoordinates([transformedCoordinates]);
-        break;
-      default:
-        throw new Error('aol-collection-coordinates\' host is of unknown type: ' + this.host.componentType);
-        // break;
-    }
-  }
-}

projects/common-aol/src/fm-aol/components/formats/format.component.ts

@@ -1,6 +0,0 @@
-import { format } from 'openlayers';
-
-export class FormatComponent {
-  public instance: format.Feature;
-  public componentType = 'format';
-}

projects/common-aol/src/fm-aol/components/formats/index.ts

@@ -1,2 +0,0 @@
-export * from './format.component';
-export * from './mvt.component';

projects/common-aol/src/fm-aol/components/formats/mvt.component.ts

@@ -1,25 +0,0 @@
-import { Component, forwardRef, Input } from '@angular/core';
-import { format, geom } from 'openlayers';
-import { FormatComponent } from './format.component';
-
-@Component({
-  selector: 'aol-format-mvt',
-  template: '',
-  providers: [
-    { provide: FormatComponent, useExisting: forwardRef(() => FormatMVTComponent) }
-  ]
-})
-export class FormatMVTComponent extends FormatComponent {
-  instance: format.MVT;
-
-  @Input() featureClass: (((geom: (geom.Geometry | { [k: string]: any })) => any) |
-    ((geom: geom.GeometryType, arg2: number[], arg3: (number[] | number[][]), arg4: { [k: string]: any }) => any));
-  @Input() geometryName: string;
-  @Input() layerName: string;
-  @Input() layers: string[];
-
-  constructor() {
-    super();
-    this.instance = new format.MVT(this);
-  }
-}

projects/common-aol/src/fm-aol/components/geometry.components.ts

@@ -1,69 +0,0 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
-import { geom } from 'openlayers';
-import { FeatureComponent } from './feature.component';
-
-@Component({
-  selector: 'aol-geometry-linestring',
-  template: `<ng-content></ng-content>`
-})
-export class GeometryLinestringComponent implements OnInit, OnDestroy {
-  public componentType: string = 'geometry-linestring';
-  public instance: geom.LineString;
-
-  constructor(private host: FeatureComponent) {
-    // console.log('instancing aol-geometry-linestring');
-  }
-
-  ngOnInit() {
-    this.instance = new geom.LineString([]);
-    this.host.instance.setGeometry(this.instance);
-  }
-  ngOnDestroy() {
-    // this.host.setGeometry(null);
-  }
-}
-
-@Component({
-  selector: 'aol-geometry-point',
-  template: `<ng-content></ng-content>`
-})
-export class GeometryPointComponent implements OnInit, OnDestroy {
-  public componentType: string = 'geometry-point';
-  public instance: geom.Point;
-
-  constructor(private host: FeatureComponent) {
-    // console.log('creating aol-geometry-point');
-  }
-
-  ngOnInit() {
-    this.instance = new geom.Point([0, 0]); // defaulting coordinates to [0,0]. To be overridden in child component.
-    this.host.instance.setGeometry(this.instance);
-  }
-
-  ngOnDestroy() {
-    // this.host.setGeometry(null);
-  }
-}
-
-@Component({
-  selector: 'aol-geometry-polygon',
-  template: `<ng-content></ng-content>`
-})
-export class GeometryPolygonComponent implements OnInit, OnDestroy {
-  public componentType: string = 'geometry-polygon';
-  public instance: geom.Polygon;
-
-  constructor(private host: FeatureComponent) {
-    // console.log('creating aol-geometry-polygon');
-  }
-
-  ngOnInit() {
-    // defaulting coordinates to [0,0]. To be overridden in child component.
-    this.instance = new geom.Polygon([ [ [0, 0], [1, 0], [1, 1] ] ]);
-    this.host.instance.setGeometry(this.instance);
-  }
-
-  ngOnDestroy() {
-    // this.host.setGeometry(null);
-  }
-}

projects/common-aol/src/fm-aol/components/index.ts

@@ -1,19 +0,0 @@
-export * from './controls';
-export * from './formats';
-export * from './interactions';
-export * from './layers';
-export * from './sources';
-export * from './styles';
-
-export * from './attribution.component';
-export * from './attributions.component';
-export * from './content.component';
-export * from './coordinate.component';
-export * from './feature.component';
-export * from './geometry.components';
-export * from './graticule.component';
-export * from './map.component';
-export * from './overlay.component';
-export * from './tilegrid.component';
-export * from './tilegridwmts.component';
-export * from './view.component';

projects/common-aol/src/fm-aol/components/interactions/default.component.ts

@@ -1,23 +0,0 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { interaction, Collection } from 'openlayers';
-import { MapComponent } from '../map.component';
-
-@Component({
-  selector: 'aol-interaction-default',
-  template: ''
-})
-export class DefaultInteractionComponent implements OnInit, OnDestroy {
-  instance: Collection<interaction.Interaction>;
-
-  constructor(private map: MapComponent) {
-  }
-
-  ngOnInit() {
-    this.instance = interaction.defaults();
-    this.instance.forEach((interaction) => this.map.instance.addInteraction(interaction));
-  }
-
-  ngOnDestroy() {
-    this.instance.forEach((interaction) => this.map.instance.removeInteraction(interaction));
-  }
-}

projects/common-aol/src/fm-aol/components/interactions/draw.component.ts

@@ -1,50 +0,0 @@
-import { Component, Input, OnDestroy, OnInit, EventEmitter, Output } from '@angular/core';
-import { interaction } from 'openlayers';
-import { MapComponent } from '../map.component';
-
-@Component({
-  selector: 'aol-interaction-draw',
-  template: ''
-})
-export class DrawInteractionComponent implements OnInit, OnDestroy {
-  instance: interaction.Draw;
-
-  @Input() clickTolerance?: number;
-  @Input() features?: ol.Collection<ol.Feature>;
-  @Input() source?: ol.source.Vector;
-  @Input() snapTolerance?: number;
-  @Input() type: ol.geom.GeometryType;
-  @Input() maxPoints?: number;
-  @Input() minPoints?: number;
-  @Input() finishCondition?: ol.EventsConditionType;
-  @Input() style?: (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
-  @Input() geometryFunction?: ol.DrawGeometryFunctionType;
-  @Input() geometryName?: string;
-  @Input() condition?: ol.EventsConditionType;
-  @Input() freehandCondition?: ol.EventsConditionType;
-  @Input() freehand?: boolean;
-  @Input() wrapX?: boolean;
-
-  @Output() onChange = new EventEmitter<ol.interaction.Draw.Event>();
-  @Output() onChangeActive = new EventEmitter<ol.interaction.Draw.Event>();
-  @Output() onDrawEnd = new EventEmitter<ol.interaction.Draw.Event>();
-  @Output() onDrawStart = new EventEmitter<ol.interaction.Draw.Event>();
-  @Output() onPropertyChange = new EventEmitter<ol.interaction.Draw.Event>();
-
-  constructor(private map: MapComponent) {
-  }
-
-  ngOnInit() {
-    this.instance = new interaction.Draw(this);
-    this.instance.on('change', (event: ol.interaction.Draw.Event) => this.onChange.emit(event));
-    this.instance.on('change:active', (event: ol.interaction.Draw.Event) => this.onChangeActive.emit(event));
-    this.instance.on('drawend', (event: ol.interaction.Draw.Event) => this.onDrawEnd.emit(event));
-    this.instance.on('drawstart', (event: ol.interaction.Draw.Event) => this.onDrawStart.emit(event));
-    this.instance.on('propertychange', (event: ol.interaction.Draw.Event) => this.onPropertyChange.emit(event));
-    this.map.instance.addInteraction(this.instance);
-  }
-
-  ngOnDestroy() {
-    this.map.instance.removeInteraction(this.instance);
-  }
-}

projects/common-aol/src/fm-aol/components/interactions/index.ts

@@ -1,14 +0,0 @@
-export * from './default.component';
-export * from './doubleclickzoom.component';
-export * from './draganddrop.component';
-export * from './dragbox.component';
-export * from './dragpan.component';
-export * from './dragrotate.component';
-export * from './dragrotateandzoom.component';
-export * from './dragzoom.component';
-export * from './mousewheelzoom.component';
-export * from './pinchzoom.component';
-export * from './draw.component';
-export * from './select.component';
-export * from './translate.component';
-export * from './modify.component';

projects/common-aol/src/fm-aol/components/interactions/modify.component.ts

@@ -1,42 +0,0 @@
-import { Component, OnDestroy, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { interaction, EventsConditionType, style, StyleFunction, Collection, Feature, source } from 'openlayers';
-import { MapComponent } from '../map.component';
-
-@Component({
-    selector: 'aol-interaction-modify',
-    template: ''
-})
-export class ModifyInteractionComponent implements OnInit, OnDestroy {
-    instance: interaction.Modify;
-
-    @Input() condition?: EventsConditionType;
-    @Input() deleteCondition?: EventsConditionType;
-    @Input() pixelTolerance?: number;
-    @Input() style?: (style.Style | style.Style[] | StyleFunction);
-    @Input() features: Collection<Feature>;
-    @Input() wrapX?: boolean;
-    @Input() source?: source.Vector;
-
-    @Output() onModifyEnd = new EventEmitter<interaction.Modify.Event>();
-    @Output() onModifyStart = new EventEmitter<interaction.Modify.Event>();
-    @Output() onChange = new EventEmitter<interaction.Modify.Event>();
-    @Output() onChangeActive = new EventEmitter<interaction.Modify.Event>();
-    @Output() onPropertyChange = new EventEmitter<interaction.Modify.Event>();
-
-    constructor(private map: MapComponent) {
-    }
-
-    ngOnInit() {
-        this.instance = new interaction.Modify(this);
-        this.instance.on('change', (event: interaction.Modify.Event) => this.onChange.emit(event));
-        this.instance.on('change:active', (event: interaction.Modify.Event) => this.onChangeActive.emit(event));
-        this.instance.on('propertychange', (event: interaction.Modify.Event) => this.onPropertyChange.emit(event));
-        this.instance.on('modifyend', (event: interaction.Modify.Event) => this.onModifyEnd.emit(event));
-        this.instance.on('modifystart', (event: interaction.Modify.Event) => this.onModifyStart.emit(event));
-        this.map.instance.addInteraction(this.instance);
-    }
-
-    ngOnDestroy() {
-        this.map.instance.removeInteraction(this.instance);
-    }
-}

projects/common-aol/src/fm-aol/components/interactions/pinchzoom.component.js

@@ -1,36 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var core_1 = require("@angular/core");
-var openlayers_1 = require("openlayers");
-var PinchZoomInteractionComponent = (function () {
-    function PinchZoomInteractionComponent(map) {
-        this.map = map;
-    }
-    PinchZoomInteractionComponent.prototype.ngOnInit = function () {
-        this.instance = new openlayers_1.interaction.PinchZoom(this);
-        this.map.instance.addInteraction(this.instance);
-    };
-    PinchZoomInteractionComponent.prototype.ngOnDestroy = function () {
-        this.map.instance.removeInteraction(this.instance);
-    };
-    return PinchZoomInteractionComponent;
-}());
-__decorate([
-    core_1.Input()
-], PinchZoomInteractionComponent.prototype, "duration", void 0);
-__decorate([
-    core_1.Input()
-], PinchZoomInteractionComponent.prototype, "constrainResolution", void 0);
-PinchZoomInteractionComponent = __decorate([
-    core_1.Component({
-        selector: 'aol-interaction-pinchzoom',
-        template: ''
-    })
-], PinchZoomInteractionComponent);
-exports.PinchZoomInteractionComponent = PinchZoomInteractionComponent;

projects/common-aol/src/fm-aol/components/interactions/select.component.ts

@@ -1,44 +0,0 @@
-import { Component, OnDestroy, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { interaction, EventsConditionType, layer, style, Collection, SelectFilterFunction, StyleFunction, Feature } from 'openlayers';
-import { MapComponent } from '../map.component';
-
-@Component({
-    selector: 'aol-interaction-select',
-    template: ''
-})
-export class SelectInteractionComponent implements OnInit, OnDestroy {
-    instance: interaction.Select;
-
-
-    @Input() addCondition?: EventsConditionType;
-    @Input() condition?: EventsConditionType;
-    @Input() layers?: (layer.Layer[] | ((layer: layer.Layer) => boolean));
-    @Input() style?: (style.Style | style.Style[] | StyleFunction);
-    @Input() removeCondition?: EventsConditionType;
-    @Input() toggleCondition?: EventsConditionType;
-    @Input() multi?: boolean;
-    @Input() features?: Collection<Feature>;
-    @Input() filter?: SelectFilterFunction;
-    @Input() wrapX?: boolean;
-
-    @Output() onChange = new EventEmitter<interaction.Select.Event>();
-    @Output() onSelect = new EventEmitter<interaction.Select.Event>();
-    @Output() onPropertyChange = new EventEmitter<interaction.Select.Event>();
-
-    constructor(private map: MapComponent) {
-    }
-
-    ngOnInit() {
-        this.instance = new interaction.Select(this);
-
-        this.instance.on('change', (event: interaction.Select.Event) => this.onChange.emit(event));
-        this.instance.on('select', (event: interaction.Select.Event) => this.onSelect.emit(event));
-        this.instance.on('propertychange', (event: interaction.Select.Event) => this.onPropertyChange.emit(event));
-
-        this.map.instance.addInteraction(this.instance);
-    }
-
-    ngOnDestroy() {
-        this.map.instance.removeInteraction(this.instance);
-    }
-}

projects/common-aol/src/fm-aol/components/interactions/translate.component.ts

@@ -1,45 +0,0 @@
-import { Component, OnDestroy, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { interaction, layer, Collection, Feature } from 'openlayers';
-import { MapComponent } from '../map.component';
-
-@Component({
-  selector: 'aol-interaction-translate',
-  template: ''
-})
-export class TranslateInteractionComponent implements OnInit, OnDestroy {
-  instance: interaction.Translate;
-
-  @Input() features?: Collection<Feature>;
-  @Input() layers?: (layer.Layer[] | ((layer: layer.Layer) => boolean));
-  @Input() hitTolerance?: number;
-
-  @Output() onChange: EventEmitter<interaction.Translate.Event>;
-  @Output() onPropertyChange: EventEmitter<interaction.Translate.Event>;
-  @Output() onTranslateEnd: EventEmitter<interaction.Translate.Event>;
-  @Output() onTranslateStart: EventEmitter<interaction.Translate.Event>;
-  @Output() onTranslating: EventEmitter<interaction.Translate.Event>;
-
-  constructor(private map: MapComponent) {
-    this.onChange = new EventEmitter<interaction.Translate.Event>();
-    this.onPropertyChange = new EventEmitter<interaction.Translate.Event>();
-    this.onTranslateEnd = new EventEmitter<interaction.Translate.Event>();
-    this.onTranslateStart = new EventEmitter<interaction.Translate.Event>();
-    this.onTranslating = new EventEmitter<interaction.Translate.Event>();
-  }
-
-  ngOnInit() {
-    this.instance = new interaction.Translate(this);
-
-    this.instance.on('change', (event: interaction.Translate.Event) => this.onChange.emit(event));
-    this.instance.on('propertychange', (event: interaction.Translate.Event) => this.onPropertyChange.emit(event));
-    this.instance.on('translateend', (event: interaction.Translate.Event) => this.onTranslateEnd.emit(event));
-    this.instance.on('translatestart', (event: interaction.Translate.Event) => this.onTranslateStart.emit(event));
-    this.instance.on('translating', (event: interaction.Translate.Event) => this.onTranslating.emit(event));
-
-    this.map.instance.addInteraction(this.instance);
-  }
-
-  ngOnDestroy() {
-    this.map.instance.removeInteraction(this.instance);
-  }
-}

projects/common-aol/src/fm-aol/components/layers/index.ts

@@ -1,6 +0,0 @@
-export * from './layer.component';
-export * from './layergroup.component';
-export * from './layerimage.component';
-export * from './layertile.component';
-export * from './layervector.component';
-export * from './layervectortile.component';

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

@@ -1,59 +0,0 @@
-import { OnDestroy, OnInit, OnChanges, Input, SimpleChanges, Component, Injectable } from '@angular/core';
-import { layer, Extent } from 'openlayers';
-import { MapComponent } from '../map.component';
-import { LayerGroupComponent } from './layergroup.component';
-
-@Injectable()
-export abstract class LayerComponent implements OnInit, OnChanges, OnDestroy {
-  public instance: any;
-  public componentType: string = 'layer';
-
-  @Input() opacity: number;
-  @Input() visible: boolean;
-  @Input() extent:	Extent;
-  @Input() zIndex:	number;
-  @Input() minResolution: number;
-  @Input() maxResolution: number;
-
-  @Input() precompose: (evt: ol.events.Event) => void;
-  @Input() postcompose: (evt: ol.events.Event) => void;
-
-  constructor(protected host: LayerGroupComponent | MapComponent) {
-  }
-
-  ngOnInit() {
-    if (this.precompose !== null && this.precompose !== undefined) {
-      this.instance.on('precompose', this.precompose);
-    }
-    if (this.postcompose !== null && this.postcompose !== undefined) {
-      this.instance.on('postcompose', this.postcompose);
-    }
-    this.host.instance.getLayers().push(this.instance);
-  }
-
-  ngOnDestroy() {
-    this.host.instance.getLayers().remove(this.instance);
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    let properties: { [index: string]: any } = {};
-    if (!this.instance) {
-      return;
-    }
-    for (let key in changes) {
-      if (changes.hasOwnProperty(key)) {
-        properties[key] = changes[key].currentValue;
-        if (key === 'precompose') {
-          this.instance.un('precompose', changes[key].previousValue)
-          this.instance.on('precompose', changes[key].currentValue);
-        }
-        if (key === 'postcompose') {
-          this.instance.un('postcompose', changes[key].previousValue)
-          this.instance.on('postcompose', changes[key].currentValue);
-        }
-      }
-    }
-    // console.log('changes detected in aol-layer, setting new properties: ', properties);
-    this.instance.setProperties(properties, false);
-  }
-}

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

@@ -1,37 +0,0 @@
-import {
-  Component, EventEmitter, Input, OnChanges, OnInit, Optional,
-  SimpleChanges
-} from '@angular/core';
-import { Extent, layer, source } from 'openlayers';
-import { MapComponent } from '../map.component';
-import { LayerComponent } from './layer.component';
-import { LayerGroupComponent } from './layergroup.component';
-
-@Component({
-  selector: 'aol-layer-image',
-  template: `<ng-content></ng-content>`
-})
-export class LayerImageComponent extends LayerComponent implements OnInit, OnChanges {
-  public source: source.Image;
-
-  @Input() opacity: number;
-  @Input() visible: boolean;
-  @Input() extent: Extent;
-  @Input() minResolution: number;
-  @Input() maxResolution: number;
-  @Input() zIndex: number;
-
-  constructor(map: MapComponent,
-              @Optional() group?: LayerGroupComponent) {
-    super(group || map);
-  }
-
-  ngOnInit() {
-    this.instance = new layer.Image(this);
-    super.ngOnInit();
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    super.ngOnChanges(changes);
-  }
-}

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

@@ -1,33 +0,0 @@
-import {
-  Component, OnDestroy, OnInit, Input, Optional, OnChanges,
-  SimpleChanges
-} from '@angular/core';
-import { layer, source } from 'openlayers';
-import { MapComponent } from '../map.component';
-import { LayerComponent } from './layer.component';
-import { LayerGroupComponent } from './layergroup.component';
-
-@Component({
-  selector: 'aol-layer-vector',
-  template: `<ng-content></ng-content>`
-})
-export class LayerVectorComponent extends LayerComponent implements OnInit, OnDestroy, OnChanges {
-  public source: source.Vector;
-
-  @Input() renderBuffer: number;
-
-  constructor(map: MapComponent,
-              @Optional() group?: LayerGroupComponent) {
-    super(group || map);
-  }
-
-  ngOnInit() {
-    // console.log('creating ol.layer.Vector instance with:', this);
-    this.instance = new layer.Vector(this);
-    super.ngOnInit();
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    super.ngOnChanges(changes);
-  }
-}

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

@@ -1,90 +0,0 @@
-import {
-  Component, OnInit, ElementRef, Input, Output, EventEmitter, AfterViewInit,
-  SimpleChanges, OnChanges
-} from '@angular/core';
-import {
-  Map, MapBrowserEvent, MapEvent, render, ObjectEvent, control,
-  interaction
-} from 'openlayers';
-
-@Component({
-  selector: 'aol-map',
-  template: `<div [style.width]="width" [style.height]="height"></div><ng-content></ng-content>`
-})
-
-export class MapComponent implements OnInit, AfterViewInit, OnChanges {
-  public instance: Map;
-  public componentType: string = 'map';
-
-  @Input() width: string = '100%';
-  @Input() height: string = '100%';
-  @Input() pixelRatio: number;
-  @Input() keyboardEventTarget: Element|string;
-  @Input() loadTilesWhileAnimating: boolean;
-  @Input() loadTilesWhileInteracting: boolean;
-  @Input() logo: string|boolean;
-  @Input() renderer: 'canvas'|'webgl';
-
-
-  @Output() onClick: EventEmitter<MapBrowserEvent>;
-  @Output() onDblClick: EventEmitter<MapBrowserEvent>;
-  @Output() onMoveEnd: EventEmitter<MapEvent>;
-  @Output() onPointerDrag: EventEmitter<MapBrowserEvent>;
-  @Output() onPointerMove: EventEmitter<MapBrowserEvent>;
-  @Output() onPostCompose: EventEmitter<render.Event>;
-  @Output() onPostRender: EventEmitter<MapEvent>;
-  @Output() onPreCompose: EventEmitter<render.Event>;
-  @Output() onPropertyChange: EventEmitter<ObjectEvent>;
-  @Output() onSingleClick: EventEmitter<MapBrowserEvent>;
-
-  // we pass empty arrays to not get default controls/interactions because we have our own directives
-  controls: control.Control[] = [];
-  interactions: interaction.Interaction[] = [];
-
-  constructor(private host: ElementRef) {
-    this.onClick = new EventEmitter<MapBrowserEvent>();
-    this.onDblClick = new EventEmitter<MapBrowserEvent>();
-    this.onMoveEnd = new EventEmitter<MapEvent>();
-    this.onPointerDrag = new EventEmitter<MapBrowserEvent>();
-    this.onPointerMove = new EventEmitter<MapBrowserEvent>();
-    this.onPostCompose = new EventEmitter<render.Event>();
-    this.onPostRender = new EventEmitter<MapEvent>();
-    this.onPreCompose = new EventEmitter<render.Event>();
-    this.onPropertyChange = new EventEmitter<ObjectEvent>();
-    this.onSingleClick = new EventEmitter<MapBrowserEvent>();
-  }
-
-  ngOnInit() {
-    // console.log('creating ol.Map instance with:', this);
-    this.instance = new Map(this);
-    this.instance.setTarget(this.host.nativeElement.firstElementChild);
-    this.instance.on('click', (event: MapBrowserEvent) => this.onClick.emit(event));
-    this.instance.on('dblclick', (event: MapBrowserEvent) => this.onDblClick.emit(event));
-    this.instance.on('moveend', (event: MapEvent) => this.onMoveEnd.emit(event));
-    this.instance.on('pointerdrag', (event: MapBrowserEvent) => this.onPointerDrag.emit(event));
-    this.instance.on('pointermove', (event: MapBrowserEvent) => this.onPointerMove.emit(event));
-    this.instance.on('postcompose', (event: render.Event) => this.onPostCompose.emit(event));
-    this.instance.on('postrender', (event: MapEvent) => this.onPostRender.emit(event));
-    this.instance.on('precompose', (event: render.Event) => this.onPreCompose.emit(event));
-    this.instance.on('propertychange', (event: ObjectEvent) => this.onPropertyChange.emit(event));
-    this.instance.on('singleclick', (event: MapBrowserEvent) => this.onSingleClick.emit(event));
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    let properties: { [index: string]: any } = {};
-    if (!this.instance) {
-      return;
-    }
-    for (let key in changes) {
-      if (changes.hasOwnProperty(key)) {
-        properties[key] = changes[key].currentValue;
-      }
-    }
-    // console.log('changes detected in aol-map, setting new properties: ', properties);
-    this.instance.setProperties(properties, false);
-  }
-
-  ngAfterViewInit() {
-    this.instance.updateSize();
-  }
-}

projects/common-aol/src/fm-aol/components/sources/bingmaps.component.ts

@@ -1,34 +0,0 @@
-import { Component, Host, Input, OnInit, forwardRef } from '@angular/core';
-import { source, TileLoadFunctionType } from 'openlayers';
-import { LayerTileComponent } from '../layers';
-import { SourceComponent } from './source.component';
-
-@Component({
-  selector: 'aol-source-bingmaps',
-  template: `<div class="aol-source-bingmaps"></div>`,
-  providers: [
-    { provide: SourceComponent, useExisting: forwardRef(() => SourceBingmapsComponent) }
-  ]
-})
-export class SourceBingmapsComponent extends SourceComponent implements OnInit {
-  instance: source.BingMaps;
-
-  @Input() cacheSize: number;
-  @Input() hidpi: boolean;
-  @Input() culture: string;
-  @Input() key: string;
-  @Input() imagerySet: 'Road'|'Aerial'|'AerialWithLabels'|'collinsBart'|'ordnanceSurvey' = 'Aerial';
-  @Input() maxZoom: number;
-  @Input() reprojectionErrorThreshold: number;
-  @Input() tileLoadFunction: TileLoadFunctionType;
-  @Input() wrapX: boolean;
-
-  constructor(@Host() layer: LayerTileComponent) {
-    super(layer);
-  }
-
-  ngOnInit() {
-    this.instance = new source.BingMaps(this);
-    this.host.instance.setSource(this.instance);
-  }
-}

projects/common-aol/src/fm-aol/components/sources/cluster.component.ts

@@ -1,34 +0,0 @@
-import {Component, Host, Input, OnInit, forwardRef, ContentChild, AfterContentInit} from '@angular/core';
-import { source, Feature, geom } from 'openlayers';
-import { LayerVectorComponent } from '../layers';
-import { SourceComponent } from './source.component';
-import { SourceVectorComponent } from './vector.component';
-
-
-@Component({
-    selector: 'aol-source-cluster',
-    template: `<ng-content></ng-content>`,
-    providers: [
-        { provide: SourceComponent, useExisting: forwardRef(() => SourceClusterComponent) }
-    ]
-})
-export class SourceClusterComponent extends SourceComponent implements AfterContentInit {
-    instance: source.Cluster;
-
-    @Input() distance: number;
-    @Input() geometryFunction?: ((feature: Feature) => geom.Point);
-
-    @ContentChild(SourceVectorComponent) sourceVectorComponent: SourceVectorComponent;
-    source: source.Vector;
-
-    constructor(@Host() layer: LayerVectorComponent) {
-        super(layer);
-    }
-
-    ngAfterContentInit() {
-      this.source = this.sourceVectorComponent.instance;
-
-      this.instance = new source.Cluster(this);
-      this.host.instance.setSource(this.instance);
-    }
-}

projects/common-aol/src/fm-aol/components/sources/geojson.component.ts

@@ -1,32 +0,0 @@
-import { Component, Host, Input, OnInit, forwardRef } from '@angular/core';
-import { source, ProjectionLike, format } from 'openlayers';
-import { LayerVectorComponent } from '../layers';
-import { FormatComponent } from '../formats';
-import { SourceComponent } from './source.component';
-
-
-@Component({
-    selector: 'aol-source-geojson',
-    template: `<ng-content></ng-content>`,
-    providers: [
-        { provide: SourceComponent, useExisting: forwardRef(() => SourceGeoJSONComponent) }
-    ]
-})
-export class SourceGeoJSONComponent extends SourceComponent implements OnInit {
-    instance: source.Vector;
-    format: format.Feature;
-    @Input() defaultDataProjection: ProjectionLike;
-    @Input() featureProjection: ProjectionLike;
-    @Input() geometryName: string;
-    @Input() url: string;
-
-    constructor( @Host() layer: LayerVectorComponent) {
-        super(layer);
-    }
-
-    ngOnInit() {
-        this.format = new format.GeoJSON(this);
-        this.instance = new source.Vector(this);
-        this.host.instance.setSource(this.instance);
-    }
-}

projects/common-aol/src/fm-aol/components/sources/imagestatic.component.ts

@@ -1,31 +0,0 @@
-import { Component, Host, Input, OnInit, forwardRef } from '@angular/core';
-import { ProjectionLike, source, Extent, AttributionLike, ImageLoadFunctionType, Size } from 'openlayers';
-import { SourceComponent } from './source.component';
-import { LayerImageComponent } from '../layers/layerimage.component';
-
-@Component({
-  selector: 'aol-source-imagestatic',
-  template: `<ng-content></ng-content>`,
-  providers: [{ provide: SourceComponent, useExisting: forwardRef(() => SourceImageStaticComponent) }],
-})
-export class SourceImageStaticComponent extends SourceComponent implements OnInit {
-  instance: source.ImageStatic;
-
-  @Input() projection: (ProjectionLike | string);
-  @Input() imageExtent: Extent;
-  @Input() url: string;
-  @Input() attributions: AttributionLike;
-  @Input() crossOrigin?: string;
-  @Input() imageLoadFunction?: ImageLoadFunctionType;
-  @Input() logo?: (string | olx.LogoOptions);
-  @Input() imageSize?: Size;
-
-  constructor(@Host() layer: LayerImageComponent) {
-    super(layer);
-  }
-
-  ngOnInit() {
-    this.instance = new source.ImageStatic(this);
-    this.host.instance.setSource(this.instance);
-  }
-}

projects/common-aol/src/fm-aol/components/sources/imagewms.component.ts

@@ -1,36 +0,0 @@
-import { Component, Host, Input, OnInit, forwardRef } from '@angular/core';
-import { AttributionLike, ImageLoadFunctionType, ProjectionLike, source } from 'openlayers';
-import { LayerImageComponent } from '../layers';
-import { SourceComponent } from './source.component';
-
-@Component({
-  selector: 'aol-source-imagewms',
-  template: `<ng-content></ng-content>`,
-  providers: [
-    { provide: SourceComponent, useExisting: forwardRef(() => SourceImageWMSComponent) }
-  ]
-})
-export class SourceImageWMSComponent extends SourceComponent implements OnInit {
-  instance: source.ImageWMS;
-
-  @Input() attributions: AttributionLike;
-  @Input() crossOrigin: string;
-  @Input() hidpi: boolean;
-  @Input() serverType: string;
-  @Input() imageLoadFunction?: ImageLoadFunctionType;
-  @Input() logo: (string | olx.LogoOptions);
-  @Input() params: Object;
-  @Input() projection: (ProjectionLike | string);
-  @Input() ratio: number;
-  @Input() resolutions: Array<number>;
-  @Input() url: string;
-
-  constructor(@Host() layer: LayerImageComponent) {
-    super(layer);
-  }
-
-  ngOnInit() {
-    this.instance = new source.ImageWMS(this);
-    this.host.instance.setSource(this.instance);
-  }
-}

projects/common-aol/src/fm-aol/components/sources/index.ts

@@ -1,15 +0,0 @@
-export * from './bingmaps.component';
-export * from './osm.component';
-export * from './source.component';
-export * from './vector.component';
-export * from './vectortile.component';
-export * from './xyz.component';
-export * from './tilewms.component';
-export * from './geojson.component';
-export * from './tilejson.component';
-export * from './tileutfgrid.component';
-export * from './tilewmts.component';
-export * from './imagewms.component';
-export * from './imagestatic.component';
-export * from './cluster.component';
-export * from './raster.component';

projects/common-aol/src/fm-aol/components/sources/osm.component.ts

@@ -1,40 +0,0 @@
-import {Component, Host, forwardRef, Input, AfterContentInit, Optional, OnInit} from '@angular/core';
-import { source, AttributionLike, TileLoadFunctionType } from 'openlayers';
-import { LayerTileComponent } from '../layers';
-import { SourceComponent } from './source.component';
-import { SourceXYZComponent } from './xyz.component';
-import {SourceRasterComponent} from './raster.component';
-
-@Component({
-  selector: 'aol-source-osm',
-  template: `<div class="aol-source-osm"></div>`,
-  providers: [
-    { provide: SourceComponent, useExisting: forwardRef(() => SourceOsmComponent) }
-  ]
-})
-export class SourceOsmComponent extends SourceXYZComponent implements AfterContentInit {
-  instance: source.OSM;
-
-  @Input() attributions: AttributionLike;
-  @Input() cacheSize: number;
-  @Input() crossOrigin: string;
-  @Input() maxZoom: number;
-  @Input() opaque: boolean;
-  @Input() reprojectionErrorThreshold: number;
-  @Input() tileLoadFunction: TileLoadFunctionType;
-  @Input() url: string;
-  @Input() wrapX: boolean;
-
-  constructor(@Host() @Optional() layer: LayerTileComponent,
-              @Host() @Optional() raster?: SourceRasterComponent) {
-    super(layer, raster);
-  }
-
-  ngAfterContentInit() {
-    if (this.tileGridXYZ) {
-      this.tileGrid = this.tileGridXYZ.instance;
-    }
-    this.instance = new source.OSM(this);
-    this._register(this.instance);
-  }
-}

projects/common-aol/src/fm-aol/components/sources/raster.component.ts

@@ -1,42 +0,0 @@
-import { AfterContentInit, Component, EventEmitter, forwardRef, Host, Input, Output } from '@angular/core';
-import { RasterOperation, RasterOperationType, source } from 'openlayers';
-
-import { LayerImageComponent } from '../layers/layerimage.component';
-import { SourceComponent } from './source.component';
-
-@Component({
-  selector: 'aol-source-raster',
-  template: `<ng-content></ng-content>`,
-  providers: [
-    {
-      provide: SourceComponent,
-      useExisting: forwardRef(() => SourceRasterComponent)
-    }
-  ]
-})
-export class SourceRasterComponent extends SourceComponent implements AfterContentInit {
-  instance: source.Raster;
-
-  @Input() operation?: RasterOperation;
-  @Input() threads?: number;
-  @Input() lib?: Object;
-  @Input() operationType?: RasterOperationType;
-
-  @Output() beforeOperations: EventEmitter<source.RasterEvent> = new EventEmitter<source.RasterEvent>();
-  @Output() afterOperations: EventEmitter<source.RasterEvent> = new EventEmitter<source.RasterEvent>();
-
-  sources: source.Source[] = [];
-
-  constructor(@Host() layer: LayerImageComponent) {
-    super(layer);
-  }
-
-  ngAfterContentInit() {
-    this.instance = new source.Raster(this);
-
-    this.instance.on('beforeoperations', (event: source.RasterEvent) => this.beforeOperations.emit(event));
-    this.instance.on('afteroperations', (event: source.RasterEvent) => this.afterOperations.emit(event));
-
-    this._register(this.instance);
-  }
-}

projects/common-aol/src/fm-aol/components/sources/source.component.ts

@@ -1,39 +0,0 @@
-import {AfterContentInit, Component, Host, Input, OnDestroy, OnInit, Optional} from '@angular/core';
-import { source } from 'openlayers';
-import { LayerComponent } from '../layers';
-import AttributionLike = ol.AttributionLike;
-import { SourceRasterComponent } from './raster.component';
-
-@Component({
-  selector: 'required-for-ivy-2',
-  template: `<ng-content></ng-content>`
-})
-export class SourceComponent implements OnDestroy {
-  public instance: source.Source;
-  public componentType: string = 'source';
-
-  @Input() attributions: AttributionLike;
-
-  constructor(protected host: LayerComponent, protected raster?: SourceRasterComponent) {
-  }
-
-  ngOnDestroy() {
-    if (this.host) {
-      this.host.instance.setSource(null);
-    }
-
-    if (this.raster) {
-      this.raster.sources = [];
-    }
-  }
-
-  protected _register(source: source.Source) {
-    if (this.host) {
-      this.host.instance.setSource(source);
-    }
-
-    if (this.raster) {
-      this.raster.sources = [source];
-    }
-  }
-}

projects/common-aol/src/fm-aol/components/sources/tileutfgrid.component.ts

@@ -1,25 +0,0 @@
-import { Component, Host, Input, OnInit, forwardRef } from '@angular/core';
-import { source } from 'openlayers';
-import { LayerTileComponent } from '../layers';
-import { SourceComponent } from './source.component';
-
-@Component({
-  selector: 'aol-source-tileutfgrid',
-  template: `<ng-content></ng-content>`,
-  providers: [
-    { provide: SourceComponent, useExisting: forwardRef(() => SourceTileUTFGridComponent) }
-  ]
-})
-export class SourceTileUTFGridComponent extends SourceComponent implements OnInit {
-  instance: source.TileUTFGrid;
-  @Input() tileJSON: JSON;
-
-  constructor(@Host() layer: LayerTileComponent) {
-    super(layer);
-  }
-
-  ngOnInit() {
-    this.instance = new source.TileUTFGrid(this);
-    this.host.instance.setSource(this.instance);
-  }
-}

projects/common-aol/src/fm-aol/components/sources/tilewms.component.ts

@@ -1,37 +0,0 @@
-import { Component, Host, Input, OnInit, forwardRef } from '@angular/core';
-import { source, TileLoadFunctionType, tilegrid } from 'openlayers';
-import { LayerTileComponent } from '../layers';
-import { SourceComponent } from './source.component';
-
-@Component({
-  selector: 'aol-source-tilewms',
-  template: `<ng-content></ng-content>`,
-  providers: [
-    { provide: SourceComponent, useExisting: forwardRef(() => SourceTileWMSComponent) }
-  ]
-})
-export class SourceTileWMSComponent extends SourceComponent implements OnInit {
-  instance: source.TileWMS;
-  @Input() cacheSize: number;
-  @Input() crossOrigin: string;
-  @Input() gutter: number;
-  @Input() hidpi: boolean;
-  @Input() params: Object;
-  @Input() projection: string;
-  @Input() reprojectionErrorThreshold: number;
-  @Input() serverType: string;
-  @Input() tileGrid: tilegrid.TileGrid;
-  @Input() tileLoadFunction: TileLoadFunctionType;
-  @Input() url: string;
-  @Input() urls: string[];
-  @Input() wrapX: boolean;
-
-  constructor(@Host() layer: LayerTileComponent) {
-    super(layer);
-  }
-
-  ngOnInit() {
-    this.instance = new source.TileWMS(this);
-    this.host.instance.setSource(this.instance);
-  }
-}

projects/common-aol/src/fm-aol/components/sources/tilewmts.component.ts

@@ -1,84 +0,0 @@
-import {Component, Host, Input, forwardRef, AfterContentInit, ContentChild, SimpleChanges} from '@angular/core';
-import {
-  TileLoadFunctionType,
-  tilegrid,
-  ProjectionLike,
-  source,
-  ImageTile,
-  TileCoord,
-  Tile
-} from 'openlayers';
-import {LayerTileComponent} from '../layers';
-import {SourceComponent} from './source.component';
-import {TileGridWMTSComponent} from '../tilegridwmts.component';
-
-@Component({
-  selector: 'aol-source-tilewmts',
-  template: `<ng-content></ng-content>`,
-  providers: [
-    {provide: SourceComponent, useExisting: forwardRef(() => SourceTileWMTSComponent)}
-  ]
-})
-export class SourceTileWMTSComponent extends SourceComponent implements AfterContentInit {
-
-  instance: source.WMTS;
-  @Input() cacheSize?: number;
-  @Input() crossOrigin?: (string);
-  @Input() logo?: (string | olx.LogoOptions);
-  @Input() tileGrid: tilegrid.WMTS;
-  @Input() projection: ProjectionLike;
-  @Input() reprojectionErrorThreshold?: number;
-  @Input() requestEncoding?: (source.WMTSRequestEncoding | string);
-  @Input() layer: string;
-  @Input() style: string;
-  @Input() tileClass?: ((n: ImageTile, coords: TileCoord, state: Tile.State, s1: string, s2: string, type: TileLoadFunctionType) => any);
-  @Input() tilePixelRatio?: number;
-  @Input() version?: string;
-  @Input() format?: string;
-  @Input() matrixSet: string;
-  @Input() dimensions?: GlobalObject;
-  @Input() url?: string;
-  @Input() tileLoadFunction?: TileLoadFunctionType;
-  @Input() urls?: string[];
-  @Input() wrapX?: boolean;
-
-  @ContentChild(TileGridWMTSComponent) tileGridWMTS: TileGridWMTSComponent;
-
-  constructor(@Host() layer: LayerTileComponent) {
-    super(layer);
-  }
-
-
-  ngOnChanges(changes: SimpleChanges) {
-    let properties: {[index: string]: any} = {};
-    if (!this.instance) {
-      return;
-    }
-    for (let key in changes) {
-      if (changes.hasOwnProperty(key)) {
-        switch (key) {
-          case 'url':
-            this.url = changes[key].currentValue;
-            this.setLayerSource();
-            break;
-          default:
-            break;
-        }
-        properties[key] = changes[key].currentValue;
-      }
-    }
-    this.instance.setProperties(properties, false);
-  }
-
-  setLayerSource(): void {
-    this.instance = new source.WMTS(this);
-    this.host.instance.setSource(this.instance);
-  }
-
-  ngAfterContentInit(): void {
-    if (this.tileGridWMTS) {
-      this.tileGrid = this.tileGridWMTS.instance;
-      this.setLayerSource();
-    }
-  }
-}

projects/common-aol/src/fm-aol/components/sources/vector.component.ts

@@ -1,30 +0,0 @@
-import { Component, Host, Input, OnInit, forwardRef } from '@angular/core';
-import { source } from 'openlayers';
-import { LayerVectorComponent } from '../layers';
-import { SourceComponent } from './source.component';
-
-@Component({
-  selector: 'aol-source-vector',
-  template: `<ng-content></ng-content>`,
-  providers: [
-    { provide: SourceComponent, useExisting: forwardRef(() => SourceVectorComponent) }
-  ]
-})
-export class SourceVectorComponent extends SourceComponent implements OnInit {
-  instance: source.Vector;
-  @Input() overlaps: boolean;
-  @Input() useSpatialIndex: boolean;
-  @Input() wrapX: boolean;
-  @Input() url: string;
-  @Input() format: ol.format.Feature;
-  @Input() strategy: ol.LoadingStrategy;
-
-  constructor(@Host() layer: LayerVectorComponent) {
-    super(layer);
-  }
-
-  ngOnInit() {
-    this.instance = new source.Vector(this);
-    this.host.instance.setSource(this.instance);
-  }
-}

projects/common-aol/src/fm-aol/components/sources/vectortile.component.ts

@@ -1,43 +0,0 @@
-import { Component, Host, Input, forwardRef, ContentChild, AfterContentInit } from '@angular/core';
-import { source, ProjectionLike, TileUrlFunctionType, format, tilegrid } from 'openlayers';
-import { LayerVectorTileComponent } from '../layers';
-import { FormatComponent } from '../formats';
-import { TileGridComponent } from '../tilegrid.component';
-import { SourceComponent } from './source.component';
-
-@Component({
-  selector: 'aol-source-vectortile',
-  template: `<ng-content></ng-content>`,
-  providers: [
-    { provide: SourceComponent, useExisting: forwardRef(() => SourceVectorTileComponent) }
-  ]
-})
-export class SourceVectorTileComponent extends SourceComponent implements AfterContentInit {
-  public instance: source.VectorTile;
-  @Input() cacheSize: number;
-  @Input() overlaps: boolean;
-  @Input() projection: ProjectionLike;
-  @Input() tilePixelRatio: number;
-  @Input() tileUrlFunction: TileUrlFunctionType;
-  @Input() url: string;
-  @Input() urls: string[];
-  @Input() wrapX: boolean;
-
-  @ContentChild(FormatComponent) formatComponent: FormatComponent;
-  format: format.Feature;
-  @ContentChild(TileGridComponent) tileGridComponent: TileGridComponent;
-  tileGrid: tilegrid.TileGrid;
-
-  constructor(@Host() layer: LayerVectorTileComponent) {
-    super(layer);
-  }
-
-  /* need the children to construct the OL3 object */
-  ngAfterContentInit() {
-    this.format = this.formatComponent.instance;
-    this.tileGrid = this.tileGridComponent.instance;
-    // console.log('creating ol.source.VectorTile instance with:', this);
-    this.instance = new source.VectorTile(this);
-    this.host.instance.setSource(this.instance);
-  }
-}

projects/common-aol/src/fm-aol/components/sources/xyz.component.ts

@@ -1,77 +0,0 @@
-import {
-  Component,
-  Host,
-  Input,
-  AfterContentInit,
-  forwardRef,
-  OnChanges,
-  ContentChild,
-  SimpleChanges,
-  Optional,
-  OnInit
-} from '@angular/core';
-import { source, Size, TileUrlFunctionType, TileLoadFunctionType, tilegrid } from 'openlayers';
-import { LayerTileComponent } from '../layers';
-import { SourceComponent } from './source.component';
-import { TileGridComponent } from '../tilegrid.component';
-import { SourceRasterComponent } from './raster.component';
-
-@Component({
-  selector: 'aol-source-xyz',
-  template: `<ng-content></ng-content>`,
-  providers: [
-    { provide: SourceComponent, useExisting: forwardRef(() => SourceXYZComponent) }
-  ]
-})
-export class SourceXYZComponent extends SourceComponent implements AfterContentInit, OnChanges {
-  instance: source.XYZ;
-  @Input() cacheSize: number;
-  @Input() crossOrigin: string;
-  @Input() opaque: boolean;
-  @Input() projection: string;
-  @Input() reprojectionErrorThreshold: number;
-  @Input() minZoom: number;
-  @Input() maxZoom: number;
-  @Input() tileGrid: tilegrid.TileGrid;
-  @Input() tileLoadFunction?: TileLoadFunctionType;
-  @Input() tilePixelRatio: number;
-  @Input() tileSize: number|Size;
-  @Input() tileUrlFunction: TileUrlFunctionType;
-  @Input() url: string;
-  @Input() urls: string[];
-  @Input() wrapX: boolean;
-
-  @ContentChild(TileGridComponent) tileGridXYZ: TileGridComponent;
-
-  constructor(@Optional() @Host() layer: LayerTileComponent,
-              @Optional() @Host() raster?: SourceRasterComponent) {
-    super(layer, raster);
-  }
-
-  ngAfterContentInit() {
-    if (this.tileGridXYZ) {
-      this.tileGrid = this.tileGridXYZ.instance;
-    }
-    this.instance = new source.XYZ(this);
-    this._register(this.instance);
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    let properties: {[index: string]: any} = {};
-
-    if (!this.instance) {
-      return;
-    }
-    for (let key in changes) {
-      if (changes.hasOwnProperty(key)) {
-        properties[key] = changes[key].currentValue;
-      }
-    }
-
-    this.instance.setProperties(properties, false);
-    if (changes.hasOwnProperty('url')) {
-      this.instance = new source.XYZ(this);
-      this._register(this.instance);
-    }
-  }
-}

projects/common-aol/src/fm-aol/components/style.components_old.ts

@@ -1,90 +0,0 @@
-import {
-  Component, Directive, EventEmitter, Host, OnDestroy, OnChanges, AfterContentInit,
-  Input, Output, ContentChild, SimpleChanges
-} from '@angular/core';
-import { style } from 'openlayers';
-import { FeatureComponent } from './feature.component';
-
-@Directive({
-    selector: 'aol-style-icon'
-})
-export class StyleIconDirective implements OnChanges {
-
-    // For usage info see: http://openlayers.org/en/latest/apidoc/ol.style.Icon.html
-    @Input() anchor: [number, number];
-    @Input() anchorXUnits: style.IconAnchorUnits;
-    @Input() anchorYUnits: style.IconAnchorUnits;
-    @Input() anchorOrigin: style.IconOrigin;
-    @Input() color: [number, number, number, number];
-    @Input() crossOrigin: style.IconOrigin;
-    @Input() img: string;
-    @Input() offset: [number, number];
-    @Input() offsetOrigin: style.IconOrigin;
-    @Input() opacity: number;
-    @Input() scale: number;
-    @Input() snapToPixel: boolean;
-    @Input() rotateWithView: boolean;
-    @Input() rotation: number;
-    @Input() size: [number, number];
-    @Input() imgSize: [number, number];
-    @Input() src: string;
-
-    @Output() onChanged = new EventEmitter<any>();
-
-    constructor() { }
-
-    ngOnChanges(changes: SimpleChanges) {
-        this.onChanged.emit(this.src);
-    }
-}
-
-@Component({
-    selector: 'aol-style',
-    template: `<ng-content></ng-content>`
-})
-export class StyleComponent implements OnDestroy, AfterContentInit {
-    private _host_: FeatureComponent;
-    private childSubscription$: any;
-
-    @ContentChild(StyleIconDirective) iconStyleDirective: StyleIconDirective;
-
-    constructor( @Host() feature: FeatureComponent) {
-        console.log('instancing aol-style');
-        this._host_ = feature;
-    }
-
-    ngAfterContentInit() {
-        this.update();
-        this.childSubscription$ = this.iconStyleDirective.onChanged.subscribe((): void => {
-            this.update();
-        });
-    }
-
-    update() {
-        this._host_.setStyle(new style.Style({
-            image: new style.Icon({
-                anchor: this.iconStyleDirective.anchor,
-                anchorOrigin: this.iconStyleDirective.anchorOrigin,
-                anchorXUnits: this.iconStyleDirective.anchorXUnits,
-                anchorYUnits: this.iconStyleDirective.anchorYUnits,
-                color: this.iconStyleDirective.color,
-                crossOrigin: this.iconStyleDirective.crossOrigin,
-                img: this.iconStyleDirective.img,
-                offset: this.iconStyleDirective.offset,
-                offsetOrigin: this.iconStyleDirective.offsetOrigin,
-                opacity: this.iconStyleDirective.opacity,
-                scale: this.iconStyleDirective.scale,
-                snapToPixel: this.iconStyleDirective.snapToPixel,
-                rotateWithView: this.iconStyleDirective.rotateWithView,
-                rotation: this.iconStyleDirective.rotation,
-                size: this.iconStyleDirective.size,
-                imgSize: this.iconStyleDirective.imgSize,
-                src: this.iconStyleDirective.src
-            })
-        }));
-    }
-
-    ngOnDestroy() {
-        this.childSubscription$.unsubscribe();
-    }
-}

projects/common-aol/src/fm-aol/components/styles/icon.component.ts

@@ -1,60 +0,0 @@
-import { Component, Input, Host, OnInit, OnChanges, SimpleChanges } from '@angular/core';
-import { style } from 'openlayers';
-import { StyleComponent } from './style.component';
-
-@Component({
-  selector: 'aol-style-icon',
-  template: `<div class="aol-style-icon"></div>`,
-})
-export class StyleIconComponent implements OnInit, OnChanges {
-  public instance: style.Icon;
-
-  @Input() anchor: [number, number];
-  @Input() anchorXUnits: style.IconAnchorUnits;
-  @Input() anchorYUnits: style.IconAnchorUnits;
-  @Input() anchorOrigin: style.IconOrigin;
-  @Input() color: [number, number, number, number];
-  @Input() crossOrigin: style.IconOrigin;
-  @Input() img: string;
-  @Input() offset: [number, number];
-  @Input() offsetOrigin: style.IconOrigin;
-  @Input() opacity: number;
-  @Input() scale: number;
-  @Input() snapToPixel: boolean;
-  @Input() rotateWithView: boolean;
-  @Input() rotation: number;
-  @Input() size: [number, number];
-  @Input() imgSize: [number, number];
-  @Input() src: string;
-
-
-  constructor(@Host() private host: StyleComponent) {
-  }
-
-  ngOnInit() {
-    // console.log('creating ol.style.Icon instance with: ', this);
-    this.instance = new style.Icon(this);
-    this.host.instance.setImage(this.instance);
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    if (!this.instance) {
-      return;
-    }
-    if (changes['opacity']) {
-      this.instance.setOpacity(changes['opacity'].currentValue);
-    }
-    if (changes['rotation']) {
-      this.instance.setRotation(changes['rotation'].currentValue);
-    }
-    if (changes['scale']) {
-      this.instance.setScale(changes['scale'].currentValue);
-    }
-    if (changes['src']) {
-      this.instance = new style.Icon(this);
-      this.host.instance.setImage(this.instance);
-    }
-    this.host.update();
-    // console.log('changes detected in aol-style-icon: ', changes);
-  }
-}

projects/common-aol/src/fm-aol/components/styles/index.ts

@@ -1,6 +0,0 @@
-export * from './circle.component';
-export * from './fill.component';
-export * from './icon.component';
-export * from './stroke.component';
-export * from './style.component';
-export * from './text.component';

projects/common-aol/src/fm-aol/components/styles/style.component.ts

@@ -1,43 +0,0 @@
-import { Component, Input, Optional, OnInit } from '@angular/core';
-import { style, StyleGeometryFunction, geom } from 'openlayers';
-import { FeatureComponent } from '../feature.component';
-import { LayerVectorComponent } from '../layers';
-
-@Component({
-  selector: 'aol-style',
-  template: `<ng-content></ng-content>`
-})
-export class StyleComponent implements OnInit {
-  private host: FeatureComponent|LayerVectorComponent;
-  public instance: style.Style;
-  public componentType: string = 'style';
-
-  @Input() geometry: string | geom.Geometry | StyleGeometryFunction;
-  @Input() fill: style.Fill;
-  @Input() image: style.Image;
-  @Input() stroke: style.Stroke;
-  @Input() text: style.Text;
-  @Input() zIndex: number;
-
-  constructor(
-    @Optional() featureHost: FeatureComponent,
-    @Optional() layerHost: LayerVectorComponent
-  ) {
-    // console.log('creating aol-style');
-    this.host = !!featureHost ? featureHost : layerHost;
-    if (!this.host) {
-      throw new Error('aol-style must be applied to a feature or a layer');
-    }
-  }
-
-  update() {
-    // console.log('updating style\'s host: ', this.host);
-    this.host.instance.changed();
-  }
-
-  ngOnInit() {
-    // console.log('creating aol-style instance with: ', this);
-    this.instance = new style.Style(this);
-    this.host.instance.setStyle(this.instance);
-  }
-}

projects/common-aol/src/fm-aol/components/styles/text.component.ts

@@ -1,67 +0,0 @@
-import { Component, Input, Optional, OnInit, OnChanges, SimpleChanges } from '@angular/core';
-import { style } from 'openlayers';
-import { StyleComponent } from './style.component';
-
-@Component({
-  selector: 'aol-style-text',
-  template: `<div class="aol-style-text"></div>`,
-})
-export class StyleTextComponent implements OnInit, OnChanges {
-  public instance: style.Text;
-  public componentType: string = 'style-text';
-
-  @Input() font: string|undefined;
-  @Input() offsetX: number|undefined;
-  @Input() offsetY: number|undefined;
-  @Input() scale: number|undefined;
-  @Input() rotateWithView: boolean|undefined;
-  @Input() rotation: number|undefined;
-  @Input() text: string|undefined;
-  @Input() textAlign: string|undefined;
-  @Input() textBaseLine: string|undefined;
-
-  constructor(@Optional() private host: StyleComponent) {
-    if (!host) {
-      throw new Error('aol-style-text must be a descendant of aol-style');
-    }
-    // console.log('creating aol-style-text with: ', this);
-  }
-
-  ngOnInit() {
-    // console.log('creating ol.style.Text instance with: ', this);
-    this.instance = new style.Text(this);
-    this.host.instance.setText(this.instance);
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    if (!this.instance) {
-      return;
-    }
-    if (changes['font']) {
-      this.instance.setFont(changes['font'].currentValue);
-    }
-    if (changes['offsetX']) {
-      this.instance.setOffsetX(changes['offsetX'].currentValue);
-    }
-    if (changes['offsetY']) {
-      this.instance.setOffsetY(changes['offsetY'].currentValue);
-    }
-    if (changes['scale']) {
-      this.instance.setScale(changes['scale'].currentValue);
-    }
-    if (changes['rotation']) {
-      this.instance.setRotation(changes['rotation'].currentValue);
-    }
-    if (changes['text']) {
-      this.instance.setText(changes['text'].currentValue);
-    }
-    if (changes['textAlign']) {
-      this.instance.setTextAlign(changes['textAlign'].currentValue);
-    }
-    if (changes['textBaseLine']) {
-      this.instance.setTextBaseline(changes['textBaseLine'].currentValue);
-    }
-    this.host.update();
-    // console.log('changes detected in aol-style-text, setting new properties: ', changes);
-  }
-}

projects/common-aol/src/fm-aol/components/tilegrid.component.ts

@@ -1,33 +0,0 @@
-import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
-import { tilegrid, Extent, Size , Coordinate} from 'openlayers';
-
-@Component({
-  selector: 'aol-tilegrid',
-  template: ''
-})
-export class TileGridComponent implements OnInit, OnChanges {
-  instance: tilegrid.TileGrid;
-
-  @Input() extent: Extent;
-  @Input() maxZoom: number;
-  @Input() minZoom: number;
-  @Input() tileSize: number|Size;
-  @Input() origin?: Coordinate;
-  @Input() resolutions: number[];
-
-  ngOnInit() {
-    if (!this.resolutions) {
-      this.instance = tilegrid.createXYZ(this)
-    } else {
-      this.instance = new tilegrid.TileGrid(this);
-    }
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    if (!this.resolutions) {
-      this.instance = tilegrid.createXYZ(this)
-    } else {
-      this.instance = new tilegrid.TileGrid(this);
-    }
-  }
-}

projects/common-aol/src/fm-aol/components/tilegridwmts.component.ts

@@ -1,23 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { tilegrid, Extent, Size, Coordinate } from 'openlayers';
-import { TileGridComponent } from './tilegrid.component';
-
-@Component({
-    selector: 'aol-tilegrid-wmts',
-    template: ''
-})
-export class TileGridWMTSComponent extends TileGridComponent implements OnInit {
-    instance: tilegrid.WMTS;
-
-    @Input() origin?: Coordinate;
-    @Input() origins?: Coordinate[];
-    @Input() resolutions: number[];
-    @Input() matrixIds: string[];
-    @Input() sizes?: Size[];
-    @Input() tileSizes?: ((number | Size)[]);
-    @Input() widths?: number[];
-
-    ngOnInit() {
-        this.instance = new tilegrid.WMTS(this);
-    }
-}

projects/common-aol/src/fm-aol/components/view.component.ts

@@ -1,68 +0,0 @@
-import { Component, Input, OnInit, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
-import { View, Extent, Coordinate } from 'openlayers';
-import { MapComponent } from './map.component';
-
-@Component({
-  selector: 'aol-view',
-  template: `<ng-content></ng-content>`
-})
-export class ViewComponent implements OnInit, OnChanges, OnDestroy {
-  public instance: View;
-  public componentType: string = 'view';
-
-  @Input() constrainRotation: boolean|number;
-  @Input() enableRotation: boolean;
-  @Input() extent: Extent;
-  @Input() maxResolution: number;
-  @Input() minResolution: number;
-  @Input() maxZoom: number;
-  @Input() minZoom: number;
-  @Input() resolution: number;
-  @Input() resolutions: number[];
-  @Input() rotation: number;
-  @Input() zoom: number;
-  @Input() zoomFactor: number;
-  @Input() center: Coordinate;
-  @Input() projection: string;
-
-  @Input() zoomAnimation = false;
-
-  constructor(private host: MapComponent) {
-  }
-
-  ngOnInit() {
-    // console.log('creating ol.View instance with: ', this);
-    this.instance = new View(this);
-    this.host.instance.setView(this.instance);
-  }
-
-  ngOnChanges(changes: SimpleChanges) {
-    let properties: { [index: string]: any } = {};
-    if (!this.instance) {
-      return;
-    }
-    for (let key in changes) {
-      if (changes.hasOwnProperty(key)) {
-        switch (key) {
-          case 'zoom':
-            /** Work-around: setting the zoom via setProperties does not work. */
-            if (this.zoomAnimation) {
-              this.instance.animate({zoom: changes[key].currentValue});
-            } else {
-              this.instance.setZoom(changes[key].currentValue);
-            }
-            break;
-          default:
-            break;
-        }
-        properties[key] = changes[key].currentValue;
-      }
-    }
-    // console.log('changes detected in aol-view, setting new properties: ', properties);
-    this.instance.setProperties(properties, false);
-  }
-
-  ngOnDestroy() {
-    // console.log('removing aol-view');
-  }
-}

projects/common-aol/src/fm-aol/module-name.ts

@@ -1 +0,0 @@
-export const MODULE_NAME = "FarmMapsCommonAol";

projects/common-aol/src/public-api.ts

@@ -1,5 +0,0 @@
-/*
- * Public API Surface of common-aol
- */
-
-export * from './fm-aol/common-aol.module';

projects/common-aol/tslint.json

@@ -1,100 +0,0 @@
-{
-  "rulesDirectory": [
-    "node_modules/codelyzer"
-  ],
-  "rules": {
-    "class-name": true,
-    "comment-format": [
-      true,
-      "check-space"
-    ],
-    "curly": true,
-    "eofline": true,
-    "forin": true,
-    "indent": [
-      true,
-      "spaces"
-    ],
-    "label-position": true,
-    "max-line-length": [
-      true,
-      140
-    ],
-    "member-access": false,
-    "member-ordering": [
-      true,
-      "static-before-instance",
-      "variables-before-functions"
-    ],
-    "no-arg": true,
-    "no-bitwise": true,
-    "no-console": [
-      true,
-      "debug",
-      "info",
-      "time",
-      "timeEnd",
-      "trace"
-    ],
-    "no-construct": true,
-    "no-debugger": true,
-    "no-duplicate-variable": true,
-    "no-empty": false,
-    "no-eval": true,
-    "no-inferrable-types": true,
-    "no-shadowed-variable": true,
-    "no-string-literal": false,
-    "no-switch-case-fall-through": true,
-    "no-trailing-whitespace": true,
-    "no-use-before-declare": true,
-    "no-var-keyword": true,
-    "object-literal-sort-keys": false,
-    "one-line": [
-      true,
-      "check-open-brace",
-      "check-catch",
-      "check-else",
-      "check-whitespace"
-    ],
-    "quotemark": [
-      true,
-      "single"
-    ],
-    "radix": true,
-    "semicolon": [
-      "always"
-    ],
-    "triple-equals": [
-      true,
-      "allow-null-check"
-    ],
-    "typedef-whitespace": [
-      true,
-      {
-        "call-signature": "nospace",
-        "index-signature": "nospace",
-        "parameter": "nospace",
-        "property-declaration": "nospace",
-        "variable-declaration": "nospace"
-      }
-    ],
-    "variable-name": false,
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-operator",
-      "check-separator",
-      "check-type"
-    ],
-    "use-input-property-decorator": true,
-    "use-output-property-decorator": true,
-    "use-host-property-decorator": true,
-    "no-input-rename": true,
-    "no-output-rename": true,
-    "use-life-cycle-interface": true,
-    "use-pipe-transform-interface": true,
-    "component-class-suffix": true,
-    "directive-class-suffix": true
-  }
-}

projects/common-map/package-lock.json

@@ -1,29 +1,217 @@
 {
   "name": "@farmmaps/common-map",
-  "version": "2.1.0",
+  "version": "2.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@farmmaps/common-map",
-      "version": "2.1.0",
+      "version": "2.0.0",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/core": ">=16.0.0",
-        "@ngrx/effects": ">=16.0.0",
-        "@ngrx/router-store": ">=16.0.0",
-        "@ngrx/store": ">=16.0.0",
-        "ngrx-store-localstorage": ">=16.0.0",
-        "ol": ">=6.8.1",
-        "tassign": ">=1.0.0"
+        "@angular/core": "^18.2.3",
+        "@ngrx/effects": "^18.0.2",
+        "@ngrx/router-store": "^18.0.2",
+        "@ngrx/store": "^18.0.2",
+        "ngrx-store-localstorage": "^18",
+        "tassign": "^1.0.0"
       }
     },
+    "../../dist/libs/ng-openlayers": {
+      "version": "18.0.0",
+      "extraneous": true,
+      "license": "MPL-2.0",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "^18.2.3",
+        "@angular/core": "^18.2.3",
+        "ol": "^8.2.0"
+      }
+    },
+    "dist/ng-openlayers": {
+      "extraneous": true
+    },
+    "node_modules/@angular/common": {
+      "version": "18.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.3.tgz",
+      "integrity": "sha512-NFL4yXXImSCH7i1xnHykUjHa9vl9827fGiwSV2mnf7LjSUsyDzFD8/54dNuYN9OY8AUD+PnK0YdNro6cczVyIA==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "18.2.3",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@angular/core": {
+      "version": "18.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.3.tgz",
+      "integrity": "sha512-VGhMJxj7d0rYpqVfQrcGRB7EE/BCziotft/I/YPl6bOMPSAvMukG7DXQuJdYpNrr62ks78mlzHlZX/cdmB9Prw==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
+      },
+      "peerDependencies": {
+        "rxjs": "^6.5.3 || ^7.4.0",
+        "zone.js": "~0.14.10"
+      }
+    },
+    "node_modules/@angular/platform-browser": {
+      "version": "18.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.3.tgz",
+      "integrity": "sha512-M2ob4zN7tAcL2mx7U6KnZNqNFPFl9MlPBE0FrjQjIzAjU0wSYPIJXmaPu9aMUp9niyo+He5iX98I+URi2Yc99g==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
+      },
+      "peerDependencies": {
+        "@angular/animations": "18.2.3",
+        "@angular/common": "18.2.3",
+        "@angular/core": "18.2.3"
+      },
+      "peerDependenciesMeta": {
+        "@angular/animations": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular/router": {
+      "version": "18.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.3.tgz",
+      "integrity": "sha512-fvD9eSDIiIbeYoUokoWkXzu7/ZaxlzKPUHFqX1JuKuH5ciQDeT/d7lp4mj31Bxammhohzi3+z12THJYsCkj/iQ==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "18.2.3",
+        "@angular/core": "18.2.3",
+        "@angular/platform-browser": "18.2.3",
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@ngrx/effects": {
+      "version": "18.0.2",
+      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-18.0.2.tgz",
+      "integrity": "sha512-YojXcOD9Lsq4kl2HCjENccyUM/mOlgBdtddsg9j/ojzSUgu3ZuBVKLN3atrL2TJYkbMX1MN0RzafSkL3TPGFIA==",
+      "peer": true,
+      "dependencies": {
+        "@ngrx/operators": "18.0.1",
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "^18.0.0",
+        "@ngrx/store": "18.0.2",
+        "rxjs": "^6.5.3 || ^7.5.0"
+      }
+    },
+    "node_modules/@ngrx/operators": {
+      "version": "18.0.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/operators/-/operators-18.0.1.tgz",
+      "integrity": "sha512-M+QMrHNKgcuiLaRGZxJ4aQi5/OCRfKC4+T/63dsHyLFZ53/FFpF6a/ytSO1Q+tzOplZ5o99S+i8FVaZqNQ3LmQ==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "rxjs": "^6.5.3 || ^7.4.0"
+      }
+    },
+    "node_modules/@ngrx/router-store": {
+      "version": "18.0.2",
+      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-18.0.2.tgz",
+      "integrity": "sha512-jUrQ/uJJ53x8O1XbN2YxH2GpRREZlwS5gRxlCoc4fWL4Us/uS1/K6+QfRmKBPtpTKBIixqsOb+dIUV5iwBrivA==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "^18.0.0",
+        "@angular/core": "^18.0.0",
+        "@angular/router": "^18.0.0",
+        "@ngrx/store": "18.0.2",
+        "rxjs": "^6.5.3 || ^7.5.0"
+      }
+    },
+    "node_modules/@ngrx/store": {
+      "version": "18.0.2",
+      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-18.0.2.tgz",
+      "integrity": "sha512-ajwv0+njsO4vzArp9esnFvs1wyUb1U1W8E8LSCKrcW2hWWo9o1Pezj+JRsdQwatxHfrrPFuTDyajsl6GQM/JSA==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/core": "^18.0.0",
+        "rxjs": "^6.5.3 || ^7.5.0"
+      }
+    },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ngrx-store-localstorage": {
+      "version": "18.0.0",
+      "resolved": "https://registry.npmjs.org/ngrx-store-localstorage/-/ngrx-store-localstorage-18.0.0.tgz",
+      "integrity": "sha512-WoDePvMWiWF9LQHe+dTqbpm8lxoKCPoIvA0/1enIPTmdLQsOpdDKhMSD5YgwuqDusNfEik3QslProTFGyXZwtw==",
+      "peer": true,
+      "dependencies": {
+        "deepmerge": "^4.2.2",
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": "^18.0.1",
+        "@angular/core": "^18.0.1",
+        "@ngrx/store": "^18.0.0"
+      }
+    },
+    "node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/tassign": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/tassign/-/tassign-1.0.0.tgz",
+      "integrity": "sha512-k0Ti9f+A1R0BRdArEbiUHldd+A40kZ5qsiNSNk4czx61wkAoSZYjqkaQs0jC63AfgPdCXVPstDq2ZW5ZLRTCgw==",
+      "peer": true
+    },
     "node_modules/tslib": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
-      "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+      "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="
+    },
+    "node_modules/zone.js": {
+      "version": "0.14.10",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.10.tgz",
+      "integrity": "sha512-YGAhaO7J5ywOXW6InXNlLmfU194F8lVgu7bRntUF3TiG8Y3nBK0x1UJJuHUP/e8IyihkjCYqhCScpSwnlaSRkQ==",
+      "peer": true
     }
   }
 }

projects/common-map/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farmmaps/common-map",
-  "version": "2.1.0",
+  "version": "2.0.0",
   "publishConfig": {
     "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
   },
@@ -8,12 +8,11 @@
     "tslib": "^2.0.0"
   },
   "peerDependencies": {
-    "@angular/core": ">=16.0.0",
-    "ngrx-store-localstorage": ">=16.0.0",
-    "@ngrx/effects": ">=16.0.0",
-    "@ngrx/router-store":">=16.0.0",
-    "@ngrx/store":">=16.0.0",
-    "tassign": ">=1.0.0",
-    "ol": ">=6.8.1"
+    "@angular/core": "18.2.3",
+    "ngrx-store-localstorage": "^18.0.0",
+    "@ngrx/effects": "^18.0.2",
+    "@ngrx/router-store": "^18.0.2",
+    "@ngrx/store": "^18.0.2",
+    "tassign": "^1.0.0"
   }
 }

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

@@ -58,7 +58,7 @@ export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess'
 export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
 export const SETVIEWSTATE = '[Map] SetViewState'
 export const CLEARFEATURES = '[Map] ClearFeatures';
-
+export const SETPANELEXTRAWIDE = '[Map] SetPanelExtraWide';
 
 export class Clear implements Action {
   readonly type = CLEAR;
@@ -342,6 +342,11 @@ export class ClearFeatures implements Action {
   constructor() {}
 }
 
+export class SetPanelExtraWide implements Action {
+  readonly type = SETPANELEXTRAWIDE;
+  constructor(public panelExtraWide:boolean) {}
+}
+
 export type Actions = SetMapState
   | Init
   | Clear
@@ -389,5 +394,6 @@ export type Actions = SetMapState
   | SetPeriod
   | ToggleShowDataLayerSlide
   | SetViewState
-  | ClearFeatures;
+  | ClearFeatures
+  | SetPanelExtraWide;
 

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

@@ -1,78 +1,80 @@
-import { NgModule ,ModuleWithProviders} from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 //external modules
-import { AppCommonAolModule } from '@farmmaps/common-aol';
-import { StoreModule, ActionReducer, MetaReducer } from '@ngrx/store';
-import { EffectsModule } from '@ngrx/effects';
 import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
+import { EffectsModule } from '@ngrx/effects';
+import { ActionReducer, MetaReducer, StoreModule } from '@ngrx/store';
+import { AngularOpenlayersModule } from '@farmmaps/ng-openlayers';
 
 //common modules
 import { AppCommonModule } from '@farmmaps/common';
 
-import { MODULE_NAME } from './module-name';
-import * as mapReducers from './reducers/map.reducer';
 import * as mapActions from './actions/map.actions';
 import * as mapEffects from './effects/map.effects';
+import { MODULE_NAME } from './module-name';
+import * as mapReducers from './reducers/map.reducer';
 
-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 { IItemLayer, ItemLayer, ITemporalItemLayer, TemporalItemLayer } from './models/item.layer';
+import { IMapState } from './models/map.state';
 import { IPeriodState } from './models/period.state';
+import { ISelectedFeatures } from './models/selected.features';
 
 // components
-import { GpsLocation} from './components/aol/gps-location/gps-location.component';
-import {FeatureListFeatureCropfieldComponent } from './components/feature-list-feature-cropfield/feature-list-feature-cropfield.component';
-import { FeatureListFeatureCroppingschemeComponent} from './components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component';
-import { ItemWidgetListComponent} from './components/item-widget-list/item-widget-list.component';
-import { AbstractItemListItemComponent, ItemListItemComponent, AbstractItemWidgetComponent } from './components/item-list-item/item-list-item.component';
-import { ItemListItemContainerComponent } from './components/item-list-item-container/item-list-item-container.component';
-import { AbstractItemListComponent,ItemListComponent} from './components/item-list/item-list.component';
-import { AbstractSelectedItemComponent, SelectedItemComponent } from './components/selected-item/selected-item.component';
-import { SelectedItemCropfieldComponent } from './components/selected-item-cropfield/selected-item-cropfield.component';
-import { SelectedItemGeotiffComponent } from './components/selected-item-geotiff/selected-item-geotiff.component';
-import { SelectedItemTemporalComponent} from './components/selected-item-temporal/selected-item-temporal.component';
-import {SelectedItemShapeComponent } from './components/selected-item-shape/selected-item-shape.component';
-import { SelectedItemContainerComponent } from './components/selected-item-container/selected-item-container.component';
-import { AbstractFeatureListFeatureComponent, FeatureListFeatureComponent } from './components/feature-list-feature/feature-list-feature.component';
-import {FeatureListFeatureContainerComponent } from './components/feature-list-feature-container/feature-list-feature-container.component';
-import { FeatureListCroppingschemeComponent } from './components/feature-list-croppingscheme/feature-list-croppingscheme.component';
-import {FeatureListCropfieldComponent  } from './components/feature-list-cropfield/feature-list-cropfield.component';
-import {FeatureListContainerComponent } from './components/feature-list-container/feature-list-container.component';
-import { WidgetHostDirective} from './components/widget-host/widget-host.directive';
-import { FeatureListComponent,AbstractFeatureListComponent} from './components/feature-list/feature-list.component';
+import { MapRoutingModule } from './common-map-routing.module';
 import { FileDropTargetComponent } from './components/aol/file-drop-target/file-drop-target.component';
-import { ItemVectorSourceComponent } from './components/aol/item-vector-source/item-vector-source.component';
+import { GpsLocation } from './components/aol/gps-location/gps-location.component';
 import { ItemLayersComponent } from './components/aol/item-layers/item-layers.component';
-import { ZoomToExtentComponent } from './components/aol/zoom-to-extent/zoom-to-extent.component';
-import { RotationResetComponent } from './components/aol/rotation-reset/rotation-reset.component';
+import { ItemVectorSourceComponent } from './components/aol/item-vector-source/item-vector-source.component';
 import { LayerListComponent } from './components/aol/layer-list/layer-list.component';
+import { LayerValuesComponent } from './components/aol/layer-values/layer-values.component';
+import { LayerVectorImageComponent } from './components/aol/layer-vector-image/layer-vector-image.component';
+import { PanToLocation } from './components/aol/pan-to-location/pan-to-location.component';
+import { RotationResetComponent } from './components/aol/rotation-reset/rotation-reset.component';
+import { ZoomToExtentComponent } from './components/aol/zoom-to-extent/zoom-to-extent.component';
+import { FeatureListContainerComponent } from './components/feature-list-container/feature-list-container.component';
+import { FeatureListCropfieldComponent } from './components/feature-list-cropfield/feature-list-cropfield.component';
+import { FeatureListObservationComponent } from './components/feature-list-observation/feature-list-observation.component';
+import { FeatureListCroppingschemeComponent } from './components/feature-list-croppingscheme/feature-list-croppingscheme.component';
+import { FeatureListFeatureContainerComponent } from './components/feature-list-feature-container/feature-list-feature-container.component';
+import { FeatureListFeatureCropfieldComponent } from './components/feature-list-feature-cropfield/feature-list-feature-cropfield.component';
+import { FeatureListFeatureCroppingschemeComponent } from './components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component';
+import { FeatureListFeatureObservationComponent } from './components/feature-list-feature-observation/feature-list-feature-observation.component';
+import { AbstractFeatureListFeatureComponent, FeatureListFeatureComponent } from './components/feature-list-feature/feature-list-feature.component';
+import { AbstractFeatureListComponent, FeatureListComponent } from './components/feature-list/feature-list.component';
+import { GeometryThumbnailComponent } from './components/feature-thumbnail/feature-thumbnail.component';
+import { ForChild } from './components/for-item/for-child.decorator';
+import { ForItemType } from './components/for-item/for-itemtype.decorator';
+import { ForPackage } from './components/for-item/for-package.decorator';
+import { ForSourceTask } from './components/for-item/for-sourcetask.decorator';
+import { ifZoomToShowDirective } from './components/if-zoom-to-show/if-zoom-to-show.directive';
+import { ItemListItemContainerComponent } from './components/item-list-item-container/item-list-item-container.component';
+import { AbstractItemListItemComponent, AbstractItemWidgetComponent, ItemListItemComponent } from './components/item-list-item/item-list-item.component';
+import { AbstractItemListComponent, ItemListComponent } from './components/item-list/item-list.component';
+import { ItemWidgetListComponent } from './components/item-widget-list/item-widget-list.component';
+import { LayerSwitcher } from './components/layer-switcher/layer-switcher.component';
+import { HistogramDetailsComponent } from './components/legend/histogram-details/histogram-details.component';
+import { LegendComponent } from './components/legend/legend.component';
+import { StatisticsDetailsComponent } from './components/legend/statistics-details/statistics-details.component';
+import { MapSearchComponent } from './components/map-search/map-search.component';
+import { MapComponent } from './components/map/map.component';
 import { MetaDataModalComponent } from './components/meta-data-modal/meta-data-modal.component';
 import { SelectPeriodModalComponent } from './components/select-period-modal/select-period-modal.component';
-import { MapComponent } from './components/map/map.component';
-import { MapSearchComponent } from './components/map-search/map-search.component';
-import { MapRoutingModule } from './common-map-routing.module';
-import { LegendComponent } from './components/legend/legend.component';
-import { LayerVectorImageComponent } from './components/aol/layer-vector-image/layer-vector-image.component';
-import {FeatureIconService} from './services/feature-icon.service';
-import { GeolocationService } from './services/geolocation.service';
-import {DeviceOrientationService} from './services/device-orientation.service';
-import { TemporalService} from './services/temporal.service';
+import { SelectedItemContainerComponent } from './components/selected-item-container/selected-item-container.component';
+import { SelectedItemCropfieldComponent } from './components/selected-item-cropfield/selected-item-cropfield.component';
+import { SelectedItemGeotiffComponent } from './components/selected-item-geotiff/selected-item-geotiff.component';
+import { SelectedItemShapeComponent } from './components/selected-item-shape/selected-item-shape.component';
+import { SelectedItemTemporalComponent } from './components/selected-item-temporal/selected-item-temporal.component';
+import { AbstractSelectedItemComponent, SelectedItemComponent } from './components/selected-item/selected-item.component';
+import { WidgetHostDirective } from './components/widget-host/widget-host.directive';
 import { WidgetStatusComponent } from './components/widget-status/widget-status.component';
-import { ForChild} from './components/for-item/for-child.decorator';
-import {ForItemType } from './components/for-item/for-itemtype.decorator';
-import { ForSourceTask} from './components/for-item/for-sourcetask.decorator';
-import { ForPackage } from './components/for-item/for-package.decorator';
-import { PanToLocation} from './components/aol/pan-to-location/pan-to-location.component';
-import {LayerSwitcher} from './components/layer-switcher/layer-switcher.component';
-import {HistogramDetailsComponent} from './components/legend/histogram-details/histogram-details.component';
-import {StatisticsDetailsComponent} from './components/legend/statistics-details/statistics-details.component';
-import { ifZoomToShowDirective} from './components/if-zoom-to-show/if-zoom-to-show.directive';
-import { ZoomToShowAlert} from './components/zoom-to-show-alert/zoom-to-show-alert.component';
-import { LayerValuesComponent } from './components/aol/layer-values/layer-values.component';
-import { GeometryThumbnailComponent } from './components/feature-thumbnail/feature-thumbnail.component';
+import { ZoomToShowAlert } from './components/zoom-to-show-alert/zoom-to-show-alert.component';
+import { DeviceOrientationService } from './services/device-orientation.service';
+import { FeatureIconService } from './services/feature-icon.service';
+import { GeolocationService } from './services/geolocation.service';
+import { TemporalService } from './services/temporal.service';
 
 export function LocalStorageSync(reducer: ActionReducer<any>): ActionReducer<any> {
   const r = function(state, action) {
@@ -104,75 +106,18 @@ export function LocalStorageSync(reducer: ActionReducer<any>): ActionReducer<any
 const metaReducers: Array<MetaReducer<any, any>> = [LocalStorageSync];
 
 export {
-  mapEffects,
-  mapReducers,
-  mapActions,
-  ZoomToExtentComponent,
-  ItemVectorSourceComponent,
-  ItemLayersComponent,
-  FileDropTargetComponent,
-  MapComponent,
-  MetaDataModalComponent,
-  RotationResetComponent,
-  MapSearchComponent,
-  SelectPeriodModalComponent,
-  LayerListComponent,
-  LegendComponent,
-  LayerVectorImageComponent,
-  FeatureListComponent,
-  WidgetHostDirective,
-  FeatureListContainerComponent,
-  FeatureListCroppingschemeComponent,
-  FeatureListCropfieldComponent,
-  FeatureListFeatureContainerComponent,
-  FeatureListFeatureComponent,
-  FeatureListFeatureCroppingschemeComponent,
-  FeatureListFeatureCropfieldComponent,
-  SelectedItemContainerComponent,
-  SelectedItemComponent,
-  SelectedItemCropfieldComponent,
-  SelectedItemGeotiffComponent,
-  SelectedItemTemporalComponent,
-  SelectedItemShapeComponent,
-  ItemListItemComponent,
-  ItemListItemContainerComponent,
-  ItemListComponent,
-  ItemWidgetListComponent,
-  WidgetStatusComponent,
-  GpsLocation,
-  PanToLocation,
-  LayerSwitcher,
   AbstractFeatureListComponent,
-  AbstractFeatureListFeatureComponent,
-  AbstractSelectedItemComponent,
-  AbstractItemWidgetComponent,
-  AbstractItemListItemComponent,
-  AbstractItemListComponent,
-  FeatureIconService,
-  GeolocationService,
-  DeviceOrientationService,
-  TemporalService,
-  IMapState,
-  ISelectedFeatures,
-  IItemLayer,
-  ItemLayer,
-  IPeriodState,
-  ForChild,
-  ForItemType,
-  ForSourceTask,
-  ForPackage ,
-  ITemporalItemLayer,
-  TemporalItemLayer,
-  ifZoomToShowDirective,
-  ZoomToShowAlert,
-  IClickedFeature,
-  GeometryThumbnailComponent
-}
+  AbstractFeatureListFeatureComponent, AbstractItemListComponent, AbstractItemListItemComponent, AbstractItemWidgetComponent, AbstractSelectedItemComponent, DeviceOrientationService, FeatureIconService, FeatureListComponent, FeatureListContainerComponent, FeatureListCropfieldComponent, FeatureListObservationComponent, FeatureListCroppingschemeComponent, FeatureListFeatureComponent, FeatureListFeatureContainerComponent, FeatureListFeatureCropfieldComponent, FeatureListFeatureObservationComponent, FeatureListFeatureCroppingschemeComponent, FileDropTargetComponent, ForChild,
+  ForItemType, ForPackage, ForSourceTask, GeolocationService, GeometryThumbnailComponent, GpsLocation, IClickedFeature, ifZoomToShowDirective, IItemLayer, IMapState, IPeriodState, ISelectedFeatures, ItemLayer, ItemLayersComponent, ItemListComponent, ItemListItemComponent,
+  ItemListItemContainerComponent, ITemporalItemLayer, ItemVectorSourceComponent, ItemWidgetListComponent, LayerListComponent, LayerSwitcher, LayerVectorImageComponent, LegendComponent, mapActions, MapComponent, mapEffects,
+  mapReducers, MapSearchComponent, MetaDataModalComponent, PanToLocation, RotationResetComponent, SelectedItemComponent, SelectedItemContainerComponent, SelectedItemCropfieldComponent,
+  SelectedItemGeotiffComponent, SelectedItemShapeComponent, SelectedItemTemporalComponent, SelectPeriodModalComponent, TemporalItemLayer, TemporalService, WidgetHostDirective, WidgetStatusComponent, ZoomToExtentComponent, ZoomToShowAlert
+};
 
 @NgModule({
     imports: [
         CommonModule,
-        AppCommonAolModule,
+        AngularOpenlayersModule,
         MapRoutingModule,
         StoreModule.forFeature(MODULE_NAME, mapReducers.reducer, { metaReducers: metaReducers }),
         EffectsModule.forFeature([mapEffects.MapEffects]),
@@ -199,10 +144,12 @@ export {
         FeatureListContainerComponent,
         FeatureListCroppingschemeComponent,
         FeatureListCropfieldComponent,
+        FeatureListObservationComponent,
         FeatureListFeatureContainerComponent,
         FeatureListFeatureComponent,
         FeatureListFeatureCroppingschemeComponent,
         FeatureListFeatureCropfieldComponent,
+        FeatureListFeatureObservationComponent,
         SelectedItemContainerComponent,
         SelectedItemComponent,
         SelectedItemCropfieldComponent,
@@ -235,6 +182,7 @@ export {
         LayerSwitcher,
         FeatureListFeatureComponent,
         FeatureListFeatureCropfieldComponent,
+        FeatureListFeatureObservationComponent,
         FeatureListFeatureCroppingschemeComponent,
         SelectedItemContainerComponent,
         SelectedItemComponent,
@@ -258,6 +206,7 @@ export {
         FeatureListContainerComponent,
         FeatureListCroppingschemeComponent,
         FeatureListCropfieldComponent,
+        FeatureListObservationComponent,
         FeatureListFeatureContainerComponent,
         ZoomToExtentComponent,
         ifZoomToShowDirective,
@@ -271,9 +220,11 @@ export {
         TemporalService,
         { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
         { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
+        { provide: AbstractFeatureListComponent, useClass: FeatureListObservationComponent, multi: true },        
         { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
         { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
         { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
+        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureObservationComponent, multi: true },        
         { provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
         { provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
         { provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },

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

@@ -1,5 +1,5 @@
 import { Component, Input, OnDestroy, OnInit, EventEmitter, Output, Inject } from '@angular/core';
-import { MapComponent } from 'ngx-openlayers';
+import { MapComponent } from '@farmmaps/ng-openlayers';
 
 import * as proj  from 'ol/proj';
 import {Point,Geometry} from 'ol/geom';

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

@@ -33,7 +33,7 @@
 }
 
 .stop2 {
-  stop-color: var(--bs-primary);
+  stop-color:var(--bs-primary);
   stop-opacity: 0;
 }
 

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

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, ViewChild, ElementRef, OnChanges, SimpleChanges ,Host} from '@angular/core';
-import { MapComponent } from 'ngx-openlayers';
+import { MapComponent } from '@farmmaps/ng-openlayers';
 import  Overlay  from 'ol/Overlay';
 import { fromLonLat, toLonLat } from 'ol/proj';
 

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

@@ -1,5 +1,5 @@
 import { Component, Host, Input, Output, EventEmitter,OnDestroy, OnInit, OnChanges, SimpleChanges, forwardRef } from '@angular/core';
-import { LayerGroupComponent, MapComponent } from 'ngx-openlayers';
+import { LayerGroupComponent, MapComponent } from '@farmmaps/ng-openlayers';
 import { ItemService,IItem,AppConfig } from '@farmmaps/common';
 import { IItemLayer, ITemporalItemLayer} from '../../../models/item.layer';
 import { ILayerData} from '../../../models/layer.data';
@@ -19,6 +19,7 @@ import VectorTileLayer from 'ol/layer/VectorTile';
 import {GeoJSON,MVT} from 'ol/format';
 import { Geometry } from 'ol/geom';
 import BaseLayer from 'ol/layer/Base';
+import Feature from 'ol/Feature';
 
 @Component({
   selector: 'fm-map-item-layers',
@@ -180,9 +181,9 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
       const source = new VectorSource({
         strategy: loadingstrategy.bbox,
         loader: function (extent: Extent, resolution: number, projection: Projection) {
-          const source = this as VectorSource<Geometry>;
+          const source = this as VectorSource<Feature<Geometry>>;
           __this.itemService.getItemFeatures(item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) {
-            const features = format.readFeatures(data);
+            const features = format.readFeatures(data).filter(feature => feature instanceof Feature) as Feature[];
             for (const f of features) {
               if (f.get("code")) {
                 f.setId(f.get("code"));

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

@@ -1,5 +1,5 @@
 import { Component, Host, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges, forwardRef, Inject, InjectionToken, OnDestroy, LOCALE_ID } from '@angular/core';
-import { LayerVectorComponent, SourceVectorComponent, MapComponent } from 'ngx-openlayers';
+import { LayerVectorComponent, SourceVectorComponent, MapComponent } from '@farmmaps/ng-openlayers';
 import { ItemService, ItemTypeService, IItem, IItemType, FolderService } from '@farmmaps/common';
 
 import { Feature } from 'ol';
@@ -29,7 +29,7 @@ import { formatNumber } from '@angular/common';
   ]
 })
 export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnDestroy, OnChanges {
-  instance: Vector<Geometry>;
+  instance: Vector<Feature<Geometry>>;
   private _format: GeoJSON;
   private _select: Select;
   private _hoverSelect: Select;
@@ -83,6 +83,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
   ngOnInit() {
     this.sub = this.folderService.getFolder('my_settings').subscribe(
       userSettingsRoot => {
+        if (userSettingsRoot == undefined) return;
         this.itemService.getChildItemList(userSettingsRoot.code, 'vnd.farmmaps.itemtype.settings.general').subscribe(
           items => {
             if (items && items.length > 0 && items[0].data?.displayMapFeatureSettings) {

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

@@ -3,7 +3,7 @@ import { IItemLayer } from '../../../models/item.layer';
 import { Store } from '@ngrx/store';
 import * as mapReducers from '../../../reducers/map.reducer';
 import * as mapActions from '../../../actions/map.actions';
-import { MapComponent } from 'ngx-openlayers';
+import { MapComponent } from '@farmmaps/ng-openlayers';
 import { ILayervalue } from '../../../models/layer.value';
 import { Observable, interval, Subject } from 'rxjs';
 import { debounce, throttle } from 'rxjs/operators';

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

@@ -1,8 +1,9 @@
 import { Component, OnDestroy, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
-import { LayerVectorComponent, MapComponent } from 'ngx-openlayers';
+import { LayerVectorComponent, MapComponent } from '@farmmaps/ng-openlayers';
 import  RenderType  from 'ol/layer/Vector';
 import { Vector as VectorSource } from 'ol/source';
 import { Geometry } from 'ol/geom';
+import Feature from 'ol/Feature';
 
 @Component({
   selector: 'fm-map-aol-layer-vector-image',
@@ -14,7 +15,7 @@ export class LayerVectorImageComponent extends LayerVectorComponent implements O
   //public source: Vector;
 
   @Input()
-  renderMode: RenderType<VectorSource<Geometry>> | string = "image";  
+  renderMode: RenderType<VectorSource<Feature<Geometry>>> | string = "image";  
 
   constructor(map: MapComponent) {
     super(map);

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

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, Host, OnChanges, SimpleChanges,ChangeDetectorRef } from '@angular/core';
-import { MapComponent } from 'ngx-openlayers';
+import { MapComponent } from '@farmmaps/ng-openlayers';
 import {IMapState} from '../../../models/map.state'
 import {View} from 'ol';
 import { fromLonLat } from 'ol/proj';

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

@@ -11,7 +11,7 @@
 
 #north {
   display: none;
-  fill: var(--bs-black);
+  fill:var(--bs-black);
 }
 
 #top-l {
@@ -31,23 +31,23 @@
 }
 
 div.compass:hover #top-l {
-  fill: var(--bs-white);
+  fill:var(--bs-white);
 }
 
 div.compass:hover #top-r {
-  fill: var(--bs-gray-300);
+  fill:var(--bs-gray-300);
 }
 
 div.compass:hover #bottom-l {
-  fill: var(--bs-gray-300);
+  fill:var(--bs-gray-300);
 }
 
 div.compass:hover #bottom-r {
-  fill: var(--bs-white);
+  fill:var(--bs-white);
 }
 
 div.compass:hover #north {
-  fill: var(--bs-white);
+  fill:var(--bs-white);
 }
 
 .compass-n {    

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

@@ -1,5 +1,5 @@
 import { Component, Host, Input, OnInit, ChangeDetectorRef  } from '@angular/core';
-import { ViewComponent, MapComponent } from 'ngx-openlayers';
+import { ViewComponent, MapComponent } from '@farmmaps/ng-openlayers';
 
 import {View} from 'ol';
 

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

@@ -1,6 +1,6 @@
 import { Component, Host, Input, OnInit, OnChanges, SimpleChanges, forwardRef } from '@angular/core';
 import { ActivatedRoute  } from '@angular/router';
-import { ViewComponent, MapComponent } from 'ngx-openlayers';
+import { ViewComponent, MapComponent } from '@farmmaps/ng-openlayers';
 
  
 @Component({

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

@@ -0,0 +1,10 @@
+<div *ngIf="feature;let feature">
+  <div class="row m-0">
+    <div class="col-3 m-0 p-2 thumbnail">
+      <img [src]="getSource(feature)" style="width: 34px">
+    </div>
+    <div class="col p-2" style="margin: auto;">
+      <h1 class="card-title" title="{{feature.get('name')}}">{{feature.get('name')}}</h1>
+    </div>  
+  </div>
+</div>

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

@@ -0,0 +1,22 @@
+.card-title {
+  font-size: 1rem;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.card-text {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.col {
+  overflow: hidden;
+}
+
+.thumbnail {
+  width: 4em;
+  height: 4em;
+}
+

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

@@ -0,0 +1,29 @@
+import { Component, Injectable } from '@angular/core';
+import { AppConfig, commonReducers, ItemTypeService } from '@farmmaps/common';
+import { Store } from '@ngrx/store';
+import { Feature } from 'ol';
+import { Geometry } from 'ol/geom';
+import * as mapReducers from '../../reducers/map.reducer';
+import { AbstractFeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component';
+import { ForItemType } from '../for-item/for-itemtype.decorator';
+
+@ForItemType("vnd.farmmaps.itemtype.observation")
+@Injectable()
+@Component({
+  selector: 'fm-map-feature-list-feature-observation',
+  templateUrl: './feature-list-feature-observation.component.html',
+  styleUrls: ['./feature-list-feature-observation.component.scss']
+})
+export class FeatureListFeatureObservationComponent extends AbstractFeatureListFeatureComponent {
+
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService,config:AppConfig) {
+    super(store, itemTypeService,config);
+  }
+
+  getSource(feature: Feature<Geometry>): string {
+    let source = "/images/decease.png";
+    var type = feature.get('type');
+    source = '/images/' + type + '.png';
+    return source;
+  }
+}

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

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

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

@@ -0,0 +1,20 @@
+fm-map-feature-list-feature-container {
+  width:100%;
+  pointer-events:none;
+}
+
+.row {
+  border-bottom: 1px solid var(--bs-gray-500);
+  user-select: none;
+  padding-left:1.5rem;
+}
+
+.row.selected {
+  background-color: var(--bs-gray-100);
+}
+
+.cropfields {
+  border-top: 1px solid var(--bs-gray-500);
+  margin-left: -1.25rem;
+  margin-right: -1.25rem;
+}

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

@@ -0,0 +1,30 @@
+import { Component, Injectable,AfterViewInit, OnInit,SimpleChanges, ChangeDetectorRef} from '@angular/core';
+import { Location } from '@angular/common';
+import { AbstractFeatureListComponent } from '../feature-list/feature-list.component';
+import {ForItemType } from '../for-item/for-itemtype.decorator';
+import {ForChild } from '../for-item/for-child.decorator';
+import { Store } from '@ngrx/store';
+import * as mapReducers from '../../reducers/map.reducer';
+import { commonReducers, ItemTypeService, IItem,ItemService } from '@farmmaps/common';
+import { Observable } from 'rxjs';
+
+@ForChild()
+@ForItemType("vnd.farmmaps.itemtype.observation")
+@Injectable()
+@Component({
+  selector: 'fm-map-feature-list-observation',
+    templateUrl: './feature-list-observation.component.html',
+    styleUrls: ['./feature-list-observation.component.scss']
+})
+export class FeatureListObservationComponent extends AbstractFeatureListComponent implements OnInit {
+
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, private itemService: ItemService) {
+    super(store, itemTypeService,location);
+  }
+
+  public schemeItem: Observable<IItem>
+
+  ngOnInit() {
+    this.schemeItem = this.itemService.getItem(this.queryState.parentCode);
+  } 
+}

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

@@ -1,7 +1,7 @@
 import { Directive, ViewContainerRef,TemplateRef,OnInit,Input, OnChanges } from '@angular/core';
 import { Layer } from 'ol/layer';
 import { Source } from 'ol/source';
-import { MapComponent } from 'ngx-openlayers';
+import { MapComponent } from '@farmmaps/ng-openlayers';
 
 @Directive({
   selector: '[fmMapIfZoomToShow]',

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

@@ -10,7 +10,7 @@
         <li class="nav-item py-0">
           <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Base maps</span></span>
           <div  class="mb-4">
-            <fm-map-layer-list [baseLayers]="true" [itemLayers]="baseLayers|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
+            <fm-map-layer-list [baseLayers]="true" [itemLayers]="baseMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
           </div>
         </li>
         <li class="nav-item py-0">
@@ -20,12 +20,17 @@
           </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 class="slideButton"><a href="#" title="Compare" class="btn btn-light btn-sm" (click)="handleToggleShowDatalayerSlide($event)"><i class="fal fa-sliders-h-square"></i></a></span></span>
+          <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Overlay slider</span><span class="slideButton"><a href="#" title="Compare" class="btn btn-light btn-sm" (click)="handleToggleShowDatalayerSlide($event)"><i class="fal fa-sliders-h-square"></i></a></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>
-
+        <li class="nav-item py-0">
+          <span><i class="fal fa-layer-group" aria-hidden="true"></i>&nbsp;<span i18n>Aerial photos</span></span>
+          <div  class="mb-4">
+            <fm-map-layer-list [baseLayers]="true" [itemLayers]="aerialMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
+          </div>
+        </li>
       </ul>
   </div>
   </div>

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

@@ -21,7 +21,7 @@
 }
 
 .layers {
-  color: var(--bs-secondary);
+  color:var(--bs-secondary);
   position: absolute;
   overflow: hidden;
   bottom: -1em;

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

@@ -4,7 +4,7 @@ import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
 import * as mapActions from '../../actions/map.actions';
 import {createEmpty,extend } from 'ol/extent';
-import { Observable } from 'rxjs';
+import { filter, map, Observable } from 'rxjs';
 
 @Component({
   selector: 'fm-map-layer-switcher',
@@ -17,7 +17,8 @@ export class LayerSwitcher  implements OnInit,OnChanges{
   public overlayLayers: Observable<Array<IItemLayer>>;
   public selectedOverlayLayer: Observable<IItemLayer>;
   public selectedItemLayer$: Observable<IItemLayer>;
-  public baseLayers: Observable<Array<IItemLayer>>;
+  public baseMaps: Observable<Array<IItemLayer>>;
+  public aerialMaps: Observable<Array<IItemLayer>>;
   public selectedBaseLayer: Observable<IItemLayer>;
 
   constructor( private store: Store<mapReducers.State>) {
@@ -26,7 +27,8 @@ export class LayerSwitcher  implements OnInit,OnChanges{
   ngOnInit() { 
     this.overlayLayers = this.store.select(mapReducers.selectGetOverlayLayers);
     this.selectedOverlayLayer = this.store.select(mapReducers.selectGetSelectedOverlayLayer);
-    this.baseLayers = this.store.select(mapReducers.selectGetBaseLayers);
+    this.baseMaps = this.store.select(mapReducers.selectGetBaseMaps);
+    this.aerialMaps = this.store.select(mapReducers.selectGetArealMaps);
     this.selectedBaseLayer = this.store.select(mapReducers.selectGetSelectedBaseLayer);
     this.selectedItemLayer$ = this.store.select(mapReducers.selectGetSelectedItemLayer)
     this.showLayerSwitcher = this.store.select(mapReducers.selectGetShowLayerSwitcher);
@@ -83,3 +85,4 @@ export class LayerSwitcher  implements OnInit,OnChanges{
     event.preventDefault();
   }
 }
+ 

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

@@ -10,6 +10,7 @@
   panelVisible:panelVisible$|async,
   openedModalName:openedModalName$|async,
   panelCollapsed:panelCollapsed$|async,
+  panelExtraWide:panelExtraWide$|async,
   searchMinified:searchMinified$|async,
   selectedItem:selectedItem$|async,
   parentItem:parentItem$|async,
@@ -64,7 +65,7 @@
     </div>
     <div class="side-panel-container">
       
-      <fm-side-panel [resizeable]="true" (onResize)="handlePanelResize($event)" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false">
+      <fm-side-panel [resizeable]="true" (onResize)="handlePanelResize($event)" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false" [extrawide]="state.panelExtraWide">
         <div class="panel-wrapper" *ngIf="noContent">
           <div class="panel-top bg-secondary" *ngIf="!(state.searchMinified)">
           </div>
@@ -84,7 +85,7 @@
           </div>
         </div>  
       </fm-side-panel>
-      <fm-side-panel [resizeable]="true" [visible]="!noContent">
+      <fm-side-panel [resizeable]="true" [visible]="!noContent" [extrawide]="state.panelExtraWide">
         <router-outlet (activate)="handleSidepaneloutletActivate($event)" (deactivate)="handleSidepaneloutletDeactivate($event)"></router-outlet>
       </fm-side-panel>
     </div>   

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

@@ -52,11 +52,20 @@ aol-map { position:absolute;width:100%;height:calc( 100vh );}
   pointer-events: none;
 }
 
-
-.control-container {
-  float:right;
+@media screen and (max-width: 768px) {
+  .control-container {
+    margin-left: 1em;
     margin-right: 1em;
     pointer-events: all;
+  }
+}
+
+@media screen and (min-width: 768px) {
+  .control-container {    
+    float: right;
+    margin-right: 1em;
+    pointer-events: all;
+  }
 }
 
 .fullscreen .viewport-container {

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

@@ -1,39 +1,39 @@
-import { Component, OnInit, OnDestroy, HostListener, ViewChild, AfterViewInit,NgZone,ElementRef } from '@angular/core';
+import { Component, OnInit, OnDestroy, HostListener, ViewChild, AfterViewInit, NgZone, ElementRef } from '@angular/core';
 import { Location } from '@angular/common';
-import { Observable, Subject, Subscription, from,of ,EMPTY } from 'rxjs';
-import { withLatestFrom, switchMap,skip  } from 'rxjs/operators';
+import { Observable, Subject, Subscription, from, of, EMPTY } from 'rxjs';
+import { withLatestFrom, switchMap, skip } from 'rxjs/operators';
 import { Router, ActivatedRoute, ParamMap } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { DeviceService } from '@farmmaps/common';
-import {getRenderPixel} from 'ol/render';
+import { getRenderPixel } from 'ol/render';
 
 // Map
 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 { 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';
 import { IListItem, IQueryState } from '@farmmaps/common';
 import { IPeriodState } from '../../models/period.state';
-import {IStyles} from '../../models/style.cache';
+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 { GeolocationService } from '../../services/geolocation.service';
 import { GeolocatorService } from '@farmmaps/common';
-import {DeviceOrientationService} from '../../services/device-orientation.service';
+import { DeviceOrientationService } from '../../services/device-orientation.service';
 
 // AppCommon
 import { ResumableFileUploadService, ItemTypeService } from '@farmmaps/common';
 import { IItemType, IItem } from '@farmmaps/common';
-import {commonReducers} from '@farmmaps/common';
-import {commonActions} from '@farmmaps/common';
+import { 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 { 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';
 import * as style from 'ol/style';
 
@@ -44,7 +44,7 @@ import * as style from 'ol/style';
   styleUrls: ['./map.component.scss']
 })
 
-export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
+export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
   title = 'Map';
   public openedModalName$: Observable<string> = this.store.select(commonReducers.selectOpenedModalName);
   public itemTypes$: Observable<{ [id: string]: IItemType }>;
@@ -63,15 +63,16 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   private stateSub: Subscription;
   private queryStateSub: Subscription;
   private querySub: Subscription;
-  public parentCode$: Observable<string> =this.store.select(mapReducers.selectGetParentCode);
+  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 panelExtraWide$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelExtraWide);
   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 parentItem$: Observable<IItem> = this.store.select(mapReducers.selectGetParentItem);
   public queryState$: Observable<IQueryState> = this.store.select(mapReducers.selectGetQueryState);
-  public state$:Observable<{mapState:IMapState,queryState:IQueryState}> = this.store.select(mapReducers.selectGetState);
+  public state$: Observable<{ mapState: IMapState, queryState: IQueryState }> = this.store.select(mapReducers.selectGetState);
   public period$: Observable<IPeriodState> = this.store.select(mapReducers.selectGetPeriod);
   public clearEnabled$: Observable<boolean> = this.store.select(mapReducers.selectGetClearEnabled);
   public searchCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetSearchCollapsed);
@@ -84,13 +85,15 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   public baseLayersCollapsed = true;
   public overlayLayersCollapsed = true;
   public extent$: Observable<Extent> = this.store.select(mapReducers.selectGetExtent);
-  public styles$:Observable<IStyles> = this.store.select(mapReducers.selectGetStyles);
+  public styles$: Observable<IStyles> = this.store.select(mapReducers.selectGetStyles);
   public fullscreen$: Observable<boolean> = this.store.select(commonReducers.selectGetFullScreen);
   private lastUrl = "";
   private initialized = false;
   public noContent = false;
   public overrideSelectedItemLayer = false;
   public overrideOverlayLayers = false;
+  public hideShowLayerValues = false;
+  public const
   public dataLayerSlideValue = 50;
   public dataLayerSlideEnabled = false;
   private visibleAreaBottom = 0;
@@ -109,20 +112,21 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     private geolocationService: GeolocationService,
     private geolocaterService: GeolocatorService,
     private zone: NgZone,
-    private deviceorientationService:DeviceOrientationService,
-    public devicesService:DeviceService) {
-      if(route && route.snapshot && route.snapshot.data && route.snapshot.data["fm-map-map"]) {
+    private deviceorientationService: DeviceOrientationService,
+    public devicesService: DeviceService) {
+    if (route && route.snapshot && route.snapshot.data && route.snapshot.data["fm-map-map"]) {
       const params = route.snapshot.data["fm-map-map"];
       this.overrideSelectedItemLayer = params["overrideSelectedItemlayer"] ? params["overrideSelectedItemlayer"] : false;
       this.overrideOverlayLayers = params["overrideOverlayLayers"] ? params["overrideOverlayLayers"] : false;
+      this.hideShowLayerValues = params["hideShowLayerValues"] ? params["hideShowLayerValues"] : false;
     }
-      this.querySub = this.query$.pipe(skip(1), withLatestFrom(this.mapState$)).subscribe(([query,mapState]) =>{
-        if(query && query.querystate) {
+    this.querySub = this.query$.pipe(skip(1), withLatestFrom(this.mapState$)).subscribe(([query, mapState]) => {
+      if (query && query.querystate) {
         let newQueryState = tassign(mapReducers.initialQueryState);
         //console.debug(`Do Query`);
-          const urlparts=[];
+        const urlparts = [];
         if (query.querystate.itemCode && query.querystate.itemCode != "") {
-            if(query.querystate.itemType && query.querystate.itemType!= "") {
+          if (query.querystate.itemType && query.querystate.itemType != "") {
             const itemType = this.itemTypeService.itemTypes[query.querystate.itemType];
             if (itemType && itemType.viewer && itemType.viewer == "edit_in_editor" && itemType.editor) {
               urlparts.push('/editor');
@@ -132,12 +136,12 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
             }
           }
         } else {
-            newQueryState= query.querystate;
+          newQueryState = query.querystate;
         }
-          if(urlparts.length==0 ) {
+        if (urlparts.length == 0) {
           newQueryState.itemCode = query.querystate.itemCode;
           this.zone.run(() => {
-              this.replaceUrl(mapState,newQueryState,query.replace);             
+            this.replaceUrl(mapState, newQueryState, query.replace);
           })
         } else {
           this.router.navigate(urlparts);
@@ -160,19 +164,19 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     }
   }
 
-  handlePanelResize(resizeTop:number) {
-    if(resizeTop==100 || !this.devicesService.IsMobile() ) {
-      this.visibleAreaBottom=0;
+  handlePanelResize(resizeTop: number) {
+    if (resizeTop == 100 || !this.devicesService.IsMobile()) {
+      this.visibleAreaBottom = 0;
     } else {
-      this.visibleAreaBottom=100-resizeTop;
-      if(this.visibleAreaBottom>60) {
-        this.visibleAreaBottom=60;
+      this.visibleAreaBottom = 100 - resizeTop;
+      if (this.visibleAreaBottom > 60) {
+        this.visibleAreaBottom = 60;
       }
     }
   }
 
-  bottom(panelVisible:boolean) {
-    if(panelVisible) {
+  bottom(panelVisible: boolean) {
+    if (panelVisible) {
       return this.visibleAreaBottom + '%';
     } else {
       return "0%";
@@ -188,7 +192,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   }
 
   handleFileDropped(droppedFile: IDroppedFile) {
-    this.uploadService.addFiles(droppedFile.files, droppedFile.event, { parentCode:droppedFile.parentCode, geometry:droppedFile.geometry });
+    this.uploadService.addFiles(droppedFile.files, droppedFile.event, { parentCode: droppedFile.parentCode, geometry: droppedFile.geometry });
   }
 
   handleFeatureClick(feature: Feature<Geometry>) {
@@ -204,20 +208,26 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     this.store.dispatch(new mapActions.DoQuery(queryState));
   }
 
-  handleSidepaneloutletActivate(component:any) {
-   if(component && component.hasOwnProperty('clickedFeature')) {
+  handleSidepaneloutletActivate(component: any) {
+    if (component && component.hasOwnProperty('clickedFeature')) {
       (component as IClickedFeature).clickedFeature = this.clickedFeature;
     }
+    if (component && component.hasOwnProperty('extrawide')) {
+      this.store.dispatch(new mapActions.SetPanelExtraWide(true));
+    }
   }
 
-  handleSidepaneloutletDeactivate(component:any) {
-    if(component && component.hasOwnProperty('clickedFeature')) {
+  handleSidepaneloutletDeactivate(component: any) {
+    if (component && component.hasOwnProperty('clickedFeature')) {
       (component as IClickedFeature).clickedFeature = null;
     }
+    if (component && component.hasOwnProperty('extrawide')) {
+      this.store.dispatch(new mapActions.SetPanelExtraWide(false));
+    }
   }
 
-  handlePrerender(event:any) {
-    if(!this.dataLayerSlideEnabled) return;
+  handlePrerender(event: any) {
+    if (!this.dataLayerSlideEnabled) return;
     const ctx = event.context;
     const mapSize = this.map.instance.getSize();
     const width = mapSize[0] * (this.dataLayerSlideValue / 100);
@@ -236,7 +246,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     ctx.clip();
   }
 
-  handleSlideChange(event:any) {
+  handleSlideChange(event: any) {
     this.dataLayerSlideValue = event.target.value;
     this.map.instance.render();
   }
@@ -245,63 +255,65 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     this.initialized = false;
     //console.debug("Init");
     this.store.dispatch(new mapActions.Clear());
-    this.selectedFeatures$.next({x:0,y:0,features:[]});
+    this.selectedFeatures$.next({ x: 0, y: 0, features: [] });
     this.selectedFeatures$.next(null);
   }
 
   initCustomStyles() {
-    this.store.dispatch(new mapActions.SetStyle('vnd.farmmaps.itemtype.layer',new style.Style({
+    this.store.dispatch(new mapActions.SetStyle('vnd.farmmaps.itemtype.layer', new style.Style({
       stroke: new style.Stroke({
         color: 'red',
-        lineDash: [ 5,5],
+        lineDash: [5, 5],
         width: 1
       }),
-      geometry:(feature) =>feature.getGeometry()
+      geometry: (feature) => feature.getGeometry()
     })));
-    this.store.dispatch(new mapActions.SetStyle('vnd.farmmaps.itemtype.layer_selected',new style.Style({
+    this.store.dispatch(new mapActions.SetStyle('vnd.farmmaps.itemtype.layer_selected', new style.Style({
       stroke: new style.Stroke({
         color: 'red',
-        lineDash: [ 5,5],
+        lineDash: [5, 5],
         width: 3
       }),
-      geometry:(feature) =>feature.getGeometry()
+      geometry: (feature) => feature.getGeometry()
     })));
   }
 
-  round(value:number,decimals:number):number {
+  round(value: number, decimals: number): number {
     const d = Math.pow(10, decimals);
-    return Math.round((value + Number.EPSILON)*d)/d;
+    return Math.round((value + Number.EPSILON) * d) / d;
   }
 
-  getMapStateFromUrl(params:ParamMap):IMapState {
+  getMapStateFromUrl(params: ParamMap): IMapState {
     const hasUrlmapState = params.has("xCenter") && params.has("yCenter");
     if (hasUrlmapState) {
       const xCenter = parseFloat(params.get("xCenter"));
       const yCenter = parseFloat(params.get("yCenter"));
       const zoom = parseFloat(params.get("zoom"));
       const rotation = parseFloat(params.get("rotation"));
-      const baseLayer = params.get("baseLayer")?params.get("baseLayer"):"";
-      const newMapState = {zoom: zoom, rotation: rotation, xCenter: xCenter, yCenter: yCenter, baseLayerCode: baseLayer };
+      const baseLayer = params.get("baseLayer") ? params.get("baseLayer") : "";
+      const newMapState = { zoom: zoom, rotation: rotation, xCenter: xCenter, yCenter: yCenter, baseLayerCode: baseLayer };
       return newMapState;
     } else {
       return null;
     }
   }
 
-  normalizeMapState(mapState:IMapState):IMapState {
-    if(!mapState) return null;
-    return {zoom: this.round(mapState.zoom,0),
-      rotation: this.round(mapState.rotation,2),
-      xCenter: this.round(mapState.xCenter,5),
-      yCenter: this.round(mapState.yCenter,5),
-      baseLayerCode: mapState.baseLayerCode };
+  normalizeMapState(mapState: IMapState): IMapState {
+    if (!mapState) return null;
+    return {
+      zoom: this.round(mapState.zoom, 0),
+      rotation: this.round(mapState.rotation, 2),
+      xCenter: this.round(mapState.xCenter, 5),
+      yCenter: this.round(mapState.yCenter, 5),
+      baseLayerCode: mapState.baseLayerCode
+    };
   }
 
-  serializeMapState(mapState:IMapState):string {
+  serializeMapState(mapState: IMapState): string {
     return JSON.stringify(this.normalizeMapState(mapState));
   }
 
-  getQueryStateFromUrl(params:ParamMap):IQueryState {
+  getQueryStateFromUrl(params: ParamMap): IQueryState {
     if (params.has("queryState")) {
       const queryState = params.get("queryState");
       let newQueryState = tassign(mapReducers.initialQueryState);
@@ -316,10 +328,10 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
 
   ngAfterViewInit() {
     //console.debug("View init");
-    this.noContent=true;
+    this.noContent = true;
     this.route.children.forEach((entry) => {
-      if(entry.outlet=="primary") {
-        this.noContent=false;
+      if (entry.outlet == "primary") {
+        this.noContent = false;
       }
     });
 
@@ -329,25 +341,25 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
 
     const urlMapState = this.getMapStateFromUrl(this.route.snapshot.paramMap);
     const urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap);
-      if(urlQueryState && urlMapState && this.noContent) {
-        this.store.dispatch(new mapActions.SetState(urlMapState,urlQueryState));
-        window.localStorage.setItem("FarmMapsCommonMap_mapState",this.serializeMapState(urlMapState));
-      } else if(urlQueryState && this.noContent) {
+    if (urlQueryState && urlMapState && this.noContent) {
+      this.store.dispatch(new mapActions.SetState(urlMapState, urlQueryState));
+      window.localStorage.setItem("FarmMapsCommonMap_mapState", this.serializeMapState(urlMapState));
+    } else if (urlQueryState && this.noContent) {
       this.store.dispatch(new mapActions.SetQueryState(urlQueryState));
     } else {
       this.store.dispatch(new mapActions.SetReplaceUrl(true));
     }
 
-      this.paramSub = this.route.paramMap.pipe(withLatestFrom(this.state$),switchMap(([params,state]) => {
-         if(this.initialized && this.noContent) {
+    this.paramSub = this.route.paramMap.pipe(withLatestFrom(this.state$), switchMap(([params, state]) => {
+      if (this.initialized && this.noContent) {
         const urlQueryState = this.getQueryStateFromUrl(params);
-          if( this.serializeService.serialize(state.queryState) != this.serializeService.serialize(urlQueryState)) {
-            return of(new mapActions.SetState(state.mapState,urlQueryState));
+        if (this.serializeService.serialize(state.queryState) != this.serializeService.serialize(urlQueryState)) {
+          return of(new mapActions.SetState(state.mapState, urlQueryState));
         }
       }
       return EMPTY;
     })).subscribe((action) => {
-        if(action) {
+      if (action) {
         this.zone.run(() => {
           //console.debug("Url to state");
           this.store.dispatch(action);
@@ -359,22 +371,22 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
 
     this.stateSub = this.state$.pipe(switchMap((state) => {
       const newUrl = this.serializeMapState(state.mapState) + "_" + this.serializeService.serialize(state.queryState);
-      if(this.lastUrl!=newUrl) {
-        this.lastUrl=newUrl;
+      if (this.lastUrl != newUrl) {
+        this.lastUrl = newUrl;
         return of(state);
       }
       else {
         return of(null);
       }
     })).subscribe((newUrlState: any) => {
-        if(newUrlState) {
+      if (newUrlState) {
         //console.debug(`State to url`);
-          this.replaceUrl(newUrlState.mapState,newUrlState.queryState,newUrlState.replaceUrl);
+        this.replaceUrl(newUrlState.mapState, newUrlState.queryState, newUrlState.replaceUrl);
       }
     });
     this.initialized = true;
     this.showDataLayerSlide$.subscribe((v) => {
-      this.dataLayerSlideEnabled=v;
+      this.dataLayerSlideEnabled = v;
       this.map.instance.render();
     });
     this.store.select(mapReducers.selectGetViewEnabled).subscribe((v) => {
@@ -394,7 +406,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     this.store.dispatch(new commonActions.ToggleMenu());
   }
 
-  handleToggleBaseLayers(event:MouseEvent) {
+  handleToggleBaseLayers(event: MouseEvent) {
     this.baseLayersCollapsed = !this.baseLayersCollapsed;
     event.preventDefault();
   }
@@ -411,30 +423,30 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   }
 
   replaceUrl(mapState: IMapState, queryState: IQueryState, replace = true) {
-      if(this.noContent) {
+    if (this.noContent) {
       const newMapState = this.serializeMapState(mapState);
       const newQueryState = this.serializeService.serialize(queryState);
       const currentMapState = this.serializeMapState(this.getMapStateFromUrl(this.route.snapshot.paramMap));
       const urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap);
-        const currentQueryState = urlQueryState==null?"":this.serializeService.serialize(urlQueryState);
-        if(mapState.baseLayerCode!="" && ((newMapState!= currentMapState)  || (newQueryState!=currentQueryState))) {
-          const parts =["."];
+      const currentQueryState = urlQueryState == null ? "" : this.serializeService.serialize(urlQueryState);
+      if (mapState.baseLayerCode != "" && ((newMapState != currentMapState) || (newQueryState != currentQueryState))) {
+        const parts = ["."];
         parts.push(mapState.xCenter.toFixed(5));
         parts.push(mapState.yCenter.toFixed(5));
-          parts.push( mapState.zoom.toFixed(0));
-          parts.push( mapState.rotation.toFixed(2));        
+        parts.push(mapState.zoom.toFixed(0));
+        parts.push(mapState.rotation.toFixed(2));
         parts.push(mapState.baseLayerCode);
-          parts.push( this.serializeService.serialize(queryState));
+        parts.push(this.serializeService.serialize(queryState));
 
         //console.debug("Replace url",parts);
-          this.router.navigate(parts, { replaceUrl: replace,relativeTo:this.route.parent });
+        this.router.navigate(parts, { replaceUrl: replace, relativeTo: this.route.parent });
       }
     }
   }
 
   handleOnMoveEnd(event) {
-    if(this.initialized && this.viewEnabled) {
-      this.zone.run(() =>{
+    if (this.initialized && this.viewEnabled) {
+      this.zone.run(() => {
         //console.debug("Move end");
         const map = event.map;
         const view = map.getView();
@@ -459,17 +471,19 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
 
   handleOnMouseDown(event: MouseEvent) {
     event.stopPropagation();
-    this.zone.run(() =>{
+    this.zone.run(() => {
       this.store.dispatch(new commonActions.CloseAll());
     });
   }
 
   handleShowLayerValues(event: MouseEvent) {
+    if (!this.hideShowLayerValues) {
       event.stopPropagation();
-    this.zone.run(() =>{
+      this.zone.run(() => {
         this.store.dispatch(new mapActions.ToggleLayerValuesEnabled());
       });
     }
+  }
 
   handleOnDownload(event) {
 
@@ -484,10 +498,10 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   }
 
   handleOnToggleVisibility(itemLayer: IItemLayer) {
-    this.store.dispatch(new mapActions.SetVisibility(itemLayer,!itemLayer.visible));
+    this.store.dispatch(new mapActions.SetVisibility(itemLayer, !itemLayer.visible));
   }
 
-  handleOnSetOpacity(event:{ layer: IItemLayer,opacity:number }) {
+  handleOnSetOpacity(event: { layer: IItemLayer, opacity: number }) {
     this.store.dispatch(new mapActions.SetOpacity(event.layer, event.opacity));
   }
 
@@ -507,16 +521,16 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     this.store.dispatch(new mapActions.SelectOverlayLayer(itemLayer));
   }
 
-  handlePeriodChange(period:IPeriodState) {
+  handlePeriodChange(period: IPeriodState) {
     this.store.dispatch(new mapActions.SetPeriod(period));
   }
 
-  handleCitySearch(location:string) {
+  handleCitySearch(location: string) {
     this.geolocaterService.geocode(location).subscribe(locations => {
-      if( locations.length > 0) {
-        const point = new  Point([locations[0].coordinates.lon,locations[0].coordinates.lat]);
+      if (locations.length > 0) {
+        const point = new Point([locations[0].coordinates.lon, locations[0].coordinates.lat]);
         point.transform('EPSG:4326', 'EPSG:3857');
-        const circle = new Circle(point.getCoordinates(),5000);// 
+        const circle = new Circle(point.getCoordinates(), 5000);// 
         const extent = createEmpty();
         extend(extent, circle.getExtent());
         this.store.dispatch(new mapActions.SetExtent(extent))

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

@@ -25,7 +25,7 @@ export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponen
   public items: Observable<IListItem[]>;
 
   constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
-    super(store, itemTypeService,location,router);
+    super(store, itemTypeService, itemService$, location,router);
   }
 
   areaInHa(item:IItem):number {

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

@@ -7,7 +7,8 @@
         <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
         <h1>{{item.name}}</h1>
       </div>
-      <div class="legend-container" *ngIf="item?.data.layers;let layers">
+      <ng-container *ngIf="item?.data.layers;let layers">
+        <div class="legend-container">
           <div class="card menu-card">
             <div *ngIf="layers.length>1">
               <select (change)="onLayerChanged($event.target.value)">
@@ -26,9 +27,11 @@
               <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
             </ng-container>
             <li><fm-item-link class="text-primary p-0" [itemCode]="item.code" pathSuffix="data" [showText]="true"></fm-item-link></li>
+            <li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
           </ul>
         </div>
         <fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
+      </ng-container>
     </div>
   </div>
 </div>

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

@@ -1,12 +1,13 @@
-import { Component, Injectable } from '@angular/core';
 import { Location } from '@angular/common';
-import { Store } from '@ngrx/store';
-import * as mapReducers from '../../reducers/map.reducer';
-import { commonReducers, ItemTypeService, ItemService, FolderService } from '@farmmaps/common';
+import { Component, Injectable, OnDestroy } from '@angular/core';
 import { Router } from '@angular/router';
+import { commonReducers, FolderService, IItem, IItemLinkType, ItemService, ItemTypeService, IUrlType } from '@farmmaps/common';
+import { Store } from '@ngrx/store';
+import { Subscription } from 'rxjs';
+import * as mapActions from '../../actions/map.actions';
+import * as mapReducers from '../../reducers/map.reducer';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
-import * as mapActions from '../../actions/map.actions';
 
 
 @ForItemType("vnd.farmmaps.itemtype.geotiff.processed")
@@ -16,10 +17,15 @@ import * as mapActions from '../../actions/map.actions';
   templateUrl: './selected-item-geotiff.component.html',
   styleUrls: ['./selected-item-geotiff.component.scss']
 })
-export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent {
+export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent implements OnDestroy {
+  sub: Subscription;
 
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
-    super(store, itemTypeService,location,router);
+  constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
+    super(store, itemTypeService,itemService,location,router);
+  }
+
+  ngOnDestroy(): void {
+    if (this.sub) this.sub.unsubscribe();
   }
 
   onLayerChanged(layerIndex: number) {
@@ -29,4 +35,13 @@ export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent
   layer(layers:any,layerIndex:number) {
     return layers.find(l => l.index == layerIndex);
   }
+  
+  download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) {
+    event.stopPropagation();
+    event.preventDefault();
+    const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10}
+    this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {  
+        window.location.href = itemLinkUrl.url;     
+    })
+  }
 }

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

@@ -7,7 +7,8 @@
         <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
         <h1>{{item.name}}</h1>
       </div>
-      <div class="legend-container" *ngIf="item?.data.layers;let layers">
+      <ng-container *ngIf="item?.data.layers;let layers">
+        <div class="legend-container">
           <div class="card menu-card">
             <div *ngIf="layers.length>1">
               <select (change)="onLayerChanged($event.target.value)">
@@ -24,8 +25,10 @@
               <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-olus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
               <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
             </ng-container>
+            <li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
           </ul>
         </div>
+      </ng-container>
       <fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
     </div>
   </div>

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

@@ -1,14 +1,13 @@
-import { Component, Input, Injectable, OnInit } from '@angular/core';
 import { Location } from '@angular/common';
-import { Feature } from 'ol';
+import { Component, Injectable, OnDestroy } from '@angular/core';
+import { Router } from '@angular/router';
+import { commonReducers, FolderService, IItem, IItemLinkType, ItemService, ItemTypeService, IUrlType } from '@farmmaps/common';
 import { Store } from '@ngrx/store';
-import * as mapReducers from '../../reducers/map.reducer';
-import { commonReducers, ItemTypeService, IItem, Item, ItemService, FolderService, IListItem} from '@farmmaps/common';
 import * as mapActions from '../../actions/map.actions';
-import { Router, ActivatedRoute, ParamMap, Event } from '@angular/router';
+import * as mapReducers from '../../reducers/map.reducer';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
-import { Observable } from 'rxjs';
+import { Subscription } from 'rxjs';
 
 
 @ForItemType("vnd.farmmaps.itemtype.shape.processed")
@@ -18,12 +17,17 @@ import { Observable } from 'rxjs';
   templateUrl: './selected-item-shape.component.html',
   styleUrls: ['./selected-item-shape.component.scss']
 })
-export class SelectedItemShapeComponent extends AbstractSelectedItemComponent {
-
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
-    super(store, itemTypeService,location,router);
-  }
+export class SelectedItemShapeComponent extends AbstractSelectedItemComponent implements OnDestroy {
   public selectedLayer = 0;
+  sub: Subscription;
+
+  constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
+    super(store, itemTypeService,itemService,location,router);
+  }
+
+  ngOnDestroy(): void {
+    if (this.sub) this.sub.unsubscribe();
+  }
 
   onLayerChanged(layerIndex: number) {
     this.store.dispatch(new mapActions.SetLayerIndex(layerIndex));
@@ -32,4 +36,13 @@ export class SelectedItemShapeComponent extends AbstractSelectedItemComponent {
   layer(layers:any,layerIndex:number) {
     return layers.find(l => l.index == layerIndex);
   }
+    
+  download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) {
+    event.stopPropagation();
+    event.preventDefault();
+    const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10}
+    this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {  
+        window.location.href = itemLinkUrl.url;     
+    })
+  }
 }

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

@@ -7,7 +7,8 @@
         <h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
         <h1>{{item.name}}</h1>
       </div>
-      <div class="legend-container" *ngIf="item?.data.layers;let layers">
+      <ng-container *ngIf="item?.data.layers;let layers">
+        <div class="legend-container">
           <div class="card menu-card">
             <h5><span i18n>Date</span>: {{temporalService.selectedDate(itemLayer)}}</h5>
             <div class="d-flex justify-content-between">
@@ -42,8 +43,10 @@
               <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
             </ng-container>
             <li><a href="#" (click)="handleGoToChart(item)"><i class="fal fa-line-chart" aria-hidden="true" i18m-title title="Show chart"></i>&nbsp;<span i18n>Show chart</span></a></li>
+            <li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
           </ul>
         </div>
+      </ng-container>
     </div>
   </div>
 </div>

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

@@ -1,16 +1,15 @@
-import { Component, Injectable } from '@angular/core';
 import { Location } from '@angular/common';
-import { Store } from '@ngrx/store';
-import * as mapReducers from '../../reducers/map.reducer';
-import { commonReducers, ItemTypeService, IItem } from '@farmmaps/common';
+import { Component, Injectable, OnDestroy } from '@angular/core';
 import { Router } from '@angular/router';
+import { commonReducers, IItem, IItemLinkType, ItemService, ItemTypeService, IUrlType } from '@farmmaps/common';
+import { Store } from '@ngrx/store';
+import { Subscription } from 'rxjs';
+import * as mapActions from '../../actions/map.actions';
+import { IItemLayer, ITemporalItemLayer } from '../../models/item.layer';
+import * as mapReducers from '../../reducers/map.reducer';
+import { TemporalService } from '../../services/temporal.service';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
-import { ITemporalItemLayer} from '../../models/item.layer';
-import * as mapActions from '../../actions/map.actions';
-import { IItemLayer } from '../../models/item.layer';
-import {TemporalService} from '../../services/temporal.service';
-
 
 @ForItemType("vnd.farmmaps.itemtype.temporal")
 @Injectable()
@@ -19,10 +18,15 @@ import {TemporalService} from '../../services/temporal.service';
   templateUrl: './selected-item-temporal.component.html',
   styleUrls: ['./selected-item-temporal.component.scss']
 })
-export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent {
+export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent implements OnDestroy {
+  sub: Subscription;
 
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
-    super(store, itemTypeService,location,router);
+  constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
+    super(store, itemTypeService,itemService,location,router);
+  }
+  
+  ngOnDestroy(): void {
+    if (this.sub) this.sub.unsubscribe();
   }
 
   onLayerChanged(layerIndex: number) {
@@ -33,8 +37,6 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
     return  (this.itemLayer as ITemporalItemLayer)?.selectedItemLayer
   }
 
-  
-
   handleNextTemporal(event:MouseEvent) {
     this.store.dispatch(new mapActions.NextTemporal());
     event.preventDefault();    
@@ -61,4 +63,13 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
     this.router.navigate(['/viewer', 'temporal', 'item', item.parentCode, new Date(Date.parse(item.dataDate)).getUTCFullYear()]);
     return false;
   }
+  
+  download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) {
+    event.stopPropagation();
+    event.preventDefault();
+    const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10}
+    this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {  
+       window.location.href = itemLinkUrl.url;       
+    })
+  }
 }

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

@@ -2,7 +2,7 @@ import {Component, Injectable, Input, Directive} from '@angular/core';
 import {Location} from '@angular/common';
 import {Store} from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
-import {AppConfig, commonReducers, IItem, ItemTypeService} from '@farmmaps/common';
+import {AppConfig, commonReducers, IItem, ItemService, ItemTypeService} from '@farmmaps/common';
 import * as mapActions from '../../actions/map.actions';
 import {Router} from '@angular/router';
 import { IItemLayer } from '../../models/item.layer';
@@ -15,7 +15,7 @@ export abstract class AbstractSelectedItemComponent {
   @Input() parentItem: IItem;
   @Input() itemLayer: IItemLayer;
   @Input() overlayLayers: Array<IItemLayer>;
-  constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, private location: Location, public router: Router) {
+  constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, public itemService: ItemService, private location: Location, public router: Router) {
   }
 
   handleOnView(item: IItem) {
@@ -37,6 +37,11 @@ export abstract class AbstractSelectedItemComponent {
     return false;
   }
 
+  handleOnDelete(item: IItem) {
+    this.itemService.deleteItem(item.code);
+    return false;
+  }
+
   handleAddAsLayer(item: IItem,layerIndex = -1) {
     this.store.dispatch(new mapActions.AddLayer(item,layerIndex));
     return false;
@@ -76,8 +81,8 @@ export abstract class AbstractSelectedItemComponent {
 })
 export class SelectedItemComponent extends AbstractSelectedItemComponent {
 
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, public config:AppConfig) {
-    super(store, itemTypeService,location,router);
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, itemService: ItemService, location: Location, router: Router, public config:AppConfig) {
+    super(store, itemTypeService,itemService,location,router);
   }
 
   getThumbnailUrl(item:IItem):string {

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

@@ -41,7 +41,7 @@ export const {
   selectRouteParam,     // factory function to select a route param
   selectRouteData,      // select the current route data
   selectUrl,            // select the current url
-} = fromRouter.getSelectors(getRouterState);
+} = fromRouter.getRouterSelectors(getRouterState);
 
 
 @Injectable()
@@ -133,7 +133,7 @@ export class MapEffects {
                 f.id = f.properties["code"];
               }
             }
-            return of(new mapActions.StartSearchSuccess(this._geojsonFormat.readFeatures(features), a.queryState));
+            return of(new mapActions.StartSearchSuccess(this._geojsonFormat.readFeatures(features).filter(feature => feature instanceof Feature) as Feature[], a.queryState));
           }
           ),
           catchError(error => of(new commonActions.Fail(error))));
@@ -218,7 +218,7 @@ export class MapEffects {
       if (!this.overrideSelectedItemLayer) {
         return this.itemService$.getFeature(action.item.code, "EPSG:3857").pipe(
           map((feature: any) => {
-            const f = this._geojsonFormat.readFeature(feature);
+            const f = this._geojsonFormat.readFeature(feature) as Feature;
             f.setId(action.item.code);
             return new mapActions.AddFeatureSuccess(f);
           }),

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

@@ -49,6 +49,7 @@ export interface State {
   features: Array<Feature<Geometry>>,
   panelVisible: boolean,
   panelCollapsed: boolean,
+  panelExtraWide: boolean,
   selectedFeature: Feature<Geometry>,
   selectedItem:IItem,
   parentItem:IItem,
@@ -94,6 +95,7 @@ export const initialState: State = {
   features: [],
   panelVisible: false,
   panelCollapsed: false,
+  panelExtraWide: false,
   selectedFeature: null,
   selectedItem: null,
   parentItem: null,
@@ -572,6 +574,10 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       }
       return state;
     }
+    case mapActions.SETPANELEXTRAWIDE:{
+      const a= action as mapActions.SetPanelExtraWide;
+      return tassign(state,{panelExtraWide:a.panelExtraWide});
+    }
     default: {
       return state;
     }
@@ -583,6 +589,7 @@ export const getParentCode = (state: State) => state.parentCode;
 export const getFeatures = (state: State) => state.features;
 export const getPanelVisible = (state: State) => state.panelVisible;
 export const getPanelCollapsed = (state: State) => state.panelCollapsed;
+export const getPanelExtraWide = (state: State) => state.panelExtraWide;
 export const getSelectedFeature = (state: State) => state.selectedFeature;
 export const getSelectedItem = (state: State) => state.selectedItem;
 export const getParentItem = (state: State) => state.parentItem;
@@ -618,6 +625,7 @@ export const selectGetParentCode = createSelector(selectMapState, getParentCode)
 export const selectGetFeatures = createSelector(selectMapState, getFeatures);
 export const selectGetPanelVisible = createSelector(selectMapState, getPanelVisible);
 export const selectGetPanelCollapsed = createSelector(selectMapState, getPanelCollapsed);
+export const selectGetPanelExtraWide = createSelector(selectMapState, getPanelExtraWide);
 export const selectGetSelectedFeature = createSelector(selectMapState, getSelectedFeature);
 export const selectGetSelectedItem = createSelector(selectMapState, getSelectedItem);
 export const selectGetParentItem = createSelector(selectMapState, getParentItem);
@@ -629,6 +637,8 @@ export const selectGetExtent = createSelector(selectMapState, getExtent);
 export const selectGetViewExtent = createSelector(selectMapState, getViewExtent);
 export const selectGetOverlayLayers = createSelector(selectMapState, getOverlayLayers);
 export const selectGetBaseLayers = createSelector(selectMapState, getBaseLayers);
+export const selectGetBaseMaps = createSelector(selectGetBaseLayers, (layers) => layers.filter(layer => layer.item.data.category === "baseMap"));
+export const selectGetArealMaps = createSelector(selectGetBaseLayers, (layers) => layers.filter(layer => layer.item.data.category === "aerialPhoto").sort((a, b) => a.item.dataDate <= b.item.dataDate ? 1 : -1));
 export const selectGetProjection = createSelector(selectMapState, getProjection);
 export const selectGetSelectedBaseLayer = createSelector(selectMapState, getSelectedBaseLayer);
 export const selectGetSelectedOverlayLayer = createSelector(selectMapState, getSelectedOverlayLayer);

projects/common-map/tsconfig.lib.json

@@ -10,18 +10,27 @@
     "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
+    "enableResourceInlining": true,
+    "compilationMode": "partial"
   },
   "exclude": [
     "src/test.ts",