[ci skip] Updated packages #65

# Conflicts:
#	package-lock.json

.eslintrc.js

@@ -18,6 +18,5 @@ module.exports = {
         "@typescript-eslint"
     ],
     "rules": {
-        "@typescript-eslint/no-explicit-any": "off"
     }
 }

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.

angular.json

@@ -209,8 +209,8 @@
           "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"
               }
@@ -253,6 +253,43 @@
           }
         }
       }
+    },
+    "ng-openlayers": {
+      "projectType": "library",
+      "root": "projects/ng-openlayers",
+      "sourceRoot": "projects/ng-openlayers/src",
+      "prefix": "ng-openlayers",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:ng-packagr",
+          "options": {
+            "tsConfig": "projects/ng-openlayers/tsconfig.lib.json",
+            "project": "projects/ng-openlayers/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "tsConfig": "projects/ng-openlayers/tsconfig.lib.prod.json"
+            }
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "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"
+            ]
+          }
+        }
+      }
     }
   },
   "cli": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "4.5.0",
+  "version": "4.11.1",
   "scripts":   {
     "ng": "ng",
     "start": "ng serve",
@@ -11,38 +11,38 @@
   },
   "private": true,
   "dependencies":   {
-    "@angular/animations": "^17.3.3",
+    "@angular-eslint/eslint-plugin": "^18.2.0",
-    "@angular/common": "^17.3.3",
+    "@angular/animations": "^18.2.3",
-    "@angular/compiler": "^17.3.3",
+    "@angular/common": "^18.2.3",
-    "@angular/core": "^17.3.3",
+    "@angular/compiler": "^18.2.3",
-    "@angular-eslint/eslint-plugin": "^15.2.1",
+    "@angular/core": "^18.2.3",
-    "@angular/forms": "^17.3.3",
+    "@angular/forms": "^18.2.3",
-    "@angular/platform-browser": "^17.3.3",
+    "@angular/platform-browser": "^18.2.3",
-    "@angular/platform-browser-dynamic": "^17.3.3",
+    "@angular/platform-browser-dynamic": "^18.2.3",
-    "@angular/router": "^17.3.3",
+    "@angular/router": "^18.2.3",
     "@farmmaps/common": "file:dist/common",
     "@farmmaps/common-map": "file:dist/common-map",
     "@farmmaps/common-map3d": "file:dist/common-map3d",
-    "ng-openlayers": "17.1.3",
+    "@farmmaps/ng-openlayers": "file:dist/ng-openlayers",
     "@microsoft/signalr": "^3.1.16",
-    "@ng-bootstrap/ng-bootstrap": "^16.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^17.0.1",
-    "@ngrx/effects": "^17",
+    "@ngrx/effects": "^18.0.2",
-    "@ngrx/router-store": "^17",
+    "@ngrx/router-store": "^18.0.2",
-    "@ngrx/store": "^17",
+    "@ngrx/store": "^18.0.2",
-    "@popperjs/core": "^2.11.6",
+    "@popperjs/core": "^2.11.8",
-    "angular-oauth2-oidc": "^13",
+    "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": "17.0.0",
+    "ngrx-store-localstorage": "^18.0.0",
-    "ngx-avatars": "1.7.0",
+    "ngx-avatars": "^1.8.0",
-    "ngx-clipboard": "16.0.0",
+    "ngx-clipboard": "^16.0.0",
-    "ngx-image-cropper": "^7.2.1",
+    "ngx-image-cropper": "^7.0.0",
     "ngx-uploadx": "^6.2.0",
     "ol": "^8.2.0",
     "olcs": "^2.13.1",
@@ -54,19 +54,23 @@
     "tslib": "^2.4.0",
     "url": "^0.11.0",
     "util": "^0.12.4",
-    "zone.js": "~0.14.4"
+    "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": "^17",
+    "@angular-builders/custom-webpack": "^18.0.0",
-    "@angular-devkit/build-angular": "^17.3.3",
+    "@angular-devkit/build-angular": "^18.2.3",
-    "@angular/cli": "^17.3.3",
+    "@angular/cli": "^18.2.3",
-    "@angular/compiler-cli": "^17.3.3",
+    "@angular/compiler-cli": "^18.2.3",
-    "@angular/language-service": "^17.3.3",
+    "@angular/language-service": "^18.2.3",
-    "@angular/localize": "^17.3.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": "^18.11.6",
+    "@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",
@@ -81,7 +85,7 @@
     "karma-coverage-istanbul-reporter": "^3.0.3",
     "karma-jasmine": "^5.1.0",
     "karma-jasmine-html-reporter": "^2.0.0",
-    "ng-packagr": "^17.3.0",
+    "ng-packagr": "^18.2.1",
     "protractor": "~7.0.0",
     "ts-node": "^8.8.1",
     "typescript": "~5.4.4"

projects/common-map/.eslintrc.js

@@ -18,6 +18,5 @@ module.exports = {
         "@typescript-eslint"
     ],
     "rules": {
-        "@typescript-eslint/no-explicit-any": "off"
     }
 }

projects/common-map/package-lock.json

@@ -11,20 +11,207 @@
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "^17.3.3",
+        "@angular/core": "^18.2.3",
-        "@ngrx/effects": "^17",
+        "@ngrx/effects": "^18.0.2",
-        "@ngrx/router-store": "^17",
+        "@ngrx/router-store": "^18.0.2",
-        "@ngrx/store": "^17",
+        "@ngrx/store": "^18.0.2",
-        "ng-openlayers": "17.1.3",
+        "ngrx-store-localstorage": "^18",
-        "ngrx-store-localstorage": "^17",
-        "ol": "^8.2.0",
         "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",
+      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
-      "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
+      "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

@@ -8,13 +8,11 @@
     "tslib": "^2.0.0"
   },
   "peerDependencies": {
-    "@angular/core": "^17.3.3",
+    "@angular/core": "^18.2.3",
-    "ngrx-store-localstorage": "^17",
+    "ngrx-store-localstorage": "^18.0.0",
-    "@ngrx/effects": "^17",
+    "@ngrx/effects": "^18.0.2",
-    "@ngrx/router-store": "^17",
+    "@ngrx/router-store": "^18.0.2",
-    "@ngrx/store": "^17",
+    "@ngrx/store": "^18.0.2",
-    "tassign": "^1.0.0",
+    "tassign": "^1.0.0"
-    "ng-openlayers": "17.1.3",
-    "ol": "^8.2.0"
   }
 }

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

@@ -1,12 +1,13 @@
 import { Action } from '@ngrx/store';
 
-import { IItem, IQueryState } from '@farmmaps/common';
+import { IMapState } from '../models/map.state';
-import { Feature } from 'ol';
-import { Geometry } from 'ol/geom';
-import { Style } from 'ol/style';
 import { IItemLayer } from '../models/item.layer';
 import { ILayervalue } from '../models/layer.value';
-import { IMapState } from '../models/map.state';
+import { IQueryState } from '@farmmaps/common';
+import { IItem } from '@farmmaps/common';
+import { Feature } from 'ol';
+import { Style } from 'ol/style';
+import { Geometry } from 'ol/geom';
 import { IPeriodState } from '../models/period.state';
 
 export const SETSTATE = '[Map] SetState';
@@ -157,7 +158,7 @@ export class PreviousTemporal implements Action {
 export class SelectTemporal implements Action {
   readonly type = SELECTTEMPORAL;
 
-  constructor() { }
+  constructor(item:IItem) { }
 }
 
 export class AddFeatureSuccess implements Action {

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

@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { MapComponent } from './components/map/map.component';
+import { AuthGuard } from '@farmmaps/common';
 
 const routes = [
     {

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

@@ -6,10 +6,10 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
 import { EffectsModule } from '@ngrx/effects';
 import { ActionReducer, MetaReducer, StoreModule } from '@ngrx/store';
-import { AngularOpenlayersModule } from 'ng-openlayers';
+import { AngularOpenlayersModule } from '@farmmaps/ng-openlayers';
 
 //common modules
-import { AppCommonModule, ItemTypeService } from '@farmmaps/common';
+import { AppCommonModule } from '@farmmaps/common';
 
 import * as mapActions from './actions/map.actions';
 import * as mapEffects from './effects/map.effects';
@@ -212,7 +212,6 @@ export {
         GeolocationService,
         DeviceOrientationService,
         TemporalService,
-    ItemTypeService,
         { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
         { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
         { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
@@ -228,5 +227,6 @@ export {
     ]
 })
 
+
 export class AppCommonMapModule {  
 }

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

@@ -1,9 +1,10 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import { Component, Input, OnDestroy, OnInit, EventEmitter, Output, Inject } from '@angular/core';
-import { MapComponent } from 'ng-openlayers';
+import { MapComponent } from '@farmmaps/ng-openlayers';
 
-import { Feature } from 'ol';
+import * as proj  from 'ol/proj';
+import {Point,Geometry} from 'ol/geom';
 import { GeoJSON } from 'ol/format';
-import { Geometry, Point } from 'ol/geom';
+import { Feature} from 'ol';
 
 export interface IDroppedFile {
   files: any,
@@ -27,6 +28,7 @@ export class FileDropTargetComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.element = this.map.instance.getViewport();
+    const other = this;
     this.element.addEventListener('drop', this.onDrop, false);
     this.element.addEventListener('dragover', this.preventDefault, false);
     this.element.addEventListener('dragenter', this.preventDefault, false);

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

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

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

@@ -1,21 +1,25 @@
-import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, forwardRef } from '@angular/core';
+import { Component, Host, Input, Output, EventEmitter,OnDestroy, OnInit, OnChanges, SimpleChanges, forwardRef } from '@angular/core';
-import { AppConfig, IItem, ItemService } from '@farmmaps/common';
+import { LayerGroupComponent, MapComponent } from '@farmmaps/ng-openlayers';
-import { LayerGroupComponent, MapComponent } from 'ng-openlayers';
+import { ItemService,IItem,AppConfig } from '@farmmaps/common';
-import Feature from 'ol/Feature';
+import { IItemLayer, ITemporalItemLayer} from '../../../models/item.layer';
-import { Extent } from 'ol/extent';
+import { ILayerData} from '../../../models/layer.data';
-import { GeoJSON, MVT } from 'ol/format';
+import { IRenderoutputTiles,IRenderoutputImage,IGradientstop,ILayer,IHistogram,IColor} from '../../../models/color.map';
-import { Geometry } from 'ol/geom';
+import {Extent} from 'ol/extent';
-import { Image, Layer, Tile, VectorImage as VectorImageLayer, Vector as VectorLayer } from 'ol/layer';
-import VectorTileLayer from 'ol/layer/VectorTile';
-import * as loadingstrategy from 'ol/loadingstrategy';
-import * as proj from 'ol/proj';
 import Projection from 'ol/proj/Projection';
-import { BingMaps, ImageStatic, OSM, Source, TileArcGISRest, TileJSON, TileWMS, Vector as VectorSource, XYZ } from 'ol/source';
+import * as proj from 'ol/proj';
-import VectorTileSource from 'ol/source/VectorTile';
+import * as loadingstrategy from 'ol/loadingstrategy';
 import * as style from 'ol/style';
-import { IColor, IGradientstop, IHistogram, ILayer, IRenderoutputImage, IRenderoutputTiles } from '../../../models/color.map';
+import {Tile,Layer,Image} from 'ol/layer';
-import { IItemLayer, ITemporalItemLayer } from '../../../models/item.layer';
+import {XYZ,ImageStatic,OSM,BingMaps,TileWMS,TileArcGISRest,TileJSON,Source} from 'ol/source';
-import { ILayerData } from '../../../models/layer.data';
+import {Vector as VectorSource} from 'ol/source';
+import { Vector as VectorLayer } from 'ol/layer';
+import { VectorImage as VectorImageLayer } from 'ol/layer';
+import VectorTileSource from 'ol/source/VectorTile';
+import VectorTileLayer from 'ol/layer/VectorTile';
+import {GeoJSON,MVT} from 'ol/format';
+import { Geometry } from 'ol/geom';
+import BaseLayer from 'ol/layer/Base';
+import Feature from 'ol/Feature';
 
 @Component({
   selector: 'fm-map-item-layers',
@@ -90,7 +94,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     return color;
   }
 
-  getColor(item: IItem, layer: any, feature): style.Style {
+  getColor(item: IItem, layer: ILayer, feature): style.Style {
     const value = layer.indexKey ? feature.get(layer.indexKey) : feature.get(layer.name);
     const key = item.code + "_" + value;
     if (!this.styleCache[key]) {
@@ -149,7 +153,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     const data = item.data;
     const l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null;
     if (l && l.rendering && l.rendering.renderoutputType == "VectorTiles") {
-      const rt = l.rendering as IRenderoutputTiles;
+      var rt = l.rendering as IRenderoutputTiles;
       layer = new VectorTileLayer({
         declutter: true,
         source: new VectorTileSource({
@@ -163,7 +167,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
         }
       })
     } else if (l && l.rendering && l.rendering.renderoutputType == "Tiles") {
-      const rt = l.rendering as IRenderoutputTiles;
+      var rt = l.rendering as IRenderoutputTiles;
       layer = new Tile({
         source: new XYZ({
           maxZoom: rt.maxzoom,
@@ -172,12 +176,11 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
         })
       });
     } else {
-      // eslint-disable-next-line @typescript-eslint/no-this-alias
       const __this = this;
       const format = new GeoJSON();
       const source = new VectorSource({
         strategy: loadingstrategy.bbox,
-        loader: function (extent: Extent, _resolution: number, projection: Projection) {
+        loader: function (extent: Extent, resolution: number, projection: Projection) {
           const source = this as VectorSource<Feature<Geometry>>;
           __this.itemService.getItemFeatures(item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) {
             const features = format.readFeatures(data).filter(feature => feature instanceof Feature) as Feature[];
@@ -234,6 +237,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
 
   createSelectionLayer(itemLayer:IItemLayer):Layer<Source> {
     let layerIndex = -1;
+    const layer: Layer<Source> = null; 
     layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : itemLayer.item.data.layers[0].index;
     const data = itemLayer.item.data;
     const l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null;
@@ -261,8 +265,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     return null;
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  createExternalLayer(item:IItem,itemLayer:IItemLayer):Layer<Source> {
-  createExternalLayer(item:IItem,_itemLayer:IItemLayer):Layer<Source> {
     const data = item.data as ILayerData;
     let layer: Layer<Source> = null; 
     switch (data.interfaceType) {
@@ -316,6 +319,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
 
   createLayer(itemLayer: IItemLayer): Layer<Source> {
     let layer: Layer<Source> = null;   
+    const layerIndex = -1;
     if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.geotiff.processed') {
       layer = this.createGeotiffLayer(itemLayer.item,itemLayer);
     } else if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.shape.processed') {
@@ -375,6 +379,10 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
     if(this.topLayerPrerenderEventhandlerInstalled && this.onPrerender.observers.length > 0 )
     {
       if(this.instance.getVisible()) {
+        const olLayers = this.instance.getLayers().getArray().forEach((l:any) => {
+          l.un('prerender',this.topLayerPrerenderEventhandler);
+          l.un('postrender',this.topLayerPostrenderEventhandler);
+        });
         this.topLayerPrerenderEventhandlerInstalled = false;
       }
     }
@@ -407,15 +415,17 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
 
   updateLayers(itemLayers: IItemLayer[] | IItemLayer) {
     this.unInstallTopLayerPrerenderEventhandler();
+    let dataLayer = false;
     let ils:IItemLayer[] = [];
     if(Array.isArray(itemLayers)) {
        ils = itemLayers;
     } else {
+      dataLayer=true;
        ils=[itemLayers];
     }
     const newLayers: Layer<Source>[] = [];
     if (ils) {
-      ils.forEach((itemLayer) => {
+      ils.forEach((itemLayer, index) => {
         if(itemLayer.item.itemType ==  'vnd.farmmaps.itemtype.temporal') {
           const il = itemLayer as ITemporalItemLayer;
           const previousLayer = this.addOrUpdateOlLayer(il.previousItemLayer,newLayers.length);          

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

@@ -1,22 +1,25 @@
-import { Component, EventEmitter, Host, Inject, Input, LOCALE_ID, OnChanges, OnDestroy, OnInit, Output, SimpleChanges, forwardRef } from '@angular/core';
+import { Component, Host, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges, forwardRef, Inject, InjectionToken, OnDestroy, LOCALE_ID } from '@angular/core';
-import { FolderService, IItem, ItemService, ItemTypeService } from '@farmmaps/common';
+import { LayerVectorComponent, SourceVectorComponent, MapComponent } from '@farmmaps/ng-openlayers';
-import { LayerVectorComponent, MapComponent, SourceVectorComponent } from 'ng-openlayers';
+import { ItemService, ItemTypeService, IItem, IItemType, FolderService } from '@farmmaps/common';
 
-import { formatNumber } from '@angular/common';
+import { Feature } from 'ol';
-import { Feature, MapBrowserEvent } from 'ol';
+import { Point, Geometry } from 'ol/geom';
-import * as color from 'ol/color';
+import { MapBrowserEvent } from 'ol';
-import * as extent from 'ol/extent';
+import { Types } from 'ol/MapBrowserEventType';
-import { getCenter } from 'ol/extent';
-import { GeoJSON } from 'ol/format';
-import { Geometry, Point } from 'ol/geom';
-import { Select } from 'ol/interaction';
-import { Layer } from 'ol/layer';
-import * as loadingstrategy from 'ol/loadingstrategy';
-import { Source, Vector } from 'ol/source';
 import * as style from 'ol/style';
-import { Subscription } from 'rxjs';
+import * as color from 'ol/color';
+import * as loadingstrategy from 'ol/loadingstrategy';
+import * as condition from 'ol/events/condition';
+import * as extent from 'ol/extent';
+import { Vector, Cluster, Source } from 'ol/source';
+import { Layer } from 'ol/layer';
+import { GeoJSON } from 'ol/format';
+import { Select } from 'ol/interaction';
 import { IStyles } from '../../../models/style.cache';
 import { FeatureIconService } from '../../../services/feature-icon.service';
+import { Subscription } from 'rxjs';
+import { getCenter } from 'ol/extent';
+import { formatNumber } from '@angular/common';
 
 @Component({
   selector: 'fm-map-item-source-vector',
@@ -27,8 +30,10 @@ import { FeatureIconService } from '../../../services/feature-icon.service';
 })
 export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnDestroy, OnChanges {
   instance: Vector<Feature<Geometry>>;
+  private _format: GeoJSON;
   private _select: Select;
   private _hoverSelect: Select;
+  private _iconScale = 0.05;
   @Input() features: Array<Feature<Geometry>>;
   @Input() selectedFeature: Feature<Geometry>;
   @Input() selectedItem: IItem;
@@ -41,6 +46,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
 
   constructor(@Host() private layer: LayerVectorComponent, private itemService: ItemService, private map: MapComponent, private itemTypeService: ItemTypeService, private featureIconService$: FeatureIconService, private folderService: FolderService, @Inject(LOCALE_ID) private locale: string) {
     super(layer);
+    this._format = new GeoJSON();
   }
 
   geometry(feature: Feature<Geometry>) {
@@ -198,7 +204,6 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
     if (changes["styles"]) {
       const styles = changes["styles"].currentValue;
       for (const key in styles) {
-        // eslint-disable-next-line no-prototype-builtins
         if (styles.hasOwnProperty(key)) {
           this.stylesCache[key] = styles[key];
         }

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

@@ -1,16 +1,17 @@
-import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { Component, OnInit, Input, ViewChild, ElementRef, AfterViewInit } from '@angular/core';
+import { IItemLayer } from '../../../models/item.layer';
 import { Store } from '@ngrx/store';
-import { MapComponent } from 'ng-openlayers';
-import { ClipboardService } from 'ngx-clipboard';
-import { toStringHDMS } from 'ol/coordinate';
-import { WKT } from 'ol/format';
-import { Point } from 'ol/geom';
-import { toLonLat } from 'ol/proj';
-import { Observable, Subject, interval } from 'rxjs';
-import { throttle } from 'rxjs/operators';
-import * as mapActions from '../../../actions/map.actions';
-import { ILayervalue } from '../../../models/layer.value';
 import * as mapReducers from '../../../reducers/map.reducer';
+import * as mapActions from '../../../actions/map.actions';
+import { MapComponent } from '@farmmaps/ng-openlayers';
+import { ILayervalue } from '../../../models/layer.value';
+import { Observable, interval, Subject } from 'rxjs';
+import { debounce, throttle } from 'rxjs/operators';
+import { toLonLat } from 'ol/proj';
+import { toStringHDMS } from 'ol/coordinate';
+import { ClipboardService } from 'ngx-clipboard'
+import { GeoJSON, WKT } from 'ol/format';
+import { Point } from 'ol/geom';
 
 @Component({
   selector: 'fm-map-layer-values',
@@ -44,7 +45,7 @@ export class LayerValuesComponent implements OnInit, AfterViewInit {
     this.map.instance.on('moveend', () => {
       this.moveEndSubject.next({});
     });
-    this.moveEndSubject.pipe(throttle(() => interval(100))).subscribe(() => this.updateValuesLocation());
+    this.moveEndSubject.pipe(throttle(ev => interval(100))).subscribe(() => this.updateValuesLocation());
   }
 
   updateValuesLocation() {

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

@@ -1,5 +1,5 @@
 import { Component, OnDestroy, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
-import { LayerVectorComponent, MapComponent } from 'ng-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';

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

@@ -1,8 +1,8 @@
-import { ChangeDetectorRef, Component, Host, Input, OnChanges, OnInit } from '@angular/core';
+import { Component, OnInit, Input, Host, OnChanges, SimpleChanges,ChangeDetectorRef } from '@angular/core';
-import { MapComponent } from 'ng-openlayers';
+import { MapComponent } from '@farmmaps/ng-openlayers';
-import { View } from 'ol';
+import {IMapState} from '../../../models/map.state'
+import {View} from 'ol';
 import { fromLonLat } from 'ol/proj';
-import { IMapState } from '../../../models/map.state';
 
 
 @Component({
@@ -29,7 +29,7 @@ export class PanToLocation  implements OnInit,OnChanges{
     });
   }
 
-  ngOnChanges() {
+  ngOnChanges(changes: SimpleChanges) {
     // if (changes.position && this.instance) {
     //   var p = changes.position.currentValue as Position;
     //   this.instance.setPosition(fromLonLat([p.coords.longitude, p.coords.latitude]));
@@ -64,17 +64,17 @@ export class PanToLocation  implements OnInit,OnChanges{
       const newCenter = fromLonLat([this.position.coords.longitude,this.position.coords.latitude]);
       const extent = [newCenter[0]-500,newCenter[1]-500,newCenter[0]+500,newCenter[1]+500];
       const options = { padding: [0, 0, 0, 0],minResolution:1 };
-      //const size = this.map.instance.getSize();
+      const size = this.map.instance.getSize();
-      //const rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
+      const rem = parseFloat(getComputedStyle(document.documentElement).fontSize);
-      //const threshold = 44 * rem;
+      const threshold = 44 * rem;
-      //let left = 1 * rem;
+      let left = 1 * rem;
-      //const right = 1 * rem;
+      const right = 1 * rem;
-      //let bottom = Math.round(size[1] / 2);
+      let bottom = Math.round(size[1] / 2);
-      //const top = 1 * rem;
+      const top = 1 * rem;
-      //if (size[0] > threshold) {
+      if (size[0] > threshold) {
-      //  bottom = 1 * rem;
+        bottom = 1 * rem;
-      //  left = 23 * rem;
+        left = 23 * rem;
-      //}
+      }
       //options.padding = [top, right, bottom, left];
       if (this.animate) options["duration"] = 2000;
       view.fit(extent, options);  

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

@@ -1,7 +1,7 @@
-import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
+import { Component, Host, Input, OnInit, ChangeDetectorRef  } from '@angular/core';
-import { MapComponent } from 'ng-openlayers';
+import { ViewComponent, MapComponent } from '@farmmaps/ng-openlayers';
 
-import { View } from 'ol';
+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, OnChanges } from '@angular/core';
+import { Component, Host, Input, OnInit, OnChanges, SimpleChanges, forwardRef } from '@angular/core';
 import { ActivatedRoute  } from '@angular/router';
-import { MapComponent, ViewComponent } from 'ng-openlayers';
+import { ViewComponent, MapComponent } from '@farmmaps/ng-openlayers';
 
  
 @Component({
@@ -30,7 +30,7 @@ export class ZoomToExtentComponent implements OnChanges {
     }
   }
 
-  ngOnChanges() {
+  ngOnChanges(changes: SimpleChanges) {
     if (this.extent) {
       const options = { padding: [0, 0, 0, 0],minResolution:1 };
       const size = this.map.instance.getSize();

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

@@ -1,13 +1,13 @@
-import { Component, ComponentFactory, ComponentFactoryResolver, Inject, Input, SimpleChanges, ViewChild } from '@angular/core';
+import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject} from '@angular/core';
-import { IQueryState } from '@farmmaps/common';
-import { Store } from '@ngrx/store';
 import { Feature } from 'ol';
-import { Geometry } from 'ol/geom';
+import { Geometry} from 'ol/geom';
-import { Observable } from 'rxjs';
+import { FeatureListComponent,AbstractFeatureListComponent } from '../feature-list/feature-list.component';
-import * as mapActions from '../../actions/map.actions';
-import * as mapReducers from '../../reducers/map.reducer';
-import { AbstractFeatureListComponent, FeatureListComponent } from '../feature-list/feature-list.component';
 import { WidgetHostDirective } from '../widget-host/widget-host.directive';
+import  {IQueryState,PackageService } from '@farmmaps/common';
+import * as mapReducers from '../../reducers/map.reducer';
+import * as mapActions from '../../actions/map.actions';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
 
 
 @Component({
@@ -17,7 +17,7 @@ import { WidgetHostDirective } from '../widget-host/widget-host.directive';
 })
 export class FeatureListContainerComponent {
 
-  constructor(private store: Store<mapReducers.State>,private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractFeatureListComponent) public featureLists: AbstractFeatureListComponent[]) {
+  constructor(private store: Store<mapReducers.State>,private componentFactoryResolver: ComponentFactoryResolver, @Inject(AbstractFeatureListComponent) public featureLists: AbstractFeatureListComponent[],private packageService:PackageService ) {
     this.featureLists = [...this.featureLists].reverse();
   }
 

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

@@ -5,7 +5,7 @@
     <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()">
+          <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>

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

@@ -1,12 +1,12 @@
+import { Component, Injectable,AfterViewInit, OnInit,SimpleChanges, ChangeDetectorRef} from '@angular/core';
 import { Location } from '@angular/common';
-import { Component, Injectable, OnInit } from '@angular/core';
-import { IItem, ItemService, ItemTypeService, commonReducers } from '@farmmaps/common';
-import { Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import * as mapReducers from '../../reducers/map.reducer';
 import { AbstractFeatureListComponent } from '../feature-list/feature-list.component';
-import { ForChild } from '../for-item/for-child.decorator';
+import {ForItemType } from '../for-item/for-itemtype.decorator';
-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.cropfield")

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

@@ -4,7 +4,7 @@
       <h3><i class="far fa-farm"></i>&nbsp;<span i18n>Farms</span></h3>
       <div *ngIf="features;let features">
       <div class="farms">
-        <div class="row m-0 ps-3 pe-3" *ngFor="let feature of features"[ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave()">
+        <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>      

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

@@ -1,14 +1,15 @@
-import { Location } from '@angular/common';
 import { Component, Injectable } from '@angular/core';
-import { ItemTypeService, commonReducers } from '@farmmaps/common';
+import { Location } from '@angular/common';
-import { Action, Store } from '@ngrx/store';
-import { Feature } from 'ol';
-import { Geometry } from 'ol/geom';
-import { tassign } from 'tassign';
-import * as mapActions from '../../actions/map.actions';
-import * as mapReducers from '../../reducers/map.reducer';
 import { AbstractFeatureListComponent } from '../feature-list/feature-list.component';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
+import { Store,Action } from '@ngrx/store';
+import * as mapReducers from '../../reducers/map.reducer';
+import { commonReducers, ItemTypeService } from '@farmmaps/common';
+import * as mapActions from '../../actions/map.actions';
+import { tassign } from 'tassign';
+import { Router } from '@angular/router';
+import { Feature } from 'ol';
+import { Geometry} from 'ol/geom';
 
 @ForItemType("vnd.farmmaps.itemtype.croppingscheme")
 @Injectable()
@@ -19,7 +20,7 @@ import { ForItemType } from '../for-item/for-itemtype.decorator';
 })
 export class FeatureListCroppingschemeComponent extends AbstractFeatureListComponent {
 
-    constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location) {
+    constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, private router: Router) {
         super(store, itemTypeService, location);
     }
 

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

@@ -1,7 +1,7 @@
-import { Component, ComponentFactory, ComponentFactoryResolver, Inject, Input, SimpleChanges, ViewChild } from '@angular/core';
+import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject, Type} from '@angular/core';
 import { Feature } from 'ol';
 import { Geometry } from 'ol/geom';
-import { AbstractFeatureListFeatureComponent, FeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component';
+import { AbstractFeatureListFeatureComponent,FeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component';
 import { WidgetHostDirective } from '../widget-host/widget-host.directive';
 
 

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

@@ -1,12 +1,12 @@
-import { Component, Injectable } from '@angular/core';
+import { Component, Injectable,ViewChild,AfterViewInit} from '@angular/core';
-import { AppConfig, ItemTypeService, commonReducers } from '@farmmaps/common';
-import { Store } from '@ngrx/store';
 import { Feature } from 'ol';
 import { Geometry } from 'ol/geom';
-import { getArea } from 'ol/sphere';
+import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
+import { commonReducers,ItemTypeService,AppConfig } from '@farmmaps/common';
 import { AbstractFeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
+import {getArea} from 'ol/sphere';
 
 
 

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

@@ -1,7 +1,8 @@
-import { Component, Injectable } from '@angular/core';
+import { Component, Input, Injectable} from '@angular/core';
-import { AppConfig, ItemTypeService, commonReducers } from '@farmmaps/common';
+import { Feature } from 'ol';
 import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
+import { commonReducers,ItemTypeService,AppConfig } from '@farmmaps/common';
 import { AbstractFeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
 

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

@@ -1,6 +1,6 @@
 <div *ngIf="features;let features">
   <fm-back-button></fm-back-button>
-  <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()">
+  <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>

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

@@ -1,12 +1,15 @@
+import { Component, Input, Injectable,Directive,SimpleChanges } from '@angular/core';
 import { Location } from '@angular/common';
-import { Component, Directive, Injectable, Input } from '@angular/core';
-import { IQueryState, ItemTypeService, commonReducers } from '@farmmaps/common';
-import { Action, Store } from '@ngrx/store';
 import { Feature } from 'ol';
-import { Geometry } from 'ol/geom';
+import { Geometry} from 'ol/geom';
-import { tassign } from 'tassign';
+import { Store,Action} from '@ngrx/store';
-import * as mapActions from '../../actions/map.actions';
 import * as mapReducers from '../../reducers/map.reducer';
+import { commonReducers,ItemTypeService, IItem, Item } from '@farmmaps/common';
+import * as mapActions from '../../actions/map.actions';
+import { Observable, from } from 'rxjs';
+import { withLatestFrom } from 'rxjs/operators';
+import { tassign } from 'tassign';
+import { IQueryState } from '@farmmaps/common';
 
 
 @Injectable()
@@ -34,11 +37,11 @@ export abstract class AbstractFeatureListComponent {
       return new mapActions.DoQuery(newQuery)  
   }
 
-  handleFeatureMouseEnter(feature:Feature<Geometry>) {
+  handleFeatureMouseEnter(feature) {
     this.store.dispatch(new mapActions.SelectFeature(feature));
   }
 
-  handleFeatureMouseLeave() {
+  handleFeatureMouseLeave(feature) {
     this.store.dispatch(new mapActions.SelectFeature(null));
   }
 

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

@@ -1,7 +1,7 @@
-import { AfterViewInit, Component, Input, ViewChild } from '@angular/core';
+import { Component, Input, AfterViewInit, ViewChild } from '@angular/core';
-import { Feature } from 'ol';
+import { Feature} from 'ol';
+import { Geometry,Polygon,MultiPolygon } from 'ol/geom';
 import * as extent from 'ol/extent';
-import { Geometry, Polygon } from 'ol/geom';
 import * as render from 'ol/render';
 import * as style from 'ol/style';
 

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

@@ -1,7 +1,7 @@
-import { Directive, Input, OnInit, TemplateRef, ViewContainerRef } from '@angular/core';
+import { Directive, ViewContainerRef,TemplateRef,OnInit,Input, OnChanges } from '@angular/core';
-import { MapComponent } from 'ng-openlayers';
 import { Layer } from 'ol/layer';
 import { Source } from 'ol/source';
+import { MapComponent } from '@farmmaps/ng-openlayers';
 
 @Directive({
   selector: '[fmMapIfZoomToShow]',
@@ -36,7 +36,7 @@ export class ifZoomToShowDirective  implements OnInit {
   }
 
   ngOnInit() {    
-    this.map$.instance.on('moveend', () => {
+    this.map$.instance.on('moveend', (e) => {
       this.checkZoom();     
     });
   }

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

@@ -1,7 +1,7 @@
-import { Component, ComponentFactory, ComponentFactoryResolver, Inject, Input, SimpleChanges, ViewChild } from '@angular/core';
+import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject, Type} from '@angular/core';
-import { IListItem } from '@farmmaps/common';
+import { AbstractItemListItemComponent,ItemListItemComponent } from '../item-list-item/item-list-item.component';
-import { AbstractItemListItemComponent, ItemListItemComponent } from '../item-list-item/item-list-item.component';
 import { WidgetHostDirective } from '../widget-host/widget-host.directive';
+import { IItem, IListItem } from '@farmmaps/common';
 
 
 @Component({
@@ -27,6 +27,7 @@ export class ItemListItemContainerComponent {
 
     let selected = -1;
     let maxMatches =0;
+    const showItem = true;
     for (let i = 0; i < this.itemComponentList.length; i++) {
       let matches=0;
       let criteria=0;

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

@@ -1,8 +1,8 @@
+import { Component, Input, Injectable, Inject, Optional,ComponentFactoryResolver, ViewContainerRef, QueryList, ComponentFactory, ViewChildren,AfterViewInit } from '@angular/core';
 import { Location } from '@angular/common';
-import { AfterViewInit, Component, ComponentFactory, ComponentFactoryResolver, Inject, Injectable, Input, Optional, QueryList, ViewChildren, ViewContainerRef } from '@angular/core';
-import { IListItem, ItemTypeService, commonReducers } from '@farmmaps/common';
 import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
+import { commonReducers,ItemTypeService, IItem, Item,IListItem } from '@farmmaps/common';
 import { AbstractItemWidgetComponent } from '../item-list-item/item-list-item.component';
 
 

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

@@ -1,10 +1,10 @@
-import { Component, OnChanges, OnInit } from '@angular/core';
+import { Component, OnInit,  OnChanges, SimpleChanges } from '@angular/core';
+import {IItemLayer} from '../../models/item.layer';
 import { Store } from '@ngrx/store';
-import { createEmpty, extend } from 'ol/extent';
-import { Observable } from 'rxjs';
-import * as mapActions from '../../actions/map.actions';
-import { IItemLayer } from '../../models/item.layer';
 import * as mapReducers from '../../reducers/map.reducer';
+import * as mapActions from '../../actions/map.actions';
+import {createEmpty,extend } from 'ol/extent';
+import { Observable } from 'rxjs';
 
 @Component({
   selector: 'fm-map-layer-switcher',
@@ -32,9 +32,11 @@ export class LayerSwitcher  implements OnInit,OnChanges{
     this.showLayerSwitcher = this.store.select(mapReducers.selectGetShowLayerSwitcher);
   }
 
-  ngOnChanges() {
+  ngOnChanges(changes: SimpleChanges) {
   }
 
+
+
   handleClick(event:Event) {
     event.stopPropagation();
     this.store.dispatch(new mapActions.ShowLayerSwitcher(true));
@@ -45,6 +47,8 @@ export class LayerSwitcher  implements OnInit,OnChanges{
     this.store.dispatch(new mapActions.ShowLayerSwitcher(false));
   }
 
+
+
   handleOnToggleVisibility(itemLayer: IItemLayer) {
     this.store.dispatch(new mapActions.SetVisibility(itemLayer,!itemLayer.visible));
   }

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

@@ -1,5 +1,5 @@
-import { Component, Input } from '@angular/core';
+import {Component, Input} from '@angular/core';
-import { IHistogram } from '../../../models/color.map';
+import {IHistogram, ILayer} from '../../../models/color.map';
 
 @Component({
   selector: 'fm-map-histogram-details',

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

@@ -1,5 +1,5 @@
-import { AfterViewInit, Component, Input, OnInit } from '@angular/core';
+import { Component, OnInit, Input,AfterViewInit } from '@angular/core';
-import { IColor, ILayer, IRenderer } from '../../models/color.map';
+import { IColorMap, IColor, IColorEntry,ILayer, IRenderer } from '../../models/color.map';
 
 
 @Component({

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

@@ -5,12 +5,12 @@
 
 <div class="map-search collapsed" [ngClass]="{'collapsed':collapsedLocal,searchcollapsed:searchMinifiedLocal}" (click)="$event.stopPropagation()">
   <div class="card p-2">
-    <form class="form" (ngSubmit)="handleSearch()">
+    <form class="form" (ngSubmit)="handleSearch($event)">
       <div class="input-group">
-        <button type="button" class="btn btn-outline-secondary" (click)="handleToggleMenu()"><i class="fal fa-bars" aria-hidden="true"></i></button>
+        <button type="button" class="btn btn-outline-secondary" (click)="handleToggleMenu($event)"><i class="fal fa-bars" aria-hidden="true"></i></button>
-        <input #searchText class="form-control" type="text" (focus)="handleFocus()" [ngModel]="searchTextLocal" name="searchTextLocal" (ngModelChange)="handleChange($event)" [ngbTypeahead]="search" [resultTemplate]="rt" [inputFormatter]="formatter" (selectItem)="handleSelect($event)" placeholder="Search" i18n-placeholder />
+        <input #searchText class="form-control" type="text" (focus)="handleFocus($event)" [ngModel]="searchTextLocal" name="searchTextLocal" (ngModelChange)="handleChange($event)" [ngbTypeahead]="search" [resultTemplate]="rt" [inputFormatter]="formatter" (selectItem)="handleSelect($event)" placeholder="Search" i18n-placeholder />
         <button type="submit" class="btn btn-outline-secondary" [disabled]="disabled"><i class="fal fa-search"></i></button>
-        <button type="button" class="clear btn btn-outline-secondary" [disabled]="!clearEnabled" (click)="handleClearClick()"><i class="fas fa-times"></i></button>
+        <button type="button" class="clear btn btn-outline-secondary" [disabled]="!clearEnabled" (click)="handleClearClick($event)"><i class="fas fa-times"></i></button>
       </div>
       <div class="options">
         <div class="form-check">

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

@@ -1,9 +1,10 @@
-import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
+import { Component, Input, Output, OnInit, EventEmitter, SimpleChanges, OnChanges, ViewChild } from '@angular/core';
-import { IQueryState, TimespanService, TypeaheadService } from '@farmmaps/common';
+import { Observable ,  of,merge,forkJoin } from 'rxjs';
-import { Observable, forkJoin, of } from 'rxjs';
+import { debounceTime,distinctUntilChanged,tap,switchMap,catchError,map} from 'rxjs/operators';
-import { catchError, debounceTime, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators';
+import { TypeaheadService, TimespanService } from '@farmmaps/common';
-import { tassign } from 'tassign';
+import { IQueryState } from '@farmmaps/common';
 import { IPeriodState } from '../../models/period.state';
+import { tassign } from 'tassign';
 
 @Component({
   selector: 'fm-map-map-search',
@@ -53,6 +54,7 @@ export class MapSearchComponent {
   public searchMinifiedLocal = false;
   public periodLocal: IPeriodState = { startDate:new Date(new Date(Date.now()).getFullYear(), new Date(Date.now()).getMonth() - 3, 1), endDate:new Date(Date.now())};
   public filterOptionsLocal: IQueryState;
+  private extent: number[];
   public searchTextLocal: any;
   public searchTextLocalOutput: string; 
   public dateFilter = true; 
@@ -79,12 +81,12 @@ export class MapSearchComponent {
           catchError(() => {
             this.searchFailed = true;
             return of([]);
-          }),map( (sa:string[]) => sa.map((s) => ({"name":s,"type":"tag"})))),
+          }),map( (sa:string[]) => sa.map((s,i) => ({"name":s,"type":"tag"})))),
           this.typeaheadService.getCityTypeaheadItems(term).pipe(
             catchError(() => {
               this.searchFailed = true;
               return of([]);
-            }),map( (sa:string[]) => sa.map((s) => ({"name":s,"type":"city"})))),
+            }),map( (sa:string[]) => sa.map((s,i) => ({"name":s,"type":"city"})))),
         ).pipe(map(([a1,a2]) => [...a1, ...a2] ),map(a => a.sort((a, b) => (a.name.toUpperCase() > b.name.toUpperCase()) ? 1 : -1)))
       ),
       tap(() => this.searching = false),
@@ -92,7 +94,7 @@ export class MapSearchComponent {
 
   formatter = (x: { name: string }) => x.name;
 
-  handleSearch() {
+  handleSearch(event) {
     this.filterOptionsLocal.tags = null;
     this.filterOptionsLocal.itemType = null;
     this.filterOptionsLocal.itemCode = null;
@@ -166,11 +168,11 @@ export class MapSearchComponent {
   }
 
 
-  handleToggleMenu() {
+  handleToggleMenu(event) {
     this.onToggleMenu.emit({});
   }  
 
-  handleFocus() {
+  handleFocus(event) {
     this.onSearchExpand.emit({});
   }
 
@@ -185,7 +187,7 @@ export class MapSearchComponent {
       this.disabled = true;
   }
 
-  handleClearClick() {
+  handleClearClick(event) {
     this.onClear.emit({});
   }
 

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

@@ -61,7 +61,7 @@
     <fm-map-file-drop-target [parentCode]="state.parentCode" (onFileDropped)="handleFileDropped($event)"></fm-map-file-drop-target>
 
     <div *ngIf="noContent">
-      <fm-map-map-search #mapSearch [openedModalName]="state.openedModalName" (onOpenModal)="handleOpenModal($event)" (onCloseModal)="handleCloseModal()" [ngClass]="{'menuVisible':state.menuVisible}" (onToggleMenu)="handleToggleMenu()" (onSearchCollapse)="handleSearchCollapse()" (onSearchExpand)="handleSearchExpand()" [collapsed]="state.searchCollapsed" [searchMinified]="state.searchMinified" (onSearch)="handleSearch($event)" (onClear)="handleClearSearch()" [filterOptions]="state.queryState" [clearEnabled]="state.clearEnabled" [period]="state.period" (onPeriodChange)="handlePeriodChange($event)" (onCitySearch)="handleCitySearch($event)"></fm-map-map-search>
+      <fm-map-map-search #mapSearch [openedModalName]="state.openedModalName" (onOpenModal)="handleOpenModal($event)" (onCloseModal)="handleCloseModal()" [ngClass]="{'menuVisible':state.menuVisible}" (onToggleMenu)="handleToggleMenu($event)" (onSearchCollapse)="handleSearchCollapse($event)" (onSearchExpand)="handleSearchExpand($event)" [collapsed]="state.searchCollapsed" [searchMinified]="state.searchMinified" (onSearch)="handleSearch($event)" (onClear)="handleClearSearch($event)" [filterOptions]="state.queryState" [clearEnabled]="state.clearEnabled" [period]="state.period" (onPeriodChange)="handlePeriodChange($event)" (onCitySearch)="handleCitySearch($event)"></fm-map-map-search>
     </div>
     <div class="side-panel-container">
       

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

@@ -1,29 +1,42 @@
-/* eslint-disable no-prototype-builtins */
+import { Component, OnInit, OnDestroy, HostListener, ViewChild, AfterViewInit,NgZone,ElementRef } from '@angular/core';
-import { AfterViewInit, Component, ElementRef, HostListener, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { Location } from '@angular/common';
-import { ActivatedRoute, ParamMap, Router } from '@angular/router';
+import { Observable, Subject, Subscription, from,of ,EMPTY } from 'rxjs';
-import { DeviceService, GeolocatorService, IItem, IItemType, IQueryState, ItemTypeService, ResumableFileUploadService, StateSerializerService, commonActions, commonReducers } from '@farmmaps/common';
+import { withLatestFrom, switchMap,skip  } from 'rxjs/operators';
+import { Router, ActivatedRoute, ParamMap } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { Feature } from 'ol';
+import { DeviceService } from '@farmmaps/common';
-import { Extent, createEmpty, extend } from 'ol/extent';
+import {getRenderPixel} from 'ol/render';
-import { Circle, Geometry, Point } from 'ol/geom';
+
-import { transform } from 'ol/proj';
+// Map
-import { getRenderPixel } from 'ol/render';
-import * as style from 'ol/style';
-import { EMPTY, Observable, Subject, Subscription, from, of } from 'rxjs';
-import { skip, switchMap, withLatestFrom } from 'rxjs/operators';
-import { tassign } from 'tassign';
-import * as mapActions from '../../actions/map.actions';
-import { IClickedFeature } from '../../models/clicked.feature';
-import { IItemLayer } from '../../models/item.layer';
-import { IMapState } from '../../models/map.state';
-import { IPeriodState } from '../../models/period.state';
-import { ISelectedFeatures } from '../../models/selected.features';
-import { IStyles } from '../../models/style.cache';
 import * as mapReducers from '../../reducers/map.reducer';
-import { IQuery } from '../../reducers/map.reducer';
+import * as mapActions from '../../actions/map.actions';
-import { DeviceOrientationService } from '../../services/device-orientation.service';
+import { IMapState} from '../../models/map.state';
-import { GeolocationService } from '../../services/geolocation.service';
+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 { IDroppedFile } from '../aol/file-drop-target/file-drop-target.component';
+import { StateSerializerService } from '@farmmaps/common';
+import { GeolocationService} from '../../services/geolocation.service';
+import { GeolocatorService } from '@farmmaps/common';
+import {DeviceOrientationService} from '../../services/device-orientation.service';
+
+// AppCommon
+import { ResumableFileUploadService, ItemTypeService } from '@farmmaps/common';
+import { IItemType, IItem } from '@farmmaps/common';
+import {commonReducers} from '@farmmaps/common';
+import {commonActions} from '@farmmaps/common';
+
+import {Feature} from 'ol';
+import {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';
+
 
 @Component({
   selector: 'fm-map-map',
@@ -93,6 +106,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     private uploadService: ResumableFileUploadService,
     private serializeService: StateSerializerService,
     public itemTypeService: ItemTypeService,
+    private location: Location,
     private geolocationService: GeolocationService,
     private geolocaterService: GeolocatorService,
     private zone: NgZone,
@@ -375,15 +389,15 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     });
   }
 
-  handleSearchCollapse() {
+  handleSearchCollapse(event) {
     this.store.dispatch(new mapActions.CollapseSearch());
   }
 
-  handleSearchExpand() {
+  handleSearchExpand(event) {
     this.store.dispatch(new mapActions.ExpandSearch());
   }
 
-  handleToggleMenu() {
+  handleToggleMenu(event) {
     this.store.dispatch(new commonActions.ToggleMenu());
   }
 
@@ -464,11 +478,11 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
     });
   }
 
-  handleOnDownload() {
+  handleOnDownload(event) {
 
   }
 
-  handleClearSearch() {
+  handleClearSearch(event) {
     this.store.dispatch(new mapActions.Clear());
   }
 

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

@@ -1,5 +1,5 @@
 <ng-template #content let-c="close" let-d="dismiss">
-  <form [formGroup]="metaDataForm" (ngSubmit)="handleMetaDataEntered()">
+  <form [formGroup]="metaDataForm" (ngSubmit)="handleMetaDataEntered($event)">
     <div class="modal-header">
       <h4 class="modal-title" i18n>Add metadata</h4>
       <button type="button" class="close" aria-label="Close" (click)="d('Cross click'); onCloseModal.emit()">

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

@@ -1,8 +1,8 @@
-import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core';
+import { Component, Output, ViewChild, EventEmitter, Input, ElementRef, HostListener } from '@angular/core';
-import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import { UntypedFormGroup,UntypedFormBuilder, Validators } from '@angular/forms';
 import { IListItem } from '@farmmaps/common';
-import { NgbModal, NgbModalRef } from "@ng-bootstrap/ng-bootstrap";
 import { IDroppedFile } from '../aol/file-drop-target/file-drop-target.component';
+import {NgbModal, NgbModalRef} from "@ng-bootstrap/ng-bootstrap";
 
 export interface IMetaData {
   droppedFile: IDroppedFile,
@@ -37,7 +37,7 @@ export class MetaDataModalComponent {
 
   public metaDataForm: UntypedFormGroup;
 
-  handleMetaDataEntered() {
+  handleMetaDataEntered(event) {
     if (this.metaDataForm.valid) {
       this.onAddFilesWithMetaData.emit({ droppedFile: this.droppedFile, attributes: { name: this.metaDataForm.value.name } });
     }

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

@@ -1,6 +1,7 @@
-import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core';
+import { Component, Output, ViewChild, EventEmitter, Input, ElementRef, HostListener } from '@angular/core';
+import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { NgbModal, NgbModalRef, NgbDateStruct, NgbCalendar, NgbDateAdapter } from "@ng-bootstrap/ng-bootstrap";
 import { NgbDateNativeAdapter } from '@farmmaps/common';
-import { NgbDateStruct, NgbModal, NgbModalRef } from "@ng-bootstrap/ng-bootstrap";
 
 
 const equals = (one: NgbDateStruct, two: NgbDateStruct) =>
@@ -51,7 +52,7 @@ export class SelectPeriodModalComponent {
   @Output() onCloseModal = new EventEmitter<any>();
   @Output() onSelect = new EventEmitter<{ startDate: Date, endDate: Date }>();
   
-  constructor(private modalService: NgbModal) { }
+  constructor(private modalService: NgbModal, private calendar: NgbCalendar) { }
 
   openModal() {
       //Timeout trick to avoid ExpressionChangedAfterItHasBeenCheckedError 

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

@@ -1,8 +1,8 @@
-import { Component, ComponentFactory, ComponentFactoryResolver, Inject, Input, SimpleChanges, ViewChild } from '@angular/core';
+import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject, Type} from '@angular/core';
 import { IItem } from '@farmmaps/common';
-import { IItemLayer } from '../../models/item.layer';
 import { AbstractSelectedItemComponent, SelectedItemComponent  } from '../selected-item/selected-item.component';
 import { WidgetHostDirective } from '../widget-host/widget-host.directive';
+import { IItemLayer } from '../../models/item.layer';
 
 
 @Component({
@@ -28,6 +28,7 @@ export class SelectedItemContainerComponent {
 
     let selected = -1;
     let maxMatches =0;
+    const showItem = true;
     for (let i = 0; i < this.selectedItemComponents.length; i++) {
       let matches=0;
       let criteria=0;

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

@@ -1,15 +1,16 @@
+import { Component, Input, Injectable, OnInit } from '@angular/core';
 import { Location } from '@angular/common';
-import { Component, Injectable, OnInit } from '@angular/core';
+import { Feature } from 'ol';
-import { Router } from '@angular/router';
-import { FolderService, IItem, IListItem, ItemService, ItemTypeService, commonReducers } from '@farmmaps/common';
 import { Store } from '@ngrx/store';
-import { GeoJSON } from 'ol/format';
-import { getArea } from 'ol/sphere';
-import { Observable, of } from 'rxjs';
-import { combineLatest, switchMap } from 'rxjs/operators';
 import * as mapReducers from '../../reducers/map.reducer';
+import { commonReducers, ItemTypeService, IItem, Item, ItemService, FolderService, IListItem} from '@farmmaps/common';
+import { Router, ActivatedRoute, ParamMap, Event } from '@angular/router';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
+import { Observable,of } from 'rxjs';
+import {GeoJSON} from 'ol/format';
+import {getArea} from 'ol/sphere';
+import { withLatestFrom,switchMap,combineLatest } from 'rxjs/operators';
 
 
 @ForItemType("vnd.farmmaps.itemtype.cropfield")
@@ -23,7 +24,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) {
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
     super(store, itemTypeService,location,router);
   }
 
@@ -42,7 +43,7 @@ export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponen
     const atLocationItems = this.itemService$.getItemList(null,null,null,this.item.code,true);
     this.items =  childItems.pipe(
       combineLatest(atLocationItems),
-      switchMap(([ci, ali]) => {
+      switchMap(([ci,ali]) => {
           const retVal:IListItem[] = [];
           const codes = {};
           ci.forEach((listItem) => {

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

@@ -1,12 +1,12 @@
-import { Location } from '@angular/common';
 import { Component, Injectable } from '@angular/core';
-import { Router } from '@angular/router';
+import { Location } from '@angular/common';
-import { ItemTypeService, commonReducers } from '@farmmaps/common';
 import { Store } from '@ngrx/store';
-import * as mapActions from '../../actions/map.actions';
 import * as mapReducers from '../../reducers/map.reducer';
+import { commonReducers, ItemTypeService, ItemService, FolderService } from '@farmmaps/common';
+import { Router } from '@angular/router';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
+import * as mapActions from '../../actions/map.actions';
 
 
 @ForItemType("vnd.farmmaps.itemtype.geotiff.processed")
@@ -18,7 +18,7 @@ import { AbstractSelectedItemComponent } from '../selected-item/selected-item.co
 })
 export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent {
 
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router) {
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
     super(store, itemTypeService,location,router);
   }
 

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

@@ -1,12 +1,14 @@
+import { Component, Input, Injectable, OnInit } from '@angular/core';
 import { Location } from '@angular/common';
-import { Component, Injectable } from '@angular/core';
+import { Feature } from 'ol';
-import { Router } from '@angular/router';
-import { ItemTypeService, commonReducers } from '@farmmaps/common';
 import { Store } from '@ngrx/store';
-import * as mapActions from '../../actions/map.actions';
 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 { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
+import { Observable } from 'rxjs';
 
 
 @ForItemType("vnd.farmmaps.itemtype.shape.processed")
@@ -18,7 +20,7 @@ import { AbstractSelectedItemComponent } from '../selected-item/selected-item.co
 })
 export class SelectedItemShapeComponent extends AbstractSelectedItemComponent {
 
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router) {
+  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
     super(store, itemTypeService,location,router);
   }
   public selectedLayer = 0;

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

@@ -1,34 +1,35 @@
 import { Injectable } from '@angular/core';
 
-import { Actions, createEffect, ofType } from '@ngrx/effects';
+import { Store, Action, createFeatureSelector } from '@ngrx/store';
-import * as fromRouter from '@ngrx/router-store';
 import { ROUTER_NAVIGATED, RouterReducerState } from '@ngrx/router-store';
-import { Action, Store, createFeatureSelector } from '@ngrx/store';
+import * as fromRouter from '@ngrx/router-store';
+import { createEffect, Actions, ofType } from '@ngrx/effects';
 
 import { EMPTY, Observable, of } from 'rxjs';
-import { catchError, map, mergeMap, switchMap, withLatestFrom } from 'rxjs/operators';
+import { withLatestFrom, switchMap, map, catchError, mergeMap } from 'rxjs/operators';
 
-import { Feature } from 'ol';
-import { createEmpty, extend, getCenter } from 'ol/extent';
 import { GeoJSON, WKT } from 'ol/format';
-import { Geometry, Point } from 'ol/geom';
+import { Feature } from 'ol';
+import { getCenter, createEmpty, extend } from 'ol/extent';
+import { Point, Geometry } from 'ol/geom'
 
 
-import { commonReducers } from '@farmmaps/common';
 import * as mapActions from '../actions/map.actions';
 import * as mapReducers from '../reducers/map.reducer';
+import { commonReducers } from '@farmmaps/common';
 
 import { commonActions } from '@farmmaps/common';
 
-import { IItem, ItemService } from '@farmmaps/common';
+import { IItem } from '@farmmaps/common';
+import { FolderService, ItemService } from '@farmmaps/common';
 import { tassign } from 'tassign';
 
 import { FeatureIconService } from '../services/feature-icon.service';
 
 import * as style from 'ol/style';
 
-import { IQueryState } from '@farmmaps/common';
+import { ItemTypeService, IQueryState } from '@farmmaps/common';
-import { TemporalItemLayer } from '../models/item.layer';
+import { TemporalItemLayer } from '../models/item.layer'
 
 export const getRouterState = createFeatureSelector<RouterReducerState>('router');
 
@@ -64,7 +65,7 @@ export class MapEffects {
   init$ = createEffect(() => this.actions$.pipe(
     ofType(mapActions.INIT),
     withLatestFrom(this.store$.select(commonReducers.selectGetRootItems)),
-    switchMap(([, rootItems]) => {
+    switchMap(([action, rootItems]) => {
       const actions = [];
       for (const rootItem of rootItems) {
         if (rootItem.itemType == "UPLOADS_FOLDER") actions.push(new mapActions.SetParent(rootItem.code));
@@ -106,12 +107,12 @@ export class MapEffects {
   initBaseLayers$ = createEffect(() => this.actions$.pipe(
     ofType(mapActions.INIT),
     withLatestFrom(this.store$.select(mapReducers.selectGetProjection)),
-    map(([, projection]) => new mapActions.LoadBaseLayers(projection)))
+    map(([action, projection]) => new mapActions.LoadBaseLayers(projection)))
   );
 
   loadBaseLayers$ = createEffect(() => this.actions$.pipe(
     ofType(mapActions.LOADBASELAYERS),
-    switchMap(() => {
+    switchMap((action: mapActions.LoadBaseLayers) => {
       return this.itemService$.getItemList("vnd.farmmaps.itemtype.layer", { "isBaseLayer": true }).pipe(
         map((items: IItem[]) => new mapActions.LoadBaseLayersSuccess(items)),
         catchError(error => of(new commonActions.Fail(error))));
@@ -177,7 +178,7 @@ export class MapEffects {
 
   hideMenu$ = createEffect(() => this.actions$.pipe(
     ofType(mapActions.STARTSEARCHSUCCESS),
-    mergeMap(() => {
+    mergeMap((action: mapActions.StartSearchSuccess) => {
       return of(new commonActions.SetMenuVisible(false));
     })));
 
@@ -335,7 +336,7 @@ export class MapEffects {
     ofType(mapActions.ADDLAYER, mapActions.REMOVELAYER, mapActions.SELECTITEMSUCCESS, mapActions.SELECTTEMPORALITEMSSUCCESS, mapActions.NEXTTEMPORAL, mapActions.PREVIOUSTEMPORAL, mapActions.TOGGLELAYERVALUESENABLED, mapActions.SETLAYERINDEX, mapActions.SETSELECTEDITEMLAYER),
     withLatestFrom(this.store$.select(mapReducers.selectGetLayerValuesX)),
     withLatestFrom(this.store$.select(mapReducers.selectGetLayerValuesY)),
-    map(([[, x], y]) => new mapActions.SetLayerValuesLocation(x, y))
+    map(([[action, x], y]) => new mapActions.SetLayerValuesLocation(x, y))
   ));
 
 
@@ -401,7 +402,7 @@ export class MapEffects {
     })
   ));
 
-  constructor(private actions$: Actions, private store$: Store<mapReducers.State>, private itemService$: ItemService, private featureIconService$: FeatureIconService) {
+  constructor(private actions$: Actions, private store$: Store<mapReducers.State>, private folderService$: FolderService, private itemService$: ItemService, private featureIconService$: FeatureIconService, private itemTypeService$: ItemTypeService) {
     this._geojsonFormat = new GeoJSON();
     this._wktFormat = new WKT();
   }

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

@@ -1,5 +1,5 @@
-import { IItem } from '@farmmaps/common';
+import { IItem,IListItem } from '@farmmaps/common';
-import { Layer } from 'ol/layer';
+import {Layer} from 'ol/layer';
 import { Source } from 'ol/source';
 
 export interface IItemLayer  {

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

@@ -1,15 +1,21 @@
-import { IItem, IQueryState, commonActions } from '@farmmaps/common';
-import { ROUTER_NAVIGATION, RouterNavigationAction } from '@ngrx/router-store';
-import { createFeatureSelector, createSelector } from '@ngrx/store';
-import { Feature } from 'ol';
-import { Geometry } from 'ol/geom';
 import { tassign } from 'tassign';
-import * as mapActions from '../actions/map.actions';
+import { IItem,Item } from '@farmmaps/common';
-import { IItemLayer, ITemporalItemLayer, ItemLayer, TemporalItemLayer } from '../models/item.layer';
+import { IItemLayer,ItemLayer,ITemporalItemLayer,TemporalItemLayer} from '../models/item.layer';
-import { ILayervalue } from '../models/layer.value';
+import { IMapState} from '../models/map.state';
-import { IMapState } from '../models/map.state';
+import { IQueryState} from '@farmmaps/common';
 import { IPeriodState } from '../models/period.state';
-import { IStyles } from '../models/style.cache';
+import { IStyles} from '../models/style.cache';
+import { ILayervalue } from '../models/layer.value';
+import * as mapActions from '../actions/map.actions';
+import {commonActions} from '@farmmaps/common';
+import { createSelector, createFeatureSelector } from '@ngrx/store';
+
+import {Feature} from 'ol';
+import {Geometry} from 'ol/geom';
+
+
+import { ROUTER_NAVIGATION, RouterNavigationAction } from '@ngrx/router-store';
+
 import { MODULE_NAME } from '../module-name';
 
 const startDate:Date = new Date(new Date(Date.now()).getFullYear(), new Date(Date.now()).getMonth() - 3, 1);
@@ -119,6 +125,7 @@ export const initialState: State = {
 export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State {
   switch (action.type) {
     case ROUTER_NAVIGATION: {
+      const a = action as RouterNavigationAction;
       return tassign(state);
     }
     case mapActions.SETMAPSTATE: {
@@ -280,6 +287,9 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
         return state;
       }
     }
+    case mapActions.SELECTTEMPORAL:{
+      //todo implement
+    }
     case mapActions.STARTSEARCH: {
       const a = action as mapActions.StartSearch;
       const panelVisible = a.queryState.itemCode!=null ||a.queryState.itemType!=null||a.queryState.parentCode!=null || a.queryState.query != null || a.queryState.tags != null;
@@ -328,7 +338,8 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
     case mapActions.UPDATEFEATURESUCCESS: {
       const a = action as mapActions.UpdateFeatureSuccess;
       const features: any[] = [];
-      for (let i = 0; i < state.features.length; i++) {
+      var index = -1;
+      for (var i = 0; i < state.features.length; i++) {
         if (state.features[i].getId() == a.feature.getId()) {
           features.push(a.feature);
         } else {
@@ -408,7 +419,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       const a = action as mapActions.SetLayerIndex;
       if (a.itemLayer == null) {
         if(state.selectedItemLayer.item.itemType == "vnd.farmmaps.itemtype.temporal") {
-          const newItemlayer = tassign(state.selectedItemLayer,{layerIndex:a.layerIndex});
+          var newItemlayer = tassign(state.selectedItemLayer,{layerIndex:a.layerIndex});
           const tl = newItemlayer as ITemporalItemLayer;
           if(tl.previousItemLayer) {
             const nl = new ItemLayer(tl.previousItemLayer.item);
@@ -432,7 +443,6 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
             tl.nextItemLayer = nl;
           }
         } else {
-          // eslint-disable-next-line no-var
           var newItemlayer = new ItemLayer(state.selectedItemLayer.item);
           newItemlayer.layerIndex = a.layerIndex;
 
@@ -454,7 +464,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
         baseLayers.push(l);
       }
       let selectedBaseLayer: IItemLayer = null;
-      const mapState = tassign(state.mapState);
+      var mapState = tassign(state.mapState);
       const sb = baseLayers.filter(layer => layer.item.code === mapState.baseLayerCode);
       const db = baseLayers.filter(layer => layer.item.data && layer.item.data.default === true);
       if (baseLayers.length > 0 && mapState.baseLayerCode != "" && sb.length>0) {
@@ -476,7 +486,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       baseLayers.forEach((l) => l.visible = false);
       const i = state.baseLayers.indexOf(a.itemLayer);
       baseLayers[i].visible = true;
-      const mapState = tassign(state.mapState);
+      var mapState = tassign(state.mapState);
       mapState.baseLayerCode = a.itemLayer.item.code;
       return tassign(state, {mapState:mapState, baseLayers:baseLayers,selectedBaseLayer:a.itemLayer });
     }
@@ -550,8 +560,8 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
          });
       }
       if(state.features.length>0)  {
-        let index = -1;
+        var index = -1;
-        for (let i = 0; i < state.features.length; i++) {
+        for (var i = 0; i < state.features.length; i++) {
           if (state.features[i].getId() == a.itemCode ) {
             index=i;
           }

projects/common-map/src/fm-map/services/device-orientation.service.ts

@@ -15,6 +15,7 @@ export class DeviceOrientationService {
     // Calculate equation components
     const cA = Math.cos(alphaRad);
     const sA = Math.sin(alphaRad);
+    const cB = Math.cos(betaRad);
     const sB = Math.sin(betaRad);
     const cG = Math.cos(gammaRad);
     const sG = Math.sin(gammaRad);
@@ -22,6 +23,7 @@ export class DeviceOrientationService {
     // Calculate A, B, C rotation components
     const rA = - cA * sG - sA * sB * cG;
     const rB = - sA * sG + cA * sB * cG;
+    const rC = - cB * cG;
   
     // Calculate compass heading
     let compassHeading = Math.atan(rA / rB);

projects/common-map/src/fm-map/services/feature-icon.service.ts

@@ -1,4 +1,8 @@
-import { Injectable } from '@angular/core';
+import { Injectable} from '@angular/core';
+import { Feature } from 'ol';
+import { Point } from 'ol/geom';
+import * as extent from 'ol/extent';
+
 
 @Injectable()
 export class FeatureIconService {      

projects/common-map/src/fm-map/services/geolocation.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { Observer, Observable,BehaviorSubject } from 'rxjs';
 
 /**
  * GeolocationService class.

projects/common-map/src/fm-map/services/temporal.service.ts

@@ -1,7 +1,7 @@
-import { DatePipe } from '@angular/common';
+import { Injectable} from '@angular/core';
-import { Injectable } from '@angular/core';
+import {DatePipe} from '@angular/common';
-import { TimespanService } from '@farmmaps/common';
+import {TimespanService} from '@farmmaps/common';
-import { IItemLayer, ITemporalItemLayer } from '../models/item.layer';
+import { IItemLayer, ITemporalItemLayer,TemporalItemLayer} from '../models/item.layer';
 
 
 @Injectable()

projects/common-map/tsconfig.lib.json

@@ -22,9 +22,7 @@
       "node_modules/@angular/*"
 
       ]
-    },
+    }
-    "noUnusedLocals": true,
-    "noUnusedParameters": true
   },
   "angularCompilerOptions": {
     "skipTemplateCodegen": true,

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

@@ -22,9 +22,7 @@
       "node_modules/@angular/*"
 
       ]
-    },
+    }
-    "noUnusedLocals": true,
-    "noUnusedParameters": true
   },
   "angularCompilerOptions": {
     "skipTemplateCodegen": true,

projects/common-map3d/.eslintrc.js

@@ -18,6 +18,5 @@ module.exports = {
         "@typescript-eslint"
     ],
     "rules": {
-        "@typescript-eslint/no-explicit-any": "off"
     }
 }

projects/common-map3d/package-lock.json

@@ -11,17 +11,555 @@
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "^17.3.3",
+        "@angular/common": "^18.2.3",
-        "@angular/core": "^17.3.3",
+        "@angular/core": "^18.2.3",
-        "cesium": ">=1.82.1",
+        "cesium": "^1.97.0",
-        "ng-openlayers": "17.1.3",
         "ol-cesium": ">=2.13.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/@cesium/engine": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@cesium/engine/-/engine-11.0.0.tgz",
+      "integrity": "sha512-0z3mJNNly407h3/bAvGoGnjA0ygprkVz32z9x1VNmPXf9AuybKu7Q4wRrChUhC/qsNj3L45kP6KqyDuHSe2bhw==",
+      "peer": true,
+      "dependencies": {
+        "@tweenjs/tween.js": "^25.0.0",
+        "@zip.js/zip.js": "^2.7.34",
+        "autolinker": "^4.0.0",
+        "bitmap-sdf": "^1.0.3",
+        "dompurify": "^3.0.2",
+        "draco3d": "^1.5.1",
+        "earcut": "^3.0.0",
+        "grapheme-splitter": "^1.0.4",
+        "jsep": "^1.3.8",
+        "kdbush": "^4.0.1",
+        "ktx-parse": "^0.7.0",
+        "lerc": "^2.0.0",
+        "mersenne-twister": "^1.1.0",
+        "meshoptimizer": "^0.21.0",
+        "pako": "^2.0.4",
+        "protobufjs": "^7.1.0",
+        "rbush": "^4.0.0",
+        "topojson-client": "^3.1.0",
+        "urijs": "^1.19.7"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@cesium/widgets": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@cesium/widgets/-/widgets-8.0.0.tgz",
+      "integrity": "sha512-Rnid5BbLBZjwFdbr3lgOwK3fhql/BeEbf5l9ZZE+Zc7V8Fb6wgKM8QmrL+bbJ+BtuiELp+SkNxcF97Ktifxb4g==",
+      "peer": true,
+      "dependencies": {
+        "@cesium/engine": "^11.0.0",
+        "nosleep.js": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@petamoriken/float16": {
+      "version": "3.8.7",
+      "resolved": "https://registry.npmjs.org/@petamoriken/float16/-/float16-3.8.7.tgz",
+      "integrity": "sha512-/Ri4xDDpe12NT6Ex/DRgHzLlobiQXEW/hmG08w1wj/YU7hLemk97c+zHQFp0iZQ9r7YqgLEXZR2sls4HxBf9NA==",
+      "peer": true
+    },
+    "node_modules/@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==",
+      "peer": true
+    },
+    "node_modules/@protobufjs/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
+      "peer": true
+    },
+    "node_modules/@protobufjs/codegen": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
+      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==",
+      "peer": true
+    },
+    "node_modules/@protobufjs/eventemitter": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
+      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==",
+      "peer": true
+    },
+    "node_modules/@protobufjs/fetch": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
+      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
+      "peer": true,
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.1",
+        "@protobufjs/inquire": "^1.1.0"
+      }
+    },
+    "node_modules/@protobufjs/float": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
+      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
+      "peer": true
+    },
+    "node_modules/@protobufjs/inquire": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
+      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==",
+      "peer": true
+    },
+    "node_modules/@protobufjs/path": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
+      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==",
+      "peer": true
+    },
+    "node_modules/@protobufjs/pool": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
+      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==",
+      "peer": true
+    },
+    "node_modules/@protobufjs/utf8": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
+      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==",
+      "peer": true
+    },
+    "node_modules/@tweenjs/tween.js": {
+      "version": "25.0.0",
+      "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-25.0.0.tgz",
+      "integrity": "sha512-XKLA6syeBUaPzx4j3qwMqzzq+V4uo72BnlbOjmuljLrRqdsd3qnzvZZoxvMHZ23ndsRS4aufU6JOZYpCbU6T1A==",
+      "peer": true
+    },
+    "node_modules/@types/node": {
+      "version": "22.5.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+      "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
+      "peer": true,
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
+    },
+    "node_modules/@types/rbush": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/rbush/-/rbush-3.0.4.tgz",
+      "integrity": "sha512-knSt9cCW8jj1ZSFcFeBZaX++OucmfPxxHiRwTahZfJlnQsek7O0bazTJHWD2RVj9LEoejUYF2de3/stf+QXcXw==",
+      "peer": true
+    },
+    "node_modules/@zip.js/zip.js": {
+      "version": "2.7.52",
+      "resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.7.52.tgz",
+      "integrity": "sha512-+5g7FQswvrCHwYKNMd/KFxZSObctLSsQOgqBSi0LzwHo3li9Eh1w5cF5ndjQw9Zbr3ajVnd2+XyiX85gAetx1Q==",
+      "peer": true,
+      "engines": {
+        "bun": ">=0.7.0",
+        "deno": ">=1.0.0",
+        "node": ">=16.5.0"
+      }
+    },
+    "node_modules/autolinker": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-4.0.0.tgz",
+      "integrity": "sha512-fl5Kh6BmEEZx+IWBfEirnRUU5+cOiV0OK7PEt0RBKvJMJ8GaRseIOeDU3FKf4j3CE5HVefcjHmhYPOcaVt0bZw==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.3.0"
+      }
+    },
+    "node_modules/bitmap-sdf": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/bitmap-sdf/-/bitmap-sdf-1.0.4.tgz",
+      "integrity": "sha512-1G3U4n5JE6RAiALMxu0p1XmeZkTeCwGKykzsLTCqVzfSDaN6S7fKnkIkfejogz+iwqBWc0UYAIKnKHNN7pSfDg==",
+      "peer": true
+    },
+    "node_modules/cesium": {
+      "version": "1.121.1",
+      "resolved": "https://registry.npmjs.org/cesium/-/cesium-1.121.1.tgz",
+      "integrity": "sha512-WpdaGFd8qCOHiE9khV0sWWjCMXAX1U9Aou8MzMC/F0Akp6YqcOk4HLk4LLhZKeOjO/Bh27iTIW2mxEZ5+dtCxg==",
+      "peer": true,
+      "dependencies": {
+        "@cesium/engine": "^11.0.0",
+        "@cesium/widgets": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.0.0.tgz",
+      "integrity": "sha512-SbtvAMWvASO5TE2QP07jHBMXKafgdZz8Vrsrn96fiL+O92/FN/PLARzUW5sKt013fjAprK2d2iCn2hk2Xb5oow==",
+      "peer": true,
+      "engines": {
+        "node": ">=12.20"
+      }
+    },
+    "node_modules/color-parse": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/color-parse/-/color-parse-2.0.2.tgz",
+      "integrity": "sha512-eCtOz5w5ttWIUcaKLiktF+DxZO1R9KLNY/xhbV6CkhM7sR3GhVghmt6X6yOnzeaM24po+Z9/S1apbXMwA3Iepw==",
+      "peer": true,
+      "dependencies": {
+        "color-name": "^2.0.0"
+      }
+    },
+    "node_modules/color-rgba": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/color-rgba/-/color-rgba-3.0.0.tgz",
+      "integrity": "sha512-PPwZYkEY3M2THEHHV6Y95sGUie77S7X8v+h1r6LSAPF3/LL2xJ8duUXSrkic31Nzc4odPwHgUbiX/XuTYzQHQg==",
+      "peer": true,
+      "dependencies": {
+        "color-parse": "^2.0.0",
+        "color-space": "^2.0.0"
+      }
+    },
+    "node_modules/color-space": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-space/-/color-space-2.0.1.tgz",
+      "integrity": "sha512-nKqUYlo0vZATVOFHY810BSYjmCARrG7e5R3UE3CQlyjJTvv5kSSmPG1kzm/oDyyqjehM+lW1RnEt9It9GNa5JA==",
+      "peer": true
+    },
+    "node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "peer": true
+    },
+    "node_modules/dompurify": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.6.tgz",
+      "integrity": "sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==",
+      "peer": true
+    },
+    "node_modules/draco3d": {
+      "version": "1.5.7",
+      "resolved": "https://registry.npmjs.org/draco3d/-/draco3d-1.5.7.tgz",
+      "integrity": "sha512-m6WCKt/erDXcw+70IJXnG7M3awwQPAsZvJGX5zY7beBqpELw6RDGkYVU0W43AFxye4pDZ5i2Lbyc/NNGqwjUVQ==",
+      "peer": true
+    },
+    "node_modules/earcut": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/earcut/-/earcut-3.0.0.tgz",
+      "integrity": "sha512-41Fs7Q/PLq1SDbqjsgcY7GA42T0jvaCNGXgGtsNdvg+Yv8eIu06bxv4/PoREkZ9nMDNwnUSG9OFB9+yv8eKhDg==",
+      "peer": true
+    },
+    "node_modules/geotiff": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/geotiff/-/geotiff-2.1.3.tgz",
+      "integrity": "sha512-PT6uoF5a1+kbC3tHmZSUsLHBp2QJlHasxxxxPW47QIY1VBKpFB+FcDvX+MxER6UzgLQZ0xDzJ9s48B9JbOCTqA==",
+      "peer": true,
+      "dependencies": {
+        "@petamoriken/float16": "^3.4.7",
+        "lerc": "^3.0.0",
+        "pako": "^2.0.4",
+        "parse-headers": "^2.0.2",
+        "quick-lru": "^6.1.1",
+        "web-worker": "^1.2.0",
+        "xml-utils": "^1.0.2",
+        "zstddec": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10.19"
+      }
+    },
+    "node_modules/geotiff/node_modules/lerc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lerc/-/lerc-3.0.0.tgz",
+      "integrity": "sha512-Rm4J/WaHhRa93nCN2mwWDZFoRVF18G1f47C+kvQWyHGEZxFpTUi73p7lMVSAndyxGt6lJ2/CFbOcf9ra5p8aww==",
+      "peer": true
+    },
+    "node_modules/grapheme-splitter": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+      "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==",
+      "peer": true
+    },
+    "node_modules/jsep": {
+      "version": "1.3.9",
+      "resolved": "https://registry.npmjs.org/jsep/-/jsep-1.3.9.tgz",
+      "integrity": "sha512-i1rBX5N7VPl0eYb6+mHNp52sEuaS2Wi8CDYx1X5sn9naevL78+265XJqy1qENEk7mRKwS06NHpUqiBwR7qeodw==",
+      "peer": true,
+      "engines": {
+        "node": ">= 10.16.0"
+      }
+    },
+    "node_modules/kdbush": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz",
+      "integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==",
+      "peer": true
+    },
+    "node_modules/ktx-parse": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/ktx-parse/-/ktx-parse-0.7.1.tgz",
+      "integrity": "sha512-FeA3g56ksdFNwjXJJsc1CCc7co+AJYDp6ipIp878zZ2bU8kWROatLYf39TQEd4/XRSUvBXovQ8gaVKWPXsCLEQ==",
+      "peer": true
+    },
+    "node_modules/lerc": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lerc/-/lerc-2.0.0.tgz",
+      "integrity": "sha512-7qo1Mq8ZNmaR4USHHm615nEW2lPeeWJ3bTyoqFbd35DLx0LUH7C6ptt5FDCTAlbIzs3+WKrk5SkJvw8AFDE2hg==",
+      "peer": true
+    },
+    "node_modules/long": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==",
+      "peer": true
+    },
+    "node_modules/mersenne-twister": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mersenne-twister/-/mersenne-twister-1.1.0.tgz",
+      "integrity": "sha512-mUYWsMKNrm4lfygPkL3OfGzOPTR2DBlTkBNHM//F6hGp8cLThY897crAlk3/Jo17LEOOjQUrNAx6DvgO77QJkA==",
+      "peer": true
+    },
+    "node_modules/meshoptimizer": {
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/meshoptimizer/-/meshoptimizer-0.21.0.tgz",
+      "integrity": "sha512-WabtlpnK/GgD0GMwYd1fBTfYHf4MIcQPEg6dt7y4GuDcY51RzLSkSNE8ZogD7U3Vs2/fIf4z89TOLpA80EOnhg==",
+      "peer": true
+    },
+    "node_modules/nosleep.js": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/nosleep.js/-/nosleep.js-0.12.0.tgz",
+      "integrity": "sha512-9d1HbpKLh3sdWlhXMhU6MMH+wQzKkrgfRkYV0EBdvt99YJfj0ilCJrWRDYG2130Tm4GXbEoTCx5b34JSaP+HhA==",
+      "peer": true
+    },
+    "node_modules/ol": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/ol/-/ol-10.1.0.tgz",
+      "integrity": "sha512-/efepydpzhFoeczA9KAN5t7G0WpFhP46ZXEfSl6JbZ7ipQZ2axpkYB2qt0qcOUlPFYMt7/XQFApH652KB08tTg==",
+      "peer": true,
+      "dependencies": {
+        "@types/rbush": "^3.0.3",
+        "color-rgba": "^3.0.0",
+        "color-space": "^2.0.1",
+        "earcut": "^3.0.0",
+        "geotiff": "^2.0.7",
+        "pbf": "4.0.1",
+        "rbush": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/openlayers"
+      }
+    },
+    "node_modules/ol-cesium": {
+      "version": "2.17.0",
+      "resolved": "https://registry.npmjs.org/ol-cesium/-/ol-cesium-2.17.0.tgz",
+      "integrity": "sha512-XaMXjQYuq2eMPAgAx2e1wjN4I4QwfmPC+9YgU4xoMCj/MBj8oDQusyloQ4TaovypqbZg+0jJDDSZc7BhXckBwA==",
+      "peer": true,
+      "peerDependencies": {
+        "cesium": ">= 1.62.0",
+        "ol": ">= 6.0.1 || 7 || 8"
+      }
+    },
+    "node_modules/pako": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz",
+      "integrity": "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==",
+      "peer": true
+    },
+    "node_modules/parse-headers": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.5.tgz",
+      "integrity": "sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA==",
+      "peer": true
+    },
+    "node_modules/pbf": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pbf/-/pbf-4.0.1.tgz",
+      "integrity": "sha512-SuLdBvS42z33m8ejRbInMapQe8n0D3vN/Xd5fmWM3tufNgRQFBpaW2YVJxQZV4iPNqb0vEFvssMEo5w9c6BTIA==",
+      "peer": true,
+      "dependencies": {
+        "resolve-protobuf-schema": "^2.1.0"
+      },
+      "bin": {
+        "pbf": "bin/pbf"
+      }
+    },
+    "node_modules/protobufjs": {
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz",
+      "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==",
+      "hasInstallScript": true,
+      "peer": true,
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.2",
+        "@protobufjs/base64": "^1.1.2",
+        "@protobufjs/codegen": "^2.0.4",
+        "@protobufjs/eventemitter": "^1.1.0",
+        "@protobufjs/fetch": "^1.1.0",
+        "@protobufjs/float": "^1.0.2",
+        "@protobufjs/inquire": "^1.1.0",
+        "@protobufjs/path": "^1.1.2",
+        "@protobufjs/pool": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.0",
+        "@types/node": ">=13.7.0",
+        "long": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/protocol-buffers-schema": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
+      "integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==",
+      "peer": true
+    },
+    "node_modules/quick-lru": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-6.1.2.tgz",
+      "integrity": "sha512-AAFUA5O1d83pIHEhJwWCq/RQcRukCkn/NSm2QsTEMle5f2hP0ChI2+3Xb051PZCkLryI/Ir1MVKviT2FIloaTQ==",
+      "peer": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/quickselect": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-3.0.0.tgz",
+      "integrity": "sha512-XdjUArbK4Bm5fLLvlm5KpTFOiOThgfWWI4axAZDWg4E/0mKdZyI9tNEfds27qCi1ze/vwTR16kvmmGhRra3c2g==",
+      "peer": true
+    },
+    "node_modules/rbush": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/rbush/-/rbush-4.0.1.tgz",
+      "integrity": "sha512-IP0UpfeWQujYC8Jg162rMNc01Rf0gWMMAb2Uxus/Q0qOFw4lCcq6ZnQEZwUoJqWyUGJ9th7JjwI4yIWo+uvoAQ==",
+      "peer": true,
+      "dependencies": {
+        "quickselect": "^3.0.0"
+      }
+    },
+    "node_modules/resolve-protobuf-schema": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
+      "integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==",
+      "peer": true,
+      "dependencies": {
+        "protocol-buffers-schema": "^3.3.1"
+      }
+    },
+    "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/topojson-client": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/topojson-client/-/topojson-client-3.1.0.tgz",
+      "integrity": "sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==",
+      "peer": true,
+      "dependencies": {
+        "commander": "2"
+      },
+      "bin": {
+        "topo2geo": "bin/topo2geo",
+        "topomerge": "bin/topomerge",
+        "topoquantize": "bin/topoquantize"
+      }
+    },
     "node_modules/tslib": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
       "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+    },
+    "node_modules/undici-types": {
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+      "peer": true
+    },
+    "node_modules/urijs": {
+      "version": "1.19.11",
+      "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.11.tgz",
+      "integrity": "sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==",
+      "peer": true
+    },
+    "node_modules/web-worker": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/web-worker/-/web-worker-1.3.0.tgz",
+      "integrity": "sha512-BSR9wyRsy/KOValMgd5kMyr3JzpdeoR9KVId8u5GVlTTAtNChlsE4yTxeY7zMdNSyOmoKBv8NH2qeRY9Tg+IaA==",
+      "peer": true
+    },
+    "node_modules/xml-utils": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/xml-utils/-/xml-utils-1.10.1.tgz",
+      "integrity": "sha512-Dn6vJ1Z9v1tepSjvnCpwk5QqwIPcEFKdgnjqfYOABv1ngSofuAhtlugcUC3ehS1OHdgDWSG6C5mvj+Qm15udTQ==",
+      "peer": true
+    },
+    "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
+    },
+    "node_modules/zstddec": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/zstddec/-/zstddec-0.1.0.tgz",
+      "integrity": "sha512-w2NTI8+3l3eeltKAdK8QpiLo/flRAr2p8AGeakfMZOXBxOg9HIu4LVDxBi81sYgVhFhdJjv1OrB5ssI8uFPoLg==",
+      "peer": true
     }
   }
 }

projects/common-map3d/package.json

@@ -4,14 +4,13 @@
   "publishConfig": {
     "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
   },
-  "peerDependencies": {
-    "@angular/common":  "^17.3.3",
-    "@angular/core":  "^17.3.3",
-    "ng-openlayers": "17.1.3",
-    "cesium": ">=1.82.1",
-    "ol-cesium": ">=2.13.0"
-  },
   "dependencies": {
     "tslib": "^2.0.0"
+  },
+  "peerDependencies": {
+    "@angular/common": "^18.2.3",
+    "@angular/core":  "^18.2.3",
+    "cesium": "^1.97.0",
+    "ol-cesium": ">=2.13.0"
   }
 }

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

@@ -1,14 +1,15 @@
 import { NgModule } from '@angular/core';
+import { AppCommonModule } from '@farmmaps/common';
+import { AppCommonMapModule } from '@farmmaps/common-map';
+import { AngularOpenlayersModule } from '@farmmaps/ng-openlayers';
 import { Switch2D3DComponent } from './components/olcs/switch2d3d/switch2d3d.component';
-import { AppCommonModule} from '@farmmaps/common';
-import { AppCommonMapModule} from '@farmmaps/common-map';
-
 
 @NgModule({
   declarations: [Switch2D3DComponent],
   imports: [
     AppCommonModule,
-    AppCommonMapModule
+    AppCommonMapModule,
+    AngularOpenlayersModule,
   ],
   exports: [Switch2D3DComponent]
 })

projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.html

@@ -1 +1 @@
-<div *fmHasPackage="'vnd.farmmaps.itemtype.package.3d'" (click)="handleClick()" class="btn btn-outline-primary twotreed"><i class="fas fa-spinner fa-spin loading"  [ngClass]="{'loading':loading}"></i>{{label}}</div>
+<div *fmHasPackage="'vnd.farmmaps.itemtype.package.3d'" (click)="handleClick($event)" class="btn btn-outline-primary twotreed"><i class="fas fa-spinner fa-spin loading"  [ngClass]="{'loading':loading}"></i>{{label}}</div>

projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts

@@ -1,11 +1,11 @@
-import { Component, Input } from '@angular/core';
+import { Component, OnInit,Input,Host  } from '@angular/core';
-import { mapActions, mapReducers } from '@farmmaps/common-map';
+import { Interaction} from 'ol/interaction';
-import { Store } from '@ngrx/store';
+import { MapComponent } from '@farmmaps/ng-openlayers';
-import { MapComponent } from 'ng-openlayers';
-import { Interaction } from 'ol/interaction';
 import OLCesium from 'olcs/OLCesium';
 import RasterSynchronizer from 'olcs/RasterSynchronizer';
 import VectorSynchronizer from 'olcs/VectorSynchronizer';
+import { mapReducers,mapActions } from '@farmmaps/common-map';
+import { Store } from '@ngrx/store';
 
 @Component({
   selector: 'fm-map3d-switch2d3d',
@@ -49,7 +49,11 @@ export class Switch2D3DComponent {
       this.interactions=[];
       this.map.instance.getInteractions().forEach((i) => {
         if(i.getActive()) {
-          this.interactions.push(i);
+          // AW-6241 TODO How to fix?
+          // error TS2345: Argument of type 'import("C:/Project/Farmmaps/FarmMapsLib/node_modules/ol/interaction/Interaction").default'
+          // is not assignable to parameter of type 'import("C:/Project/Farmmaps/FarmMapsLib/projects/common-map3d/node_modules/ol/interaction/Interaction").default'.
+          // Line below commented out
+          // this.interactions.push(i);
           i.setActive(false);
         }
       });
@@ -61,7 +65,7 @@ export class Switch2D3DComponent {
     });
   }
 
-  handleClick() {
+  handleClick(event) {
     this.enable = !this.enable; 
     if(this.enable) {
       this.store.dispatch(new mapActions.SetViewState(false));

projects/common-map3d/tsconfig.lib.json

@@ -23,9 +23,7 @@
       "node_modules/@angular/*"
 
       ]
-    },
+    }
-    "noUnusedLocals": true,
-    "noUnusedParameters": true
   },
   "angularCompilerOptions": {
     "skipTemplateCodegen": true,

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

@@ -23,9 +23,7 @@
       "node_modules/@angular/*"
 
       ]
-    },
+    }
-    "noUnusedLocals": true,
-    "noUnusedParameters": true
   },
   "angularCompilerOptions": {
     "skipTemplateCodegen": true,

projects/common/.eslintrc.js

@@ -18,6 +18,5 @@ module.exports = {
         "@typescript-eslint"
     ],
     "rules": {
-        "@typescript-eslint/no-explicit-any": "off"
     }
 }

projects/common/package.json

@@ -1,25 +1,25 @@
 {
   "name": "@farmmaps/common",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "publishConfig": {
     "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
   },
   "peerDependencies": {
-    "@ng-bootstrap/ng-bootstrap": "^16.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^17.0.1",
-    "@angular/common": "^17.3.3",
+    "@angular/common": "^18.2.3",
-    "@angular/core": "^17.3.3",
+    "@angular/core": "^18.2.3",
-    "@angular/forms": "^17.3.3",
+    "@angular/forms": "^18.2.3",
-    "@ngrx/effects": "^17",
+    "@ngrx/effects": "^18.0.2",
-    "@ngrx/router-store": "^17",
+    "@ngrx/router-store": "^18.0.2",
-    "@ngrx/store": "^17",
+    "@ngrx/store": "^18.0.2",
     "tassign": "^1.0.0",
-    "bootstrap": "^5.2.0",
+    "bootstrap": "^5.3.3",
     "@microsoft/signalr": "^3.1.16",
     "ngx-uploadx": "^6.2.0",
-    "angular-oauth2-oidc": "^13",
+    "angular-oauth2-oidc": "^17.0.2",
     "moment": "^2.29.4",
-    "ngx-avatars": "1.7.0",
+    "ngx-avatars": "^1.8.0",
-    "ngx-image-cropper": "^7.2.1",
+    "ngx-image-cropper": "^7.0.0",
-    "ngx-clipboard": "16.0.0"
+    "ngx-clipboard": "^16.0.0"
   }
 }

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

@@ -71,6 +71,8 @@ export const TOGGLENOTIFICATIONMENU = '[AppCommon] ToggleNotificationMenu';
 
 export const TOGGLEHELPMENU = '[AppCommon] ToggleHelpMenu';
 
+export const TOGGLESETTINGMENU = '[AppCommon] ToggleSettingMenu';
+
 export const SETMENUVISIBLE = '[AppCommon] SetMenuVisible';
 
 export const ONLINE = '[AppCommon] Online';
@@ -332,6 +334,12 @@ export class ToggleHelpMenu implements Action {
   constructor() { }
 }
 
+export class ToggleSettingMenu implements Action {
+  readonly type = TOGGLESETTINGMENU;
+
+  constructor() { }
+}
+
 export class SetMenuVisible implements Action {
   readonly type = SETMENUVISIBLE;
 
@@ -408,6 +416,7 @@ export type Actions = OpenModal
   | ToggleAppMenu
   | ToggleNotificationMenu
   | ToggleHelpMenu
+  | ToggleSettingMenu
   | NotificationEvent
   | SetUnreadNotifications;
 

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

@@ -1,11 +1,12 @@
-import { NgModule } from '@angular/core';
+import {NgModule} from '@angular/core';
-import { RouterModule } from '@angular/router';
+import {RouterModule} from '@angular/router';
 
-import { AuthCallbackComponent } from './components/auth-callback/auth-callback.component';
+import {AuthCallbackComponent} from './components/auth-callback/auth-callback.component';
-import { NotFoundComponent } from './components/not-found/not-found.component';
+import {AuthCallbackGuard} from './components/auth-callback/auth-callback.guard';
-import { SessionClearedComponent } from './components/session-cleared/session-cleared.component';
+import {NavBarGuard} from './services/nav-bar-guard.service';
-import { FullScreenGuard } from './services/full-screen-guard.service';
+import {FullScreenGuard} from './services/full-screen-guard.service';
-import { NavBarGuard } from './services/nav-bar-guard.service';
+import {SessionClearedComponent} from './components/session-cleared/session-cleared.component';
+import {NotFoundComponent} from './components/not-found/not-found.component';
 import { ProductionGuard } from './services/production-guard.service';
 
 

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

@@ -1,6 +1,6 @@
 // angular modules
 import { CommonModule } from '@angular/common';
-import { HttpClientModule } from '@angular/common/http';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import { InjectionToken, NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 
@@ -34,6 +34,7 @@ import { HasClaimDirective } from './components/has-claim/has-claim.directive';
 import { HasPackageDirective } from './components/has-package/has-package.directive';
 import { HasRoleDirective } from './components/has-role/has-role.directive';
 import { HelpMenuComponent } from './components/help-menu/help-menu.component';
+import { SettingMenuComponent } from './components/setting-menu/setting-menu.component';
 import { ItemLinkComponent } from './components/item-link/item-link.component';
 import { MenuBackgroundComponent } from './components/menu-background/menu-background.component';
 import { NotFoundComponent } from './components/not-found/not-found.component';
@@ -55,8 +56,8 @@ import { IColor, IGradientstop } from './models/gradient';
 import { IItem, Item } from './models/item';
 import { IItemType } from './models/item.type';
 import { IItemTypes } from './models/item.types';
-import { IItemTask, ItemTask } from './models/itemTask';
 import { IItemLinkType } from './models/itemlink.type';
+import { IItemTask, ItemTask } from './models/itemTask';
 import { IJsonline } from './models/json-line';
 import { IListItem } from './models/list.item';
 import { IPackage, IPackages } from './models/package';
@@ -74,30 +75,15 @@ import { SecureOAuthStorage } from './shared/secureOAuthStorage';
 export const FM_COMMON_STARTPAGE = new InjectionToken<string>('fm-common-startpage');
 
 export {
-  Alert, AppComponent, AuthCallbackComponent, AuthConfigFactory, AvatarComponent, BackButtonComponent, EditImageModalComponent,
+  Alert, AppComponent, AuthCallbackComponent, AuthConfigFactory, AvatarComponent, BackButtonComponent, commonActions,
+  commonReducers, EditImageModalComponent,
   GradientComponent,
   GradientSelectComponent, HasClaimDirective, HasPackageDirective, HasRoleDirective, IAuthconfigFactory, IColor, IDataLayer, IEventMessage, IGradientstop, IItem, IItemLinkType, IItemTask, IItemType, IItemTypes, IJsonline, IListItem, IPackage,
-  IPackages, IQueryState, ISenMLItem, ITypeaheadItem, IUrlType, IUser, Item, ItemLinkComponent, ItemTask, MenuBackgroundComponent, NotFoundComponent,
+  IPackages, IQueryState, ISenMLItem, Item, ItemLinkComponent, ItemTask, ITypeaheadItem, IUrlType, IUser, MenuBackgroundComponent, NotFoundComponent,
-  NotImplementedComponent, PackageExistsDirective, ResumableFileUploadComponent, SafePipe, SecureOAuthStorage, SessionClearedComponent, SidePanelComponent, TagInputComponent, ThumbnailComponent, TimespanComponent, UserMenuComponent, WeatherCurrentObservation, commonActions,
+  NotImplementedComponent, PackageExistsDirective, ResumableFileUploadComponent, SafePipe, SecureOAuthStorage, SessionClearedComponent, SidePanelComponent, TagInputComponent, ThumbnailComponent, TimespanComponent, UserMenuComponent, WeatherCurrentObservation
-  commonReducers
 };
 
-@NgModule({
+@NgModule({ declarations: [
-  imports: [
-    CommonModule,
-    HttpClientModule,
-    AppCommonRoutingModule,
-    StoreModule.forFeature(MODULE_NAME, commonReducers.reducer),
-    EffectsModule.forFeature([commonEffects.AppCommonEffects]),
-    OAuthModule.forRoot(),
-    NgbModule,
-    FormsModule,
-    UploadxModule,
-    ClipboardModule,
-    AvatarModule,
-    ImageCropperModule
-  ],
-  declarations: [
         AppComponent,
         AuthCallbackComponent,
         SidePanelComponent,
@@ -119,6 +105,7 @@ export {
         AppMenuComponent,
         NotificationMenuComponent,
         HelpMenuComponent,
+        SettingMenuComponent,
         BackButtonComponent,
         ThumbnailComponent,
         EditImageModalComponent,
@@ -154,7 +141,16 @@ export {
         AvatarComponent,
         ItemLinkComponent,
         EditImageModalComponent
-  ]
+    ], imports: [CommonModule,
-})
+        AppCommonRoutingModule,
+        StoreModule.forFeature(MODULE_NAME, commonReducers.reducer),
+        EffectsModule.forFeature([commonEffects.AppCommonEffects]),
+        OAuthModule.forRoot(),
+        NgbModule,
+        FormsModule,
+        UploadxModule,
+        ClipboardModule,
+        AvatarModule,
+        ImageCropperModule], providers: [provideHttpClient(withInterceptorsFromDi())] })
 export class AppCommonModule {
 }

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

@@ -1,4 +1,4 @@
-<div class="app fullscreen" (click)="handleClick()" [ngClass]="{'fullscreen' :(fullScreen|async),'pagemode':(isPageMode|async),'appmode':!(isPageMode|async)}">
+<div class="app fullscreen" (click)="handleClick($event)" [ngClass]="{'fullscreen' :(fullScreen|async),'pagemode':(isPageMode|async),'appmode':!(isPageMode|async)}">
   <nav class="navbar navbar-light navbar-expand bg-light navigation-clean">
     <div class="container-fluid p-3 justify-content-start">
       <div class="header-logo pageonly"><router-outlet name="header-logo"></router-outlet></div> 
@@ -20,7 +20,7 @@
     <div class="container-fluid">
       <div class="body">
         <div class="d-flex flex-row">
-          <div class="mt-2 mb-2 flex-grow-1 logo" (click)="handleHome()"><router-outlet name="side-panel-logo"></router-outlet></div>
+          <div class="mt-2 mb-2 flex-grow-1 logo" (click)="handleHome($event)"><router-outlet name="side-panel-logo"></router-outlet></div>
           <div class="mt-2 mb-2 ms-2"><button type="button" class="btn btn-outline-secondary" (click)="handleToggleMenu($event)"><i class="fal fa-times" aria-hidden="true"></i></button></div>
         </div>
         <div class="d-flex flex-column cards"> 
@@ -33,6 +33,7 @@
     <fm-resumable-file-upload></fm-resumable-file-upload>
   </ng-container>  
   <div class="user-menu apponly">
+    <fm-setting-menu [user]="user|async" [showMenu]="settingMenuVisible|async"></fm-setting-menu>
     <fm-help-menu [user]="user|async" [showMenu]="helpMenuVisible|async"></fm-help-menu>
     <fm-notification-menu [user]="user|async" [unread]="unreadNotifications|async" [showMenu]="notificationMenuVisible|async"></fm-notification-menu>
     <fm-app-menu [user]="user|async" [showMenu]="appMenuVisible|async"></fm-app-menu>

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

@@ -119,7 +119,7 @@ body { background: #f1f1f1; line-height: 18px; user-select:none;font-family: Lat
   max-height:0em;
 }
 
-fm-help-menu,fm-app-menu,fm-user-menu,fm-notification-menu {
+fm-help-menu,fm-app-menu,fm-user-menu,fm-notification-menu,fm-setting-menu {
   display: inline-block;
   margin-left: 1rem;
 }

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

@@ -1,18 +1,21 @@
-import { ChangeDetectionStrategy, Component, HostListener, Inject, Input, OnDestroy, OnInit, Optional, ViewEncapsulation } from '@angular/core';
+import { Component, OnInit, OnDestroy, Inject, Optional, ViewEncapsulation, RendererFactory2, PLATFORM_ID, ChangeDetectionStrategy, HostListener, Input } from '@angular/core';
-import { NavigationEnd, NavigationStart, RouteConfigLoadEnd, RouteConfigLoadStart, Router } from '@angular/router';
+import { Router, NavigationStart, NavigationEnd, RouteConfigLoadStart, RouteConfigLoadEnd, ActivatedRoute, PRIMARY_OUTLET } from '@angular/router';
-import { Action, Store } from '@ngrx/store';
+import { Meta, Title, MetaDefinition } from '@angular/platform-browser'; import { DOCUMENT } from "@angular/common";
-import { OAuthErrorEvent, OAuthService } from 'angular-oauth2-oidc';
+import { Subscription, Observable } from 'rxjs';
-import { Observable, Subscription } from 'rxjs';
 import { distinctUntilChanged } from 'rxjs/operators';
-import { FM_COMMON_STARTPAGE } from '../../common.module';
+import { Store, Action } from '@ngrx/store';
 import { IUser } from '../../models/user';
+import { OAuthService, OAuthErrorEvent } from 'angular-oauth2-oidc';
+import { FM_COMMON_STARTPAGE } from '../../common.module';
 
 //AppCommon
-import * as commonActions from '../../actions/app-common.actions';
 import { IEventMessage } from '../../models/event.message';
 import { IListItem } from '../../models/list.item';
 import { EventService } from '../../services/event.service';
+import { ItemTypeService } from '../../services/itemtype.service';
+import * as  commonActions from '../../actions/app-common.actions';
 import { HealthCheckService } from '../../services/healthcheck.service';
+import { AppConfig } from '../../shared/app.config';
 
 import * as appReducers from '../../reducers/app-common.reducer';
 
@@ -24,6 +27,12 @@ import * as appReducers from '../../reducers/app-common.reducer';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class AppComponent implements OnInit, OnDestroy {
+
+  // This will go at the END of your title for example "Home - Angular Universal..." <-- after the dash (-)
+  private endPageTitle = 'Farmmaps';
+  // If no Title is provided, we'll use a default one before the dash(-)
+  private defaultPageTitle = 'Farmmaps';
+
   private routerSub$: Subscription;
   private eventSub$: Subscription;
 
@@ -36,6 +45,7 @@ export class AppComponent implements OnInit, OnDestroy {
   public accountMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetAccountMenuVisible);
   public appMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetAppMenuVisible);
   public notificationMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetNotificationMenuVisible);
+  public settingMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetSettingMenuVisible);
   public helpMenuVisible: Observable<boolean> = this.store$.select(appReducers.SelectGetHelpMenuVisible);
   public unreadNotifications: Observable<number> = this.store$.select(appReducers.SelectgetUnreadNotifications);
   public user: Observable<IUser> = this.store$.select(appReducers.SelectGetUser);
@@ -45,12 +55,19 @@ export class AppComponent implements OnInit, OnDestroy {
   constructor(
     @Optional() @Inject(FM_COMMON_STARTPAGE) public startPage: string,
     public router: Router,
+    private activatedRoute$: ActivatedRoute,
+    private title$: Title,
+    private meta$: Meta,
     private store$: Store<appReducers.State>,
     private eventService$: EventService,
     private healthCheckService$: HealthCheckService,
-    private oauthService$: OAuthService) {
+    private itemTypeService$: ItemTypeService,
+    private oauthService$: OAuthService,
+    private appConfig$: AppConfig
+  ) {
   }
 
+
   getActionFromEvent(event: IEventMessage): Action {
     let action: Action = null;
     //console.debug(`${event.eventType} Event received`);
@@ -147,28 +164,30 @@ export class AppComponent implements OnInit, OnDestroy {
   }
 
   private InstallRouteEventHandler() {
+    const other = this;
     this.routerSub$ = this.router.events.subscribe(event => {
       if (event instanceof RouteConfigLoadStart) {
-        this.store$.dispatch(new commonActions.StartRouteLoading());
+        other.store$.dispatch(new commonActions.StartRouteLoading());
       }
       if (event instanceof NavigationEnd && (event.url == "/" || event.url.startsWith("/content"))) {
-        this.store$.dispatch(new commonActions.SetPageMode(true));
+        other.store$.dispatch(new commonActions.SetPageMode(true));
       } else if (event instanceof NavigationEnd) {
-        this.store$.dispatch(new commonActions.SetPageMode(false));
+        other.store$.dispatch(new commonActions.SetPageMode(false));
       }
       if (event instanceof RouteConfigLoadEnd) {
-        this.store$.dispatch(new commonActions.EndRouteLoading());
+        other.store$.dispatch(new commonActions.EndRouteLoading());
       }
       if (event instanceof NavigationStart) {
-        this.store$.dispatch(new commonActions.SetMenuVisible(false));
+        other.store$.dispatch(new commonActions.SetMenuVisible(false));
       }
     });
   }
 
   private InstallEventServiceEventHandler() {
+    const other = this;
     this.eventSub$ = this.eventService$.event.subscribe(event => {
-      const action = this.getActionFromEvent(event);
+      const action = other.getActionFromEvent(event);
-      if (action) this.store$.dispatch(action);
+      if (action) other.store$.dispatch(action);
     });
   }
 
@@ -183,7 +202,7 @@ export class AppComponent implements OnInit, OnDestroy {
     });
   }
 
-  handleClick() {
+  handleClick(event: MouseEvent) {
     this.store$.dispatch(new commonActions.Escape(false, true));
   }
 
@@ -196,7 +215,7 @@ export class AppComponent implements OnInit, OnDestroy {
     this.store$.dispatch(new commonActions.ToggleMenu());
   }
 
-  handleHome() {
+  handleHome(event: MouseEvent) {
     this.router.navigate(['/']);
   }
 }

projects/common/src/fm/components/auth-callback/auth-callback.component.ts

@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 import { OAuthService } from 'angular-oauth2-oidc';
+import { Location} from '@angular/common';
 
 @Component({
     selector: 'fm-auth-callback',
@@ -9,11 +10,11 @@ import { OAuthService } from 'angular-oauth2-oidc';
 export class AuthCallbackComponent {
 
   constructor(private router$: Router,private oauthService$:OAuthService) {
-    this.oauthService$.loadDiscoveryDocument().then(() => {
+    oauthService$.loadDiscoveryDocument().then(() => {
-      this.oauthService$.tryLoginCodeFlow().then(() => {
+      oauthService$.tryLoginCodeFlow().then(() => {
-        this.router$.navigateByUrl((this.oauthService$.state && this.oauthService$.state!="")?decodeURIComponent(this.oauthService$.state):"");
+        router$.navigateByUrl((oauthService$.state && oauthService$.state!="")?decodeURIComponent(oauthService$.state):"");
       }).catch(() => {
-        this.router$.navigateByUrl("/");
+        router$.navigateByUrl("/");
       });    
     })
   }

projects/common/src/fm/components/back-button/back-button.component.ts

@@ -1,6 +1,6 @@
-import {Component, HostListener} from '@angular/core';
+import { Location } from "@angular/common";
-import {Location} from "@angular/common";
+import { Component, EventEmitter, HostListener, Output } from '@angular/core';
-import { DeviceService} from '../../services/device.service';
+import { DeviceService } from '../../services/device.service';
 
 @Component({
   selector: 'fm-back-button',
@@ -8,16 +8,18 @@ import { DeviceService} from '../../services/device.service';
   styleUrls: ['./back-button.component.scss']
 })
 export class BackButtonComponent {
+  @Output() beforeLocationBack = new EventEmitter();
 
   @HostListener('click')
   onBackClicked() {
+    this.beforeLocationBack.emit();
     this.location.back();
   }
 
-  constructor(private location: Location,private deviceService:DeviceService) { }
+  constructor(private location: Location,private deviceService:DeviceService) {    
+  }
 
   public show() {
     return !this.deviceService.IsMobile();
   }
-
 }

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

@@ -1,7 +1,8 @@
-import { Component, ElementRef, EventEmitter, OnInit, Output, ViewChild } from '@angular/core';
+import { Component, OnInit,ViewChild,ElementRef,EventEmitter, Output } from '@angular/core';
-import { NgbModal } from "@ng-bootstrap/ng-bootstrap";
+import { HttpClient, HttpParams, HttpHeaders } from "@angular/common/http";
-import { ImageCroppedEvent, LoadedImage } from 'ngx-image-cropper';
+import {NgbModal} from "@ng-bootstrap/ng-bootstrap"
-import { ImageService } from '../../services/image.service';
+import { ImageCroppedEvent,LoadedImage } from 'ngx-image-cropper';
+import {ImageService } from '../../services/image.service';
 
 @Component({
   selector: 'fm-edit-image-modal',
@@ -46,8 +47,7 @@ export class EditImageModalComponent implements OnInit {
   imageCropped(event: ImageCroppedEvent) {
       this.croppedImage = event.base64;
   }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  imageLoaded(image: LoadedImage) {
-  imageLoaded(_image: LoadedImage) {
     this.isImageLoaded=true;
   }
   cropperReady() {

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

@@ -1,8 +1,11 @@
-import { Directive, Input, OnInit, TemplateRef, ViewContainerRef } from '@angular/core';
+import { Directive, ViewContainerRef,TemplateRef,OnInit,Input,OnDestroy } from '@angular/core';
-import { Store } from '@ngrx/store';
+import { Store} from '@ngrx/store';
-import { Observable } from 'rxjs';
+import * as appCommonReducer from '../../reducers/app-common.reducer'
+import { IPackages } from '../../models/package';
+import { Observable, Subscription } from 'rxjs';
+import { skip } from 'rxjs/operators';
+import {OAuthService } from 'angular-oauth2-oidc';
 import { IUser } from '../../models/user';
-import * as appCommonReducer from '../../reducers/app-common.reducer';
 
 @Directive({
   selector: '[fm-hasclaim]',

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

@@ -34,8 +34,8 @@ export class HasPackageDirective implements OnDestroy, AfterViewInit {
 
   constructor(private hostTemplateRef: TemplateRef<any>, private viewContainerRef: ViewContainerRef,
               private store: Store<appCommonReducer.State>, private packageService: PackageService) {
-    this.thenTemplate = this.hostTemplateRef;
+    this.thenTemplate = hostTemplateRef;
-    this.packSub = this.store.select(appCommonReducer.SelectGetValidUserPackages).subscribe(() => {
+    this.packSub = this.store.select(appCommonReducer.SelectGetValidUserPackages).subscribe((_) => {
       this.updateView();
     });
   }

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

@@ -1,7 +1,7 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, OnInit,Input } from '@angular/core';
-import { Store } from '@ngrx/store';
+import { Store, Action } from '@ngrx/store';
-import * as commonActions from '../../actions/app-common.actions';
 import * as appReducers from '../../reducers/app-common.reducer';
+import * as  commonActions  from '../../actions/app-common.actions';
 
 @Component({
     selector: 'fm-menu-background',

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

@@ -34,8 +34,8 @@ export class PackageExistsDirective implements OnDestroy, AfterViewInit {
 
   constructor(private hostTemplateRef: TemplateRef<any>, private viewContainerRef: ViewContainerRef,
               private store: Store<appCommonReducer.State>, private packageService: PackageService) {
-    this.thenTemplate = this.hostTemplateRef;
+    this.thenTemplate = hostTemplateRef;
-    this.packSub = this.store.select(appCommonReducer.SelectGetPackages).subscribe(() => {
+    this.packSub = this.store.select(appCommonReducer.SelectGetPackages).subscribe((_) => {
       this.updateView();
     });
   }

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

@@ -1,9 +1,9 @@
-import { ChangeDetectorRef, Component, HostListener, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, Input,Output, HostListener, ChangeDetectorRef, OnDestroy, OnInit,EventEmitter } from '@angular/core';
-import { Store } from '@ngrx/store';
+import { ResumableFileUploadService, File } from './resumable-file-upload.service';
 import { Subscription } from 'rxjs';
-import * as commonActions from '../../actions/app-common.actions';
+import { Store } from '@ngrx/store';
 import * as commonReducer from '../../reducers/app-common.reducer';
-import { File, ResumableFileUploadService } from './resumable-file-upload.service';
+import * as commonActions from '../../actions/app-common.actions';
 
 
 @Component({
@@ -29,7 +29,7 @@ export class ResumableFileUploadComponent implements OnInit, OnDestroy {
 
     ngOnInit() {
       this.uploadService.init();
-      this.refreshSub = this.uploadService.refresh.subscribe(() => {
+      this.refreshSub = this.uploadService.refresh.subscribe((e: any) => {
         this.cd.markForCheck();
       });  
     }

projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.service.ts

@@ -1,7 +1,8 @@
 import { Injectable, OnDestroy } from '@angular/core';
 import { OAuthService } from 'angular-oauth2-oidc';
-import { UploadState, UploadxOptions, UploadxService } from 'ngx-uploadx';
+import { Subject , Subscription } from 'rxjs';
-import { Subject, Subscription } from 'rxjs';
+import { HttpClient } from "@angular/common/http";
+import { UploadxService, UploadState,UploadxOptions} from 'ngx-uploadx';
 import { AppConfig } from '../../shared/app.config';
 
 
@@ -18,7 +19,7 @@ export class ResumableFileUploadService implements OnDestroy{
   private _eventSub:Subscription;
   private initialized = false;
 
-  constructor(private oauthService: OAuthService,private uploadService: UploadxService,public appConfig: AppConfig) {
+  constructor(private httpClient: HttpClient,private oauthService: OAuthService,private uploadService: UploadxService,public appConfig: AppConfig) {
    
   }
 
@@ -40,9 +41,11 @@ export class ResumableFileUploadService implements OnDestroy{
 
   updatetotalprogress() {
     let totalProgress =0;
+    let n=0;
     for(let i =0;i<this.files.length;i++) {
       if(!this.files[i].error) {
         totalProgress+=this.files[i].progress;
+        n++;
       }
     }
     this.totalProgress=totalProgress/this.files.length;
@@ -83,7 +86,7 @@ export class ResumableFileUploadService implements OnDestroy{
       this.refresh.next({});
   }
 
-  addFiles = (files: any[], _event: any, metadata:any) => {
+  addFiles = (files: any[], event: any, metadata:any) => {
     for (const f of files) {
       const options:UploadxOptions = {metadata:metadata};
       this.uploadService.handleFiles(f,options);
@@ -130,6 +133,7 @@ export class ResumableFileUploadService implements OnDestroy{
 }
 
 export class File {
+  private file: any;
   public fileName: string;
   public progress: number;
   public identifier: string;
@@ -138,7 +142,9 @@ export class File {
   public error: boolean;
   public errorMessage: string;
 
+
   constructor(state: UploadState) {
+    this.file = state;
     this.fileName = state.file.name;
     this.progress = state.progress?state.progress:0;
     this.identifier = state.uploadId;

projects/common/src/fm/components/session-cleared/session-cleared.component.ts

@@ -1,8 +1,8 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { Router, ActivatedRoute, ParamMap } from '@angular/router';
 import { Store } from '@ngrx/store';
-import * as appCommonActions from '../../actions/app-common.actions';
 import * as appCommonReducers from '../../reducers/app-common.reducer';
+import * as appCommonActions from '../../actions/app-common.actions';
 
 
 

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

@@ -0,0 +1,8 @@
+<div>
+    <div (click)="toggle($event)" class="rounded-circle menu-button hidden"  [ngClass]="{'hidden':!user || noContent}">
+        <span i18n-title title="Settings"><i class="fas fa-gear" aria-hidden="true"></i></span>
+        <div class="menu hidden" [ngClass]="{'hidden':!showMenu}">                                     
+            <router-outlet name="setting-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()"></router-outlet>            
+       </div>
+    </div>
+</div>

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

@@ -0,0 +1,80 @@
+.menu-button {
+    background-color: gray;  
+    display: inline-block;
+    width: 2.5em;
+    height: 2.5em;
+    line-height: 2.5em;
+    text-align: center;
+    font-size: 1rem;
+    position: relative;
+}
+
+div.menu-button > span {
+    color:white;
+}
+
+.menu {
+    max-height: calc( 100vh - 4rem);
+    //transition: max-height 0.2s;
+    overflow: hidden;
+    box-shadow: 0 0 20px rgba(0,0,0,.3);
+    position: fixed;
+    top: 3.4rem;
+    right:0.5rem;
+    left:0.5rem;
+    background-color: #fff;
+    border-radius: 0.25rem;
+    padding: 0.5rem;
+    z-index: 3;
+}
+
+:host-context(.fullscreen)  .menu  {
+    top:4em;
+}
+
+.card {      
+    padding:0.5rem;
+    min-width: 10rem;          
+}
+
+.card-body {
+    text-align: left;
+}
+
+.hidden {
+    max-height: 0;   
+}
+
+.menu.hidden {
+    padding: 0;
+}
+
+.menu-button.hidden {
+    overflow: hidden;
+}
+
+
+@media screen and (min-width: 44rem)  {
+    .menu {
+        position: absolute;
+        top: 3rem;
+        right:0;
+        left: unset;
+        max-width: 30em;
+    }
+
+    :host-context(.fullscreen)  .menu  {
+        top: 3rem;
+    }
+}    
+
+.unread {
+    display: block;
+    position: absolute;
+    top:-0.5em;
+    right: -0.5em;
+}
+
+.unread.hidden {
+    display: none;
+}

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

@@ -0,0 +1,37 @@
+import { Input } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
+
+import { IUser } from '../../models/user';
+import {Store} from '@ngrx/store';
+import * as appReducers from '../../reducers/app-common.reducer';
+import * as appActions from '../../actions/app-common.actions';
+
+@Component({
+  selector: 'fm-setting-menu',
+  templateUrl: './setting-menu.component.html',
+  styleUrls: ['./setting-menu.component.scss']
+})
+export class SettingMenuComponent implements OnInit {
+  
+  @Input() user:IUser;
+  @Input() showMenu:boolean;
+  public noContent = true;
+
+  constructor(private store: Store<appReducers.State>) { }
+
+  ngOnInit(): void {
+  }
+
+  toggle(event:MouseEvent) {
+    event.stopPropagation();
+    this.store.dispatch(new appActions.ToggleSettingMenu());
+  } 
+
+  activateRoute() {
+    this.noContent=false;
+  }
+
+  deActivateRoute() {
+    this.noContent=true;
+  }
+}

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

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

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

@@ -1,4 +1,4 @@
-import { Component, ElementRef, EventEmitter, HostListener, Input, OnChanges, Output, SimpleChanges, ViewChild } from '@angular/core';
+import { Component, Input,Output,ViewChild,EventEmitter, ElementRef,OnChanges,SimpleChanges,HostListener,ChangeDetectorRef, ViewEncapsulation  } from '@angular/core';
 
 @Component({
   selector: 'fm-side-panel',
@@ -22,7 +22,7 @@ export class SidePanelComponent  implements OnChanges {
   private resizeTop=50;
   public resizing=false;
 
-  constructor(private element: ElementRef) {
+  constructor(private element: ElementRef,private ref: ChangeDetectorRef) {
     this.collapsable = false;
     this.setTop();
   }
@@ -46,7 +46,7 @@ export class SidePanelComponent  implements OnChanges {
     this.setTop();
   }
 
-  handleToggleClick() {
+  handleToggleClick(event) {
     if (this.collapsable) {
       this.collapsed = !this.collapsed;     
     }
@@ -85,7 +85,7 @@ export class SidePanelComponent  implements OnChanges {
   }
 
   @HostListener('window:resize', ['$event'])
-  handleResize() {
+  handleResize(event) {
     this.setTop();
   }
 }

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

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

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

@@ -65,7 +65,7 @@ export class TagInputComponent implements ControlValueAccessor {
     this.propagateChange(tags);
   }
 
-  handleBlur(keepFocus = true) {
+  handleBlur(event, keepFocus = true) {
     if (!this.typeahead.isPopupOpen()) {
       this.addTag(this.tag, keepFocus);
     } else {
@@ -89,7 +89,6 @@ export class TagInputComponent implements ControlValueAccessor {
     this.tag = '';
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   propagateChange = (_: any) => {
   };
 

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

@@ -1,4 +1,4 @@
-<div class="timespan p-1" (window:resize)="handleResize()">
+<div class="timespan p-1" (window:resize)="handleResize($event)">
    <div (click)="handleClick()">{{caption}}</div>
    <ng-template #popoverContent let-caption="popoverCaption">{{caption}}</ng-template>
    <div class="popover-anchor" [style.left.px] = "startPopoverLeft" [ngbPopover]="popoverContent" #popoverStart="ngbPopover">&nbsp;</div>
@@ -17,13 +17,13 @@
             <option value="8">Year</option>
           </select>      
      </div> -->
-     <div class="timeline" (window:mousemove)="handleMouseMove($event)" (window:touchmove)="handleMouseMove($event)" (window:mouseup)="handleMouseUp()" (window:touchend)="handleMouseUp()" (wheel)="handleMouseWheel($event)" [style.height.px]="height">
+     <div class="timeline" (window:mousemove)="handleMouseMove($event)" (window:touchmove)="handleMouseMove($event)" (window:mouseup)="handleMouseUp($event)" (window:touchend)="handleMouseUp($event)" (wheel)="handleMouseWheel($event)" [style.height.px]="height">
-        <canvas #timeLine (mousedown)="handleViewPanMouseDown($event)" (touchstart)="handleViewPanMouseDown($event)" (mousemove)="handleCanvasMouseMove($event)" (mouseleave)="handleCanvasMouseLeave()">
+        <canvas #timeLine (mousedown)="handleViewPanMouseDown($event)" (touchstart)="handleViewPanMouseDown($event)" (mousemove)="handleCanvasMouseMove($event)" (mouseleave)="handleCanvasMouseLeave($event)">
         </canvas>
         <div class="control-container"  [style.margin-left.px]="marginLeft" [style.height.px]="lineHeight" >
-            <div class="leftGrip rounded-start" (mousedown)="handleLeftGripMouseDown($event)" (touchstart)="handleLeftGripMouseDown($event)"   (mouseenter)="handleLeftGripMouseEnter()" (mouseleave)="handleLeftGripMouseLeave()"><i class="fal fa-ellipsis-v" aria-hidden="true"></i></div>
+            <div class="leftGrip rounded-start" (mousedown)="handleLeftGripMouseDown($event)" (touchstart)="handleLeftGripMouseDown($event)"   (mouseenter)="handleLeftGripMouseEnter($event)" (mouseleave)="handleLeftGripMouseLeave($event)"><i class="fal fa-ellipsis-v" aria-hidden="true"></i></div>
-            <div class="range" [style.width.px]="rangeWidth" (mousedown)="handleRangeGripMouseDown($event)" (touchstart)="handleRangeGripMouseDown($event)" (mouseenter)="handleRangeGripMouseEnter()"></div>
+            <div class="range" [style.width.px]="rangeWidth" (mousedown)="handleRangeGripMouseDown($event)" (touchstart)="handleRangeGripMouseDown($event)" (mouseenter)="handleRangeGripMouseEnter($event)"></div>
-            <div class="rightGrip rounded-end" (mousedown)="handleRightGripMouseDown($event)" (touchstart)="handleRightGripMouseDown($event)" (mouseenter)="handleRightGripMouseEnter()" (mouseleave)="handleRightGripMouseLeave()"><i class="fal fa-ellipsis-v" aria-hidden="true"></i></div>
+            <div class="rightGrip rounded-end" (mousedown)="handleRightGripMouseDown($event)" (touchstart)="handleRightGripMouseDown($event)" (mouseenter)="handleRightGripMouseEnter($event)" (mouseleave)="handleRightGripMouseLeave($event)"><i class="fal fa-ellipsis-v" aria-hidden="true"></i></div>
         </div>
      </div>
      <!-- <div>

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

@@ -1,6 +1,6 @@
+import { Component, OnInit,Input,ViewChild,OnChanges,ChangeDetectorRef,Output, EventEmitter,SimpleChanges } from '@angular/core';
 import { DatePipe } from '@angular/common';
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, OnInit, Output, ViewChild } from '@angular/core';
+import {NgbPopover} from '@ng-bootstrap/ng-bootstrap';
-import { NgbPopover } from '@ng-bootstrap/ng-bootstrap';
 
 export interface TimeSpan {
   startDate:Date;
@@ -73,8 +73,7 @@ export class TimespanComponent implements OnInit, OnChanges {
     canvas.width = this.elementWidth * this.ratio;
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  getPosibleUnits(scale:number):number[] {
-  getPosibleUnits(_scale:number):number[] {
     const posibleUnits = [];
     for(const u of [3,4,6,8]) {
       if((this.unitScale <=u) )
@@ -120,6 +119,7 @@ export class TimespanComponent implements OnInit, OnChanges {
   }
 
   getStartEndCaption(date:Date,otherDate:Date,unitScale:number,suffix = false,extended=true):string {    
+    const showSuffix = false;
     otherDate=new Date(otherDate.getTime()-1); // fix year edge case
     if(unitScale == 3) { 
       let format="HH:00";
@@ -234,6 +234,9 @@ export class TimespanComponent implements OnInit, OnChanges {
   }
 
   getNextTick(viewStartDate:Date, tick:number,step:number,unitScale:number):number {    
+    const unitTextWidth = this.getUnitTextWidth(unitScale);
+    const dateOffset =this.getUnitDateOffset(viewStartDate,unitScale,tick);
+    const date = new Date(viewStartDate.getTime() + dateOffset);
     let nextTick=tick+step+Math.trunc(step/2);
     const nextDateOffset =this.getUnitDateOffset(viewStartDate,unitScale,nextTick);
     const nextDate = new Date(viewStartDate.getTime() + nextDateOffset);    
@@ -344,8 +347,7 @@ export class TimespanComponent implements OnInit, OnChanges {
     this.caption=this.getCaption(startDate,endDate,this.unitScale);
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  snapToUnit(date:Date,unitScale:number):Date {
-  snapToUnit(date:Date,_unitScale:number):Date {
     const d = new Date(date.getTime() + (this.unitScales[this.unitScale]/2));
     const offsetInMilliseconds =this.getUnitDateOffset(d,this.unitScale,0)
     return new Date(d.getTime()+offsetInMilliseconds);
@@ -415,14 +417,14 @@ export class TimespanComponent implements OnInit, OnChanges {
     event.preventDefault();
   }
 
-  handleRightGripMouseEnter() {
+  handleRightGripMouseEnter(event:MouseEvent) {
     this.mouseX=-1;
     this.mouseY=-1;
     this.redraw();    
     if(!this.rangeGripMove && !this.leftGripMove && !this.rightGripMove)  this.popoverEnd.open(this.endCaption);
   }
 
-  handleRightGripMouseLeave() {
+  handleRightGripMouseLeave(event:MouseEvent) {
     if(!this.rightGripMove) this.popoverEnd.close();
   }
 
@@ -433,18 +435,18 @@ export class TimespanComponent implements OnInit, OnChanges {
     event.preventDefault();
   }
 
-  handleLeftGripMouseEnter() {
+  handleLeftGripMouseEnter(event:MouseEvent|TouchEvent) {
     this.mouseX=-1;
     this.mouseY=-1;
     this.redraw();
     if(!this.rangeGripMove && !this.leftGripMove && !this.rightGripMove) this.popoverStart.open(this.startCaption);
   }
 
-  handleLeftGripMouseLeave() {
+  handleLeftGripMouseLeave(event:MouseEvent) {
     if(!this.leftGripMove) this.popoverStart.close();
   }
 
-  handleRangeGripMouseEnter() {
+  handleRangeGripMouseEnter(event:MouseEvent) {
     this.mouseX=-1;
     this.mouseY=-1;
     this.redraw();    
@@ -462,7 +464,7 @@ export class TimespanComponent implements OnInit, OnChanges {
     event.preventDefault();
   }
 
-  handleMouseUp() {
+  handleMouseUp(event:MouseEvent|TouchEvent) {
     //this.updateControl(event);
     this.startDate = this.getStartDate(this.lastOffsetInPixels);
     this.endDate = this.getEndDate(this.lastOffsetInPixels);
@@ -496,7 +498,7 @@ export class TimespanComponent implements OnInit, OnChanges {
     this.redraw();
   }
 
-  handleCanvasMouseLeave() {
+  handleCanvasMouseLeave(event:MouseEvent) {
     this.mouseX = -1;
     this.mouseY = -1;
     this.redraw();
@@ -508,6 +510,7 @@ export class TimespanComponent implements OnInit, OnChanges {
       return true;
     } else {
       nextScale*=1.1;
+      const canZoom=false;
       const oneUnit = (this.getUnitDateOffset(this.viewMinDate,8,1)- this.getUnitDateOffset(this.viewMinDate,8,0)) / nextScale;   
       const unitTextWidth=this.getUnitTextWidth(8);
       const steps=this.getSteps(8);
@@ -562,7 +565,7 @@ export class TimespanComponent implements OnInit, OnChanges {
     this.updateStyle(this.startDate,this.endDate);
   }
 
-  handleResize() {
+  handleResize(event:any) {
     if(this.initialized) {
       this.setCanvasSize();
       this.updateStyle(this.startDate,this.endDate);
@@ -570,7 +573,7 @@ export class TimespanComponent implements OnInit, OnChanges {
     }   
   }
 
-  ngOnChanges() {
+  ngOnChanges (changes: SimpleChanges) {
     if(this.initialized) {
       this.setCanvasSize();
       this.updateStyle(this.startDate,this.endDate);

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

@@ -20,7 +20,7 @@ export class AppCommonEffects {
   login$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.LOGIN),
     withLatestFrom(this.store$.select(appCommonReducers.selectGetInitialized)),
-    mergeMap(([action]) => {
+    mergeMap(([action, initialized]) => {
       const a = (action as appCommonActions.Login);
       this.oauthService$.initCodeFlow(a.url,{"prompt":"login"});
       return [];
@@ -28,14 +28,14 @@ export class AppCommonEffects {
 
     logout$ =  createEffect(() => this.actions$.pipe(
       ofType(appCommonActions.LOGOUT),
-      mergeMap(() => {
+      mergeMap((action) => {
         this.oauthService$.revokeTokenAndLogout();
         return [];
       })),{dispatch:false});
 
   loadItemTypes$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.LOADITEMTYPES),
-    switchMap(() => {
+    switchMap((action) => {
       return this.itemService$.getItemTypes().pipe(
         map((itemTypes: IItemTypes) => new appCommonActions.LoadItemTypesSuccess(itemTypes)),
         catchError(error => of(new appCommonActions.Fail(error))))
@@ -45,7 +45,7 @@ export class AppCommonEffects {
   initUser$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.INITUSER),
     first(),
-    switchMap(() => {
+    switchMap((action) => {
         return zip(this.userService$.getCurrentUser(),from(this.oauthService$.loadUserProfile())).pipe(
         switchMap(([user,userInfo]) => {return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))} ),
         catchError(error => of(new appCommonActions.Fail(error))))
@@ -85,7 +85,7 @@ export class AppCommonEffects {
   
   initUserSettingsRoot$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.INITUSERSETTINGSROOT),
-    switchMap(() => {
+    switchMap(_ => {
       return this.folderService$.getFolder('my_settings').pipe(
         switchMap((item) => of(new appCommonActions.InitUserSettingsRootSuccess(item))),
         catchError(error =>  of(new appCommonActions.Fail(error)))
@@ -134,10 +134,10 @@ export class AppCommonEffects {
       withLatestFrom(this.store$.select(appCommonReducers.selectGetItemTypes)),
       switchMap(([action, itemtypes]) => {
         const a = action as appCommonActions.EditItem;
-        let editor =  "property";
+        var editor =  "property";
         if(a.item.itemType) {
           const itemType = itemtypes[a.item.itemType];
-          editor = itemType && itemType.editor ? itemType.editor : editor;  
+          var editor = itemType && itemType.editor ? itemType.editor : editor;  
         }
       this.router$.navigate(['/editor',editor,'item', a.item.code])
       return [];
@@ -148,7 +148,7 @@ export class AppCommonEffects {
     ofType(appCommonActions.VIEWITEM),
     withLatestFrom(this.store$.select(appCommonReducers.selectGetItemTypes)),
     switchMap(([action, itemtypes]) => {
-      const a = action as appCommonActions.EditItem;
+      const a = action as appCommonActions.ViewItem;
       const itemType = itemtypes[a.item.itemType];
       const viewer = itemType.viewer;
       const editor = itemType.editor;
@@ -179,14 +179,15 @@ export class AppCommonEffects {
  
   fail$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.FAIL),
-    map(() => {
+    map((action) => {
+      const failAction = action as appCommonActions.Fail;
       //console.debug(failAction.payload)
       return null;
     })),{dispatch:false});
 
     online$ =  createEffect(() => this.actions$.pipe(
       ofType(appCommonActions.ONLINE),
-      switchMap(() => {
+      switchMap((action) => {
           //console.debug("Online: Check token");
           if(!this.oauthService$.hasValidAccessToken()) {
             //console.debug("No valid token, try to refresh");

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

@@ -25,6 +25,7 @@ export class Item implements IItem {
   public state?: number;
   public data?:any;
   public isEditable?:boolean;
+  public owner?: string;
 
   constructor() {  
   }

projects/common/src/fm/models/list.item.ts

@@ -11,4 +11,5 @@ export interface IListItem {
     size?: number;
     state?: number;
     thumbnail?: boolean;
+    owner?: string;
 }

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

@@ -1,14 +1,14 @@
-import { createFeatureSelector, createSelector } from '@ngrx/store';
 import { tassign } from 'tassign';
-import * as appCommonActions from '../actions/app-common.actions';
+import { IItemTypes} from '../models/item.types';
-import { IItemTypes } from '../models/item.types';
 import { IListItem } from '../models/list.item';
-import { IPackageMap, IPackages } from '../models/package';
 import { IUser } from '../models/user';
+import { IPackage,IPackageMap,IPackages} from '../models/package';
+import * as appCommonActions from '../actions/app-common.actions';
+import { createSelector, createFeatureSelector, ActionReducerMap } from '@ngrx/store';
 
-import { IItem } from '../models/item';
 import { MODULE_NAME } from '../module-name';
-import { getValidPackages } from '../services/package.service';
+import { IItem } from '../models/item';
+import {getValidPackages, isValidPackage} from '../services/package.service';
 
 export interface State {
   openedModalName: string,
@@ -26,6 +26,7 @@ export interface State {
   appMenuVisible: boolean,
   notificationMenuVisible: boolean,
   helpMenuVisible: boolean,
+  settingMenuVisible: boolean,
   unreadNotifications: number,
   isOnline: boolean,
   isPageMode:boolean
@@ -47,6 +48,7 @@ export const initialState: State = {
   appMenuVisible: false,
   notificationMenuVisible: false,
   helpMenuVisible: false,
+  settingMenuVisible: false,
   unreadNotifications: 0,
   isOnline: true,
   isPageMode: true
@@ -106,26 +108,29 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
       });
     }
     case appCommonActions.TOGGLEMENU: {
-      return tassign(state, { menuVisible: !state.menuVisible,accountMenuVisible:!state.menuVisible?false:state.accountMenuVisible,appMenuVisible:!state.menuVisible?false:state.appMenuVisible,notificationMenuVisible:!state.menuVisible?false:state.notificationMenuVisible,helpMenuVisible:!state.menuVisible?false:state.helpMenuVisible });
+      return tassign(state, { menuVisible: !state.menuVisible,accountMenuVisible:!state.menuVisible?false:state.accountMenuVisible,appMenuVisible:!state.menuVisible?false:state.appMenuVisible,notificationMenuVisible:!state.menuVisible?false:state.notificationMenuVisible,helpMenuVisible:!state.menuVisible?false:state.helpMenuVisible,settingMenuVisible:!state.menuVisible?false:state.settingMenuVisible });
     }
     case appCommonActions.TOGGLEACCOUNTMENU: {
-      return tassign(state, { accountMenuVisible: !state.accountMenuVisible,appMenuVisible:false,notificationMenuVisible:false,helpMenuVisible:false });
+      return tassign(state, { accountMenuVisible: !state.accountMenuVisible,appMenuVisible:false,notificationMenuVisible:false,helpMenuVisible:false,settingMenuVisible:false });
     }
     case appCommonActions.TOGGLEAPPMENU: {
-      return tassign(state, { appMenuVisible: !state.appMenuVisible,accountMenuVisible:false,notificationMenuVisible:false,helpMenuVisible:false });
+      return tassign(state, { appMenuVisible: !state.appMenuVisible,accountMenuVisible:false,notificationMenuVisible:false,helpMenuVisible:false,settingMenuVisible:false });
     }
     case appCommonActions.TOGGLENOTIFICATIONMENU: {
-      return tassign(state, { notificationMenuVisible : !state.notificationMenuVisible,accountMenuVisible:false,appMenuVisible:false,helpMenuVisible:false });
+      return tassign(state, { notificationMenuVisible : !state.notificationMenuVisible,accountMenuVisible:false,appMenuVisible:false,helpMenuVisible:false,settingMenuVisible:false });
     }
     case appCommonActions.TOGGLEHELPMENU: {
-      return tassign(state, { helpMenuVisible : !state.helpMenuVisible,accountMenuVisible:false,appMenuVisible:false,notificationMenuVisible:false });
+      return tassign(state, { helpMenuVisible : !state.helpMenuVisible,accountMenuVisible:false,appMenuVisible:false,notificationMenuVisible:false,settingMenuVisible:false });
+    }
+    case appCommonActions.TOGGLESETTINGMENU: {
+      return tassign(state, { settingMenuVisible : !state.settingMenuVisible,accountMenuVisible:false,appMenuVisible:false,notificationMenuVisible:false,helpMenuVisible:false });
     }
     case appCommonActions.ESCAPE: {
-      return tassign(state, { menuVisible: false,accountMenuVisible:false,appMenuVisible: false,notificationMenuVisible:false,helpMenuVisible:false });
+      return tassign(state, { menuVisible: false,accountMenuVisible:false,appMenuVisible: false,notificationMenuVisible:false,helpMenuVisible:false,settingMenuVisible:false });
     }
     case appCommonActions.SETMENUVISIBLE: {
       const a = action as appCommonActions.SetMenuVisible;
-      return tassign(state, { menuVisible: a.visible,accountMenuVisible:a.visible?false:state.accountMenuVisible,appMenuVisible:a.visible?false:state.appMenuVisible,notificationMenuVisible:a.visible?false:state.notificationMenuVisible,helpMenuVisible:a.visible?false:state.helpMenuVisible });
+      return tassign(state, { menuVisible: a.visible,accountMenuVisible:a.visible?false:state.accountMenuVisible,appMenuVisible:a.visible?false:state.appMenuVisible,notificationMenuVisible:a.visible?false:state.notificationMenuVisible,helpMenuVisible:a.visible?false:state.helpMenuVisible,settingMenuVisible:a.visible?false:state.settingMenuVisible });
     }
     case appCommonActions.INITUSERPACKAGESSUCCESS:{
       const a = action as appCommonActions.InitUserPackagesSuccess;
@@ -203,6 +208,7 @@ export const getAccountMenuVisible = (state: State) => state.accountMenuVisible;
 export const getAppMenuVisible = (state: State) => state.appMenuVisible;
 export const getNotificationMenuVisible = (state: State) => state.notificationMenuVisible;
 export const getHelpMenuVisible = (state: State) => state.helpMenuVisible;
+export const getSettingMenuVisible = (state: State) => state.settingMenuVisible;
 export const getUnreadNotifications = (state: State) => state.unreadNotifications;
 export const getIsOnline = (state: State) => state.isOnline;
 export const getIsPageMode = (state: State) => state.isPageMode;
@@ -227,6 +233,7 @@ export const SelectGetAccountMenuVisible = createSelector(selectAppCommonState,g
 export const SelectGetAppMenuVisible = createSelector(selectAppCommonState,getAppMenuVisible);
 export const SelectGetNotificationMenuVisible = createSelector(selectAppCommonState,getNotificationMenuVisible);
 export const SelectGetHelpMenuVisible = createSelector(selectAppCommonState,getHelpMenuVisible);
+export const SelectGetSettingMenuVisible = createSelector(selectAppCommonState,getSettingMenuVisible);
 export const SelectgetUnreadNotifications = createSelector(selectAppCommonState,getUnreadNotifications);
 
 export const SelectGetIsOnline = createSelector(selectAppCommonState,getIsOnline);

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

@@ -2,13 +2,16 @@ import { HttpClient, HttpParams } from "@angular/common/http";
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { IItem } from '../models/item';
+import { IItemTask } from '../models/itemTask';
+import { IUser } from '../models/user';
 import { AppConfig } from "../shared/app.config";
+import { ItemTypeService } from './itemtype.service';
 
 @Injectable({
   providedIn: 'root',
 })
 export class AdminService {
-  constructor(public httpClient: HttpClient, public appConfig: AppConfig) {
+  constructor(public httpClient: HttpClient, public appConfig: AppConfig,private itemTypeService:ItemTypeService) {
   }
 
   ApiEndpoint() {
@@ -41,4 +44,12 @@ export class AdminService {
   deleteItem(code: string): Observable<any> {
     return this.httpClient.delete<any>(`${this.ApiEndpoint()}/api/v1/admin/${code}`);
   }
+
+  getAllUsers(): Observable<IUser[]> {
+    return this.httpClient.get<IUser[]>(`${this.ApiEndpoint()}/api/v1/admin/users`);
+  }
+
+  postItemTask(item: IItem, task: IItemTask): Observable<IItemTask> {
+    return this.httpClient.post<IItemTask>(`${this.ApiEndpoint()}/api/v1/admin/${item.code}/tasks`, task);
+  }
 }

projects/common/src/fm/services/auth-guard.service.ts

@@ -1,14 +1,21 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Route, RouterStateSnapshot, UrlSegment, UrlTree } from '@angular/router';
+import { Router, Route, ActivatedRouteSnapshot, RouterStateSnapshot, UrlSegment, UrlTree } from '@angular/router';
+
+
+import { Store } from '@ngrx/store';
 import { OAuthService } from 'angular-oauth2-oidc';
 import { Observable } from 'rxjs';
 
+
+import * as appCommonReducer from '../reducers/app-common.reducer';
+
+
 @Injectable({
   providedIn: 'root',
 })
 export class AuthGuard   { 
  
-  constructor(private oauthService: OAuthService) { }
+  constructor(private oauthService: OAuthService, private router: Router, private store: Store<appCommonReducer.State>) { }
   
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean | UrlTree | Observable<boolean | UrlTree> | Promise<boolean | UrlTree> {
     //console.debug("AuthGuard->canActivate", route, state);
@@ -24,8 +31,7 @@ export class AuthGuard   {
     return this.checkLogin(url, childRoute);
   }
   
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  canLoad(route: Route, segments: UrlSegment[]): boolean | UrlTree | Observable<boolean | UrlTree> | Promise<boolean | UrlTree> {
-  canLoad(route: Route, _segments: UrlSegment[]): boolean | UrlTree | Observable<boolean | UrlTree> | Promise<boolean | UrlTree> {
     //console.debug("AuthGuard->canLoad", route, segments);
     return this.checkLogin(route.path, null);
   }

projects/common/src/fm/services/date-adapter.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Component, Injectable } from '@angular/core';
 import { NgbDateAdapter, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
 
 @Injectable({