Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop

This reverts commit df14427d60.

.gitignore

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

Jenkinsfile

@@ -4,7 +4,7 @@ pipeline {
   agent any;
   options {
     copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
-    disableConcurrentBuilds abortPrevious: true;
+    disableConcurrentBuilds();
   }
   stages {
     stage('FarmmapsLibBuildAll') {

Jenkinsfile.develop

@@ -4,7 +4,7 @@ pipeline {
   agent any;
   options {
     copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
-    disableConcurrentBuilds abortPrevious: true;
+    disableConcurrentBuilds();
   }
   stages {
     stage('FarmmapsLibBuildAll') {

README.md

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

angular.json

@@ -209,13 +209,13 @@
           "options": {
             "tsConfig": "projects/common-map/tsconfig.lib.json",
             "project": "projects/common-map/ng-package.json"
-          }
+          },
-        ,          "configurations": {
+          "configurations": {
               "production": {
                 "tsConfig": "projects/common-map/tsconfig.lib.prod.json"
               }
           }
-},
+        },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
@@ -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": "3.4.0",
+  "version": "4.14.0",
   "scripts":   {
     "ng": "ng",
     "start": "ng serve",
@@ -11,66 +11,70 @@
   },
   "private": true,
   "dependencies":   {
-    "@angular/animations": "^14.1.3",
+    "@angular-eslint/eslint-plugin": "^18.2.0",
-    "@angular/common": "^14.1.3",
+    "@angular/animations": "18.2.3",
-    "@angular/compiler": "^14.1.3",
+    "@angular/common": "18.2.3",
-    "@angular/core": "^14.1.3",
+    "@angular/compiler": "18.2.3",
-    "@angular-eslint/eslint-plugin": "^15.2.1",
+    "@angular/core": "18.2.3",
-    "@angular/forms": "^14.1.3",
+    "@angular/forms": "18.2.3",
-    "@angular/platform-browser": "^14.1.3",
+    "@angular/platform-browser": "18.2.3",
-    "@angular/platform-browser-dynamic": "^14.1.3",
+    "@angular/platform-browser-dynamic": "18.2.3",
-    "@angular/router": "^14.1.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",
+    "@farmmaps/ng-openlayers": "file:dist/ng-openlayers",
     "@microsoft/signalr": "^3.1.16",
-    "@ng-bootstrap/ng-bootstrap": "^13.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^17.0.1",
-    "@ngrx/effects": "^14",
+    "@ngrx/effects": "^18.0.2",
-    "@ngrx/router-store": "^14",
+    "@ngrx/router-store": "^18.0.2",
-    "@ngrx/store": "^14",
+    "@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": "^14",
+    "ngrx-store-localstorage": "^18.0.0",
-    "ngx-avatar": "^4.1.0",
+    "ngx-avatars": "^1.8.0",
-    "ngx-clipboard": "^14.0.1",
+    "ngx-clipboard": "^16.0.0",
-    "ngx-image-cropper": "^3.3.5",
+    "ngx-image-cropper": "^7.0.0",
-    "ngx-openlayers": "1.0.0-next.19",
+    "ngx-uploadx": "^6.2.0",
-    "ngx-uploadx": "^5.2.0",
+    "ol": "^8.2.0",
-    "ol": "6.14.1",
     "olcs": "^2.13.1",
     "resumablejs": "^1.1.0",
-    "rxjs": "^6.6.7",
+    "rxjs": "^7.8.1",
     "stream": "^0.0.2",
     "stream-http": "^3.2.0",
     "tassign": "^1.0.0",
     "tslib": "^2.4.0",
     "url": "^0.11.0",
     "util": "^0.12.4",
-    "zone.js": "~0.11.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": "^14",
+    "@angular-builders/custom-webpack": "^18.0.0",
-    "@angular-devkit/build-angular": "^14.1.3",
+    "@angular-devkit/build-angular": "18.2.3",
-    "@angular/cli": "^14.1.3",
+    "@angular/cli": "18.2.3",
-    "@angular/compiler-cli": "^14.1.3",
+    "@angular/compiler-cli": "18.2.3",
-    "@angular/language-service": "^14.1.3",
+    "@angular/language-service": "18.2.3",
-    "@angular/localize": "^14.1.3",
+    "@angular/localize": "18.2.3",
     "@types/arcgis-rest-api": "^10.4.5",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "^2.0.9",
-    "@types/node": "^12.20.15",
+    "@types/node": "^22.5.4",
-    "@typescript-eslint/eslint-plugin": "^5.54.0",
+    "@typescript-eslint/eslint-plugin": "^6.18.0",
-    "@typescript-eslint/eslint-plugin-tslint": "^5.54.0",
+    "@typescript-eslint/eslint-plugin-tslint": "^6.18.0",
-    "@typescript-eslint/parser": "^5.54.0",
+    "@typescript-eslint/parser": "^6.18.0",
-    "codelyzer": "^0.0.28",
+    "codelyzer": "^6.0.2",
     "eslint": "^8.35.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-import": "^2.27.5",
@@ -81,9 +85,9 @@
     "karma-coverage-istanbul-reporter": "^3.0.3",
     "karma-jasmine": "^5.1.0",
     "karma-jasmine-html-reporter": "^2.0.0",
-    "ng-packagr": "^14.1.0",
+    "ng-packagr": "^18.2.1",
     "protractor": "~7.0.0",
     "ts-node": "^8.8.1",
-    "typescript": "~4.6.4"
+    "typescript": "~5.4.4"
   }
 }

projects/common-map/package-lock.json

@@ -11,20 +11,207 @@
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/core": ">=14.0.0",
+        "@angular/core": "^18.2.3",
-        "@ngrx/effects": ">=14.0.0",
+        "@ngrx/effects": "^18.0.2",
-        "@ngrx/router-store": ">=14.0.0",
+        "@ngrx/router-store": "^18.0.2",
-        "@ngrx/store": ">=14.0.0",
+        "@ngrx/store": "^18.0.2",
-        "ngrx-store-localstorage": ">=14.0.0",
+        "ngrx-store-localstorage": "^18",
-        "ngx-openlayers": ">=1.0.0-next.19",
+        "tassign": "^1.0.0"
-        "ol": ">=6.8.1",
-        "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": ">=14.0.0",
+    "@angular/core": "18.2.3",
-    "ngrx-store-localstorage": ">=14.0.0",
+    "ngrx-store-localstorage": "^18.0.0",
-    "@ngrx/effects": ">=14.0.0",
+    "@ngrx/effects": "^18.0.2",
-    "@ngrx/router-store":">=14.0.0",
+    "@ngrx/router-store": "^18.0.2",
-    "@ngrx/store":">=14.0.0",
+    "@ngrx/store": "^18.0.2",
-    "tassign": ">=1.0.0",
+    "tassign": "^1.0.0"
-    "ngx-openlayers": ">=1.0.0-next.19",
-    "ol": ">=6.8.1"
   }
 }

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

@@ -5,7 +5,7 @@ import { IItemLayer } from '../models/item.layer';
 import { ILayervalue } from '../models/layer.value';
 import { IQueryState } from '@farmmaps/common';
 import { IItem } from '@farmmaps/common';
-import { Feature, Observable } from 'ol';
+import { Feature } from 'ol';
 import { Style } from 'ol/style';
 import { Geometry } from 'ol/geom';
 import { IPeriodState } from '../models/period.state';
@@ -18,6 +18,7 @@ export const SETPARENT = '[Map] SetParent';
 export const SETPERIOD = '[Map] SetPeriod';
 export const STARTSEARCH = '[Map] StartSearch';
 export const STARTSEARCHSUCCESS = '[Map] StartSearchSuccess';
+export const CLICKFEATURE = '[Map] ClickFeature';
 export const SELECTFEATURE = '[Map] SelectFeature';
 export const SELECTITEM = '[Map] SelectItem';
 export const SELECTITEMSUCCESS = '[Map] SelectItemSuccess';
@@ -56,7 +57,8 @@ export const GETLAYERVALUE = '[Map] GetLayerValue'
 export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess'
 export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
 export const SETVIEWSTATE = '[Map] SetViewState'
-export const SETCODELIST = '[Map] SetCodeList'
+export const CLEARFEATURES = '[Map] ClearFeatures';
+export const SETPANELEXTRAWIDE = '[Map] SetPanelExtraWide';
 
 export class Clear implements Action {
   readonly type = CLEAR;
@@ -111,6 +113,12 @@ export class StartSearchSuccess implements Action {
   constructor(public features: Array<Feature<Geometry>>, public query:IQueryState) { }
 }
 
+export class ClickFeature implements Action {
+  readonly type = CLICKFEATURE;
+
+  constructor(public feature:Feature<Geometry>) { }
+}
+
 export class SelectFeature implements Action {
   readonly type = SELECTFEATURE;
 
@@ -329,10 +337,14 @@ export class SetViewState implements Action {
   constructor(public enabled:boolean) {}
 }
 
-export class SetCodeList implements Action {
+export class ClearFeatures implements Action {
-  readonly type = SETCODELIST;
+  readonly type = CLEARFEATURES;
+  constructor() {}
+}
 
-  constructor(public itemType:string, public values: IItem[]) { }
+export class SetPanelExtraWide implements Action {
+  readonly type = SETPANELEXTRAWIDE;
+  constructor(public panelExtraWide:boolean) {}
 }
 
 export type Actions = SetMapState
@@ -341,6 +353,7 @@ export type Actions = SetMapState
   | SetParent
   | StartSearch
   | StartSearchSuccess
+  | ClickFeature
   | SelectFeature
   | SelectItem
   | SelectItemSuccess
@@ -381,5 +394,6 @@ export type Actions = SetMapState
   | SetPeriod
   | ToggleShowDataLayerSlide
   | SetViewState
-  | SetCodeList;
+  | ClearFeatures
+  | SetPanelExtraWide;
 

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

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

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

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

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

@@ -1,6 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
-
 .gps-location {
   display:none; 
 }
@@ -14,7 +11,7 @@
 }
 
 .tolerance {
-  fill: $primary;
+  fill: var(--bs-primary);
   fill-opacity:0.4;
 }
 
@@ -23,20 +20,20 @@
 }
 
 .border {
-  fill: $white;
+  fill: var(--bs-white);
 }
 
 .center {
-  fill: $primary;
+  fill: var(--bs-primary);
 }
 
 .stop1 {
-  stop-color: $primary;
+  stop-color: var(--bs-primary);
   stop-opacity:1;
 }
 
 .stop2 {
-  stop-color:$primary;
+  stop-color:var(--bs-primary);
   stop-opacity: 0;
 }
 

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

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

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

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

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

@@ -1,6 +1,6 @@
-import { Component, Host, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges, forwardRef, Inject, InjectionToken } from '@angular/core';
+import { Component, Host, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges, forwardRef, Inject, InjectionToken, OnDestroy, LOCALE_ID } from '@angular/core';
-import { LayerVectorComponent, SourceVectorComponent, MapComponent } from 'ngx-openlayers';
+import { LayerVectorComponent, SourceVectorComponent, MapComponent } from '@farmmaps/ng-openlayers';
-import { ItemService, ItemTypeService, IItem, IItemType } from '@farmmaps/common';
+import { ItemService, ItemTypeService, IItem, IItemType, FolderService } from '@farmmaps/common';
 
 import { Feature } from 'ol';
 import { Point, Geometry } from 'ol/geom';
@@ -17,6 +17,9 @@ 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',
@@ -25,8 +28,8 @@ import { FeatureIconService } from '../../../services/feature-icon.service';
     { provide: SourceVectorComponent, useExisting: forwardRef(() => ItemVectorSourceComponent) }
   ]
 })
-export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnChanges {
+export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnDestroy, OnChanges {
-  instance: Vector<Geometry>;
+  instance: Vector<Feature<Geometry>>;
   private _format: GeoJSON;
   private _select: Select;
   private _hoverSelect: Select;
@@ -38,8 +41,10 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
   @Output() onFeatureSelected: EventEmitter<Feature<Geometry>> = new EventEmitter<Feature<Geometry>>();
   @Output() onFeatureHover: EventEmitter<Feature<Geometry>> = new EventEmitter<Feature<Geometry>>();
   private stylesCache: IStyles = {};
+  private sub: Subscription;
+  private displayMapFeatureSettings: { [code: string]: string[] } = defaultDisplayMapFeatureSettings();
 
-  constructor(@Host() private layer: LayerVectorComponent, private itemService: ItemService, private map: MapComponent, private itemTypeService: ItemTypeService, private featureIconService$: FeatureIconService) {
+  constructor(@Host() private layer: LayerVectorComponent, private itemService: ItemService, private map: MapComponent, private itemTypeService: ItemTypeService, private featureIconService$: FeatureIconService, private folderService: FolderService, @Inject(LOCALE_ID) private locale: string) {
     super(layer);
     this._format = new GeoJSON();
   }
@@ -76,6 +81,18 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
   }
 
   ngOnInit() {
+    this.sub = this.folderService.getFolder('my_settings').subscribe(
+      userSettingsRoot => {
+        if (userSettingsRoot == undefined) return;
+        this.itemService.getChildItemList(userSettingsRoot.code, 'vnd.farmmaps.itemtype.settings.general').subscribe(
+          items => {
+            if (items && items.length > 0 && items[0].data?.displayMapFeatureSettings) {
+              this.displayMapFeatureSettings = items[0].data?.displayMapFeatureSettings;
+            }
+          }
+        )
+      }
+    );
     this.strategy = loadingstrategy.bbox;
     this.format = new GeoJSON();
     this._select = new Select({
@@ -133,7 +150,8 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
             fill: new style.Fill({
               color: fillColor
             }),
-            geometry: (feature: Feature<Geometry>) => this.geometry(feature)
+            geometry: (feature: Feature<Geometry>) => this.geometry(feature),
+            text: this.getDisplayTextForFeature(feature, this.map.instance.getView().getZoom())
           });
         } else {
           key = 'file';
@@ -153,6 +171,10 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
     });
   }
 
+  ngOnDestroy(): void {
+    if (this.sub) this.sub.unsubscribe();
+  }
+
   ngOnChanges(changes: SimpleChanges) {
     if (changes["features"] && this.instance) {
       this.instance.clear(true);
@@ -188,4 +210,51 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
       }
     }
   }
+  
+  getDisplayTextForFeature(feature: Feature<Geometry>, zoom: number, overrule?: style.Text) {
+    if (!feature) return null;
+
+    const propertiesToShow: string[] = this.displayMapFeatureSettings[feature.get('itemType')];
+    if (!propertiesToShow) return null;
+    if (propertiesToShow.length <= 0) return null;
+    if (zoom < 14) return null;
+
+    let displayText = '';
+    for (let i = 0; i < propertiesToShow.length; i++) {
+      let value = feature.get(propertiesToShow[i]);
+      switch (propertiesToShow[i]) {
+        case "area": value = formatNumber(value, this.locale, '0.1-2') + ' ha'; break;
+        case "centroid": {
+          if (feature.getGeometry()) {
+            const centroid = getCenter(feature.getGeometry().getExtent());
+            value = Math.round(centroid[0]) + ',' + Math.round(centroid[1]);
+          }
+        }
+          if (value) {
+            displayText += value + (i < propertiesToShow.length ? '\n' : '');
+          }
+      }
+    
+      const styleText = new style.Text({
+        font: '13px Calibri,sans-serif',
+        fill: new style.Fill({ color: '#ffffff' }),
+        stroke: new style.Stroke({ color: '#000000', width: 2 }),
+        text: displayText
+      });
+
+      if (overrule) {
+        if (overrule.getFont()) styleText.setFont(overrule.getFont());
+        if (overrule.getFill()) styleText.setFill(overrule.getFill());
+        if (overrule.getStroke()) styleText.setStroke(overrule.getStroke());
+      }
+
+      return styleText;
+    }
+  }
+}
+
+function defaultDisplayMapFeatureSettings() {
+  return {
+    'vnd.farmmaps.itemtype.cropfield': ['name', 'cropTypeName', 'area']
+  };
 }

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

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

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

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

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

@@ -1,11 +1,8 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
-
 .gps-location {
   display:block; 
   width:2.5em;
   height:2.5em;
-  background-color: $body-bg;
+  background-color: var(--bs-body-bg);
   background-size: contain;
   margin-top:0.5em;
   border-radius: 1.75em;
@@ -17,15 +14,15 @@
 }
 
 .pan-to {
-  fill: $secondary;
+  fill: var(--bs-secondary);
 }
 
 div.gps-location:hover .pan-to {
-  fill: $white;
+  fill: var(--bs-white);
 }
 
 .pan-to-centered {
-  fill: $primary;
+  fill: var(--bs-primary);
 }
 
 div.gps-location:hover .pan-to-centered {
@@ -33,5 +30,5 @@ div.gps-location:hover .pan-to-centered {
 }
 
 .pan-to.pan-to-disabled {
-  fill: $gray-300;
+  fill: var(--bs-gray-300);
 }

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

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

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

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .compass {
   width:2.5em;
   height:2.5em;
@@ -13,7 +11,7 @@
 
 #north {
   display: none;
-  fill:$black;
+  fill:var(--bs-black);
 }
 
 #top-l {
@@ -33,23 +31,23 @@
 }
 
 div.compass:hover #top-l {
-  fill:$white;
+  fill:var(--bs-white);
 }
 
 div.compass:hover #top-r {
-  fill:$gray-300;
+  fill:var(--bs-gray-300);
 }
 
 div.compass:hover #bottom-l {
-  fill:$gray-300;
+  fill:var(--bs-gray-300);
 }
 
 div.compass:hover #bottom-r {
-  fill:$white;
+  fill:var(--bs-white);
 }
 
 div.compass:hover #north {
-  fill:$white;
+  fill:var(--bs-white);
 }
 
 .compass-n {    

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

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

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

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

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

@@ -1,14 +1,10 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
 .row {
-  border-bottom: 1px solid $gray-500;
+  border-bottom: 1px solid var(--bs-gray-500);
   user-select: none;
 }
 
 .row.selected {
-  background-color: $gray-100;
+  background-color: var(--bs-gray-100);
 }
 
 @media screen and (min-width: 44rem)  {

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

@@ -64,9 +64,9 @@ export class FeatureListContainerComponent {
     viewContainerRef.clear();
     if(showItem) {
       this.componentRef = viewContainerRef.createComponent(componentFactory);
-      (<AbstractFeatureListComponent>this.componentRef.instance).features = null;
+      (<AbstractFeatureListComponent>this.componentRef.instance).features = this.features;
-      (<AbstractFeatureListComponent>this.componentRef.instance).queryState = queryState;
+      (<AbstractFeatureListComponent>this.componentRef.instance).queryState = this.queryState;
-      (<AbstractFeatureListComponent>this.componentRef.instance).selectedFeature = null;
+      (<AbstractFeatureListComponent>this.componentRef.instance).selectedFeature = this.selectedFeature;
     }    
   }
 

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

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

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

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

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

@@ -1,7 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
 .card-title {
   font-size: 1rem;
   white-space: nowrap;

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

@@ -1,7 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
 .card-title {
   font-size: 1rem;
   white-space: nowrap;

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

@@ -1,7 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
 .card-title {
   font-size: 1rem;
   white-space: nowrap;

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

@@ -1,15 +1,13 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 fm-map-feature-list-feature-container {
   width: 100%;
   pointer-events: none;
 }
 
 .row {
-  border-bottom: 1px solid $gray-500;
+  border-bottom: 1px solid var(--bs-gray-500);
   user-select: none;
 }
 
 .row.selected {
-  background-color: $gray-100;
+  background-color: var(--bs-gray-100);
 }

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

@@ -23,6 +23,7 @@ export abstract class AbstractFeatureListComponent {
 
   handleFeatureClick(feature:Feature<Geometry>) {
     if(feature) {
+      this.store.dispatch(new mapActions.ClickFeature(feature));
       const action = this.getAction(feature);
       this.store.dispatch(action);
     }

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

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

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

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .widget {
   padding:0.8rem;
   height:100%;

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

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .widget-container {
   overflow:auto;
   margin-bottom:1rem;
@@ -7,7 +5,7 @@
 
 .widget {
   position:relative;
-  border: 1px solid $gray-500;
+  border: 1px solid var(--bs-gray-500);
   user-select: none;
   display:inline-block;
   width:50%;
@@ -28,7 +26,7 @@
 }
 
 .widget:hover {
-  background-color: $gray-100;
+  background-color: var(--bs-gray-100);
 }
 
 .widget-container {

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

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .widget-container {
   overflow:auto;
   margin-bottom:1rem;
@@ -7,7 +5,7 @@
 
 .widget {
   position:relative;
-  border: 1px solid $gray-500;
+  border: 1px solid var(--bs-gray-500);
   user-select: none;
   display:inline-block;
   width:50%;
@@ -28,7 +26,7 @@
 }
 
 .widget:hover {
-  background-color: $gray-100;
+  background-color: var(--bs-gray-100);
 }
 
 .widget-container {

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

@@ -1,18 +1,15 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
-
 .layer-switcher {  
   display:block; 
   width:2.5em;
   height:2.5em;
-  background-color: $body-bg;
+  background-color: var(--bs-body-bg);
   background-size: contain;
   margin-top:0.5em;
   text-align: center;
   line-height: 2.5em; 
   border-radius: 1.75em;
   padding: 0;
-  color: $secondary;
+  color: var(--bs-secondary);
 }
 
 .layer-switcher i {
@@ -24,7 +21,7 @@
 }
 
 .layers {
-  color:$secondary;
+  color:var(--bs-secondary);
   position: absolute;
   overflow: hidden;
   bottom: -1em;

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

@@ -1,15 +1,15 @@
 <div class="row ps-3">
   <div class="col-8 nopadding"><span i18n>Average</span>:</div>
-  <div class="col-4 pull-left nopadding">{{histogram.mean| number:'1.0-2'}}</div>
+  <div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.mean)| number:'1.0-2'}}</div>
   <div class="col-8 nopadding"><span i18n>Standard deviation</span>:</div>
-  <div class="col-4 pull-left nopadding">{{histogram.stddev| number:'1.0-2'}}</div>
+  <div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.stddev)| number:'1.0-2'}}</div>
   <div class="col-8 nopadding"><span i18n>Min</span>:</div>
-  <div class="col-4 pull-left nopadding">{{histogram.min| number:'1.0-2'}}</div>
+  <div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.min)| number:'1.0-2'}}</div>
   <div class="col-8 nopadding" ><span i18n>Max</span>:</div>
-  <div class="col-4 pull-left nopadding">{{histogram.max| number:'1.0-2'}}</div>
+  <div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.max)| number:'1.0-2'}}</div>
 
   <ng-container *ngIf="showConfidenceInterval()">
     <div class="col-8 nopadding"><span i18n>Confidence interval</span>:</div>
-    <div class="col-4 pull-left nopadding">{{histogram.confidence * 100| number:'1.0-0'}}%</div>
+    <div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.confidence * 100)| number:'1.0-0'}}%</div>
   </ng-container>
 </div>

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

@@ -14,6 +14,17 @@ export class HistogramDetailsComponent {
   @Input()
   histogram: IHistogram;
 
+  @Input()
+  scale: number | null;
+
+  public getScaledValue(value: number): number {
+    let v = value;
+    if (this.scale && this.scale != 0) {
+      v = this.scale * value;
+    }
+    return v;
+  }
+
   showConfidenceInterval(): boolean {
     return this.histogram.confidence != null && this.histogram.confidence !== 1;
   }

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

@@ -35,7 +35,7 @@
         </ng-container>
 
         <ng-template #histogram>
-          <fm-map-histogram-details [histogram]="layer.renderer.band.histogram"></fm-map-histogram-details>
+          <fm-map-histogram-details [histogram]="layer.renderer.band.histogram" [scale]="layer.scale"></fm-map-histogram-details>
         </ng-template>
       </div>
     </td>

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

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 div.map-search {
   position: absolute;
   top: 0.5rem;
@@ -106,7 +104,7 @@ div.map-search.searchcollapsed button[type="submit"] {
 }
 
 .form-control, .form-control:focus {
-  border-color: $secondary;
+  border-color: var(--bs-secondary);
 }
 
 

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

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

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

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 aol-map { position:absolute;width:100%;height:calc( 100vh );}
 
 .arrow {
@@ -195,7 +193,7 @@ timespan.menuVisible {
   width: 4rem;
   overflow: hidden;
   text-overflow: ellipsis;
-  color: $primary;
+  color: var(--bs-primary);
 }
 
 .shortcut-icon > .farm-icon {

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

@@ -36,7 +36,6 @@ import {Extent,createEmpty,extend } from 'ol/extent';
 import {transform} from 'ol/proj';
 import { tassign } from 'tassign';
 import * as style from 'ol/style';
-import { ICodeLists } from '../../models/codelist.cache';
 
 
 @Component({
@@ -67,6 +66,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   public parentCode$: Observable<string> =this.store.select(mapReducers.selectGetParentCode);
   public panelVisible$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelVisible);
   public panelCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelCollapsed);
+  public panelExtraWide$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelExtraWide);
   public selectedFeature$: Observable<Feature<Geometry>> = this.store.select(mapReducers.selectGetSelectedFeature);
   public clickedFeature: Subject<Feature<Geometry>> = new Subject<Feature<Geometry>>();
   public selectedItem$: Observable<IItem> = this.store.select(mapReducers.selectGetSelectedItem);
@@ -86,8 +86,6 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   public overlayLayersCollapsed = true;
   public extent$: Observable<Extent> = this.store.select(mapReducers.selectGetExtent);
   public styles$:Observable<IStyles> = this.store.select(mapReducers.selectGetStyles);
-  public codeLists$: Observable<ICodeLists> = this.store.select(mapReducers.selectGetCodeLists);
-  public codeList$ = (id: string) => this.store.select(mapReducers.selectGetCodeList(id));
   public fullscreen$: Observable<boolean> = this.store.select(commonReducers.selectGetFullScreen);
   private lastUrl = "";
   private initialized = false;
@@ -195,6 +193,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   }
 
   handleFeatureClick(feature: Feature<Geometry>) {
+    this.store.dispatch(new mapActions.ClickFeature(feature));
     this.clickedFeature.next(feature);
   }
 
@@ -210,12 +209,18 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
    if(component && component.hasOwnProperty('clickedFeature')) {
      (component as IClickedFeature).clickedFeature = this.clickedFeature;
    }
+   if(component && component.hasOwnProperty('extrawide')) {
+    this.store.dispatch(new mapActions.SetPanelExtraWide(true));
+  }
  }
 
   handleSidepaneloutletDeactivate(component:any) {
     if(component && component.hasOwnProperty('clickedFeature')) {
       (component as IClickedFeature).clickedFeature = null;
     }
+    if(component && component.hasOwnProperty('extrawide')) {
+      this.store.dispatch(new mapActions.SetPanelExtraWide(false));
+    }
   }
 
   handlePrerender(event:any) {
@@ -368,7 +373,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
       else {
         return of(null);
       }
-      })).subscribe((newUrlState) =>{
+    })).subscribe((newUrlState: any) => {
         if(newUrlState) {
           //console.debug(`State to url`);
           this.replaceUrl(newUrlState.mapState,newUrlState.queryState,newUrlState.replaceUrl);

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

@@ -1,13 +1,9 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
 .row {
-  border-bottom: 1px solid $gray-500;
+  border-bottom: 1px solid var(--bs-gray-500);
   user-select: none;
 }
 
 .row:hover {
-  background-color: $gray-100;
+  background-color: var(--bs-gray-100);
 }
 

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

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .big-icon {
   width: 100%;
   color: white;

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

@@ -25,6 +25,7 @@
             <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-plus" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
             <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
           </ng-container>
+          <li><fm-item-link class="text-primary p-0" [itemCode]="item.code" pathSuffix="data" [showText]="true"></fm-item-link></li>
         </ul>
       </div>
       <fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>

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

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .big-icon {
   width: 100%;
   color: white;

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

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .big-icon {
   width: 100%;
   color: white;

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

@@ -42,6 +42,7 @@
             <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
           </ng-container>
           <li><a href="#" (click)="handleGoToChart(item)"><i class="fal fa-line-chart" aria-hidden="true" i18m-title title="Show chart"></i>&nbsp;<span i18n>Show chart</span></a></li>
+          <li><a href="#" (click)="download(item,$event)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i>&nbsp;<span i18n>Download</span></a></li>
         </ul>
       </div>
     </div>

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

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .big-icon {
   width: 100%;
   color: white;

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

@@ -2,7 +2,7 @@ import { Component, Injectable } from '@angular/core';
 import { Location } from '@angular/common';
 import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
-import { commonReducers, ItemTypeService, IItem } from '@farmmaps/common';
+import { commonReducers, ItemTypeService, IItem, ItemService, IItemLinkType, IUrlType } from '@farmmaps/common';
 import { Router } from '@angular/router';
 import { ForItemType } from '../for-item/for-itemtype.decorator';
 import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
@@ -11,7 +11,6 @@ import * as mapActions from '../../actions/map.actions';
 import { IItemLayer } from '../../models/item.layer';
 import {TemporalService} from '../../services/temporal.service';
 
-
 @ForItemType("vnd.farmmaps.itemtype.temporal")
 @Injectable()
 @Component({
@@ -21,7 +20,7 @@ import {TemporalService} from '../../services/temporal.service';
 })
 export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent {
 
-  constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
+  constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
     super(store, itemTypeService,location,router);
   }
 
@@ -61,4 +60,15 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
     this.router.navigate(['/viewer', 'temporal', 'item', item.parentCode, new Date(Date.parse(item.dataDate)).getUTCFullYear()]);
     return false;
   }
+  
+  download(item:IItem,event:MouseEvent) {
+    event.stopPropagation();
+    event.preventDefault();
+    const itemLink : IItemLinkType = {itemcode:item.code,pathsuffix:"download", validminutes:10}
+    console.log('download1', itemLink)
+    const foo = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {  
+      console.log('download2', itemLinkUrl)
+       window.location.href =itemLinkUrl.url        
+    })
+  }
 }

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

@@ -1,5 +1,3 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .big-icon {
   width: 100%;
   color: white;

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

@@ -5,7 +5,7 @@ import { ROUTER_NAVIGATED, RouterReducerState } from '@ngrx/router-store';
 import * as fromRouter from '@ngrx/router-store';
 import { createEffect, Actions, ofType } from '@ngrx/effects';
 
-import { EMPTY, Observable, of, forkJoin } from 'rxjs';
+import { EMPTY, Observable, of } from 'rxjs';
 import { withLatestFrom, switchMap, map, catchError, mergeMap } from 'rxjs/operators';
 
 import { GeoJSON, WKT } from 'ol/format';
@@ -41,7 +41,7 @@ export const {
   selectRouteParam,     // factory function to select a route param
   selectRouteData,      // select the current route data
   selectUrl,            // select the current url
-} = fromRouter.getSelectors(getRouterState);
+} = fromRouter.getRouterSelectors(getRouterState);
 
 
 @Injectable()
@@ -99,65 +99,6 @@ export class MapEffects {
           color: 'rgba(0, 0, 0, 0)'
         })
       })));
-      // cache code lists
-      forkJoin([
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl017'),
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl018'),
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl020'),
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl022'),
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl104'),
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl127'),
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl232'),
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl251'),
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl256'),
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl259'),
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl263'),
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl264'),
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl290'),
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl291'),
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl293'),
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl405'),
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl411'),
-        this.itemService$.getItemList('vnd.farmmaps.itemtype.codelist.cl421'),
-      ]).subscribe(([
-        cl017,
-        cl018,
-        cl020,
-        cl022,
-        cl104,
-        cl127,
-        cl232,
-        cl251,
-        cl256,
-        cl259,
-        cl263,
-        cl264,
-        cl290,
-        cl291,
-        cl293,
-        cl405,
-        cl411,
-        cl421,
-      ]) => {
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl017', cl017));
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl018', cl018));
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl020', cl020));
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl020', cl020));
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl104', cl104));
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl127', cl127));
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl232', cl232));
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl251', cl251));
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl256', cl256));
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl259', cl259));
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl263', cl263));
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl264', cl264));
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl290', cl290));
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl291', cl291));
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl293', cl293));
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl405', cl405));
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl411', cl411));
-        actions.push(new mapActions.SetCodeList('vnd.farmmaps.itemtype.codelist.cl421', cl421));
-      });
 
       return actions;
     }
@@ -192,7 +133,7 @@ export class MapEffects {
                 f.id = f.properties["code"];
               }
             }
-            return of(new mapActions.StartSearchSuccess(this._geojsonFormat.readFeatures(features), a.queryState));
+            return of(new mapActions.StartSearchSuccess(this._geojsonFormat.readFeatures(features).filter(feature => feature instanceof Feature) as Feature[], a.queryState));
           }
           ),
           catchError(error => of(new commonActions.Fail(error))));
@@ -277,7 +218,7 @@ export class MapEffects {
       if (!this.overrideSelectedItemLayer) {
         return this.itemService$.getFeature(action.item.code, "EPSG:3857").pipe(
           map((feature: any) => {
-            const f = this._geojsonFormat.readFeature(feature);
+            const f = this._geojsonFormat.readFeature(feature) as Feature;
             f.setId(action.item.code);
             return new mapActions.AddFeatureSuccess(f);
           }),

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

@@ -1,5 +0,0 @@
-import { IItem } from '@farmmaps/common';
-
-export interface ICodeLists {
-  [id: string]: IItem[];
-}

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

@@ -1,5 +1,5 @@
 import { tassign } from 'tassign';
-import { IItem } from '@farmmaps/common';
+import { IItem,Item } from '@farmmaps/common';
 import { IItemLayer,ItemLayer,ITemporalItemLayer,TemporalItemLayer} from '../models/item.layer';
 import { IMapState} from '../models/map.state';
 import { IQueryState} from '@farmmaps/common';
@@ -17,7 +17,6 @@ import {Geometry} from 'ol/geom';
 import { ROUTER_NAVIGATION, RouterNavigationAction } from '@ngrx/router-store';
 
 import { MODULE_NAME } from '../module-name';
-import { ICodeLists } from '../models/codelist.cache';
 
 const startDate:Date = new Date(new Date(Date.now()).getFullYear(), new Date(Date.now()).getMonth() - 3, 1);
 const endDate:Date = new Date(Date.now());
@@ -50,6 +49,7 @@ export interface State {
   features: Array<Feature<Geometry>>,
   panelVisible: boolean,
   panelCollapsed: boolean,
+  panelExtraWide: boolean,
   selectedFeature: Feature<Geometry>,
   selectedItem:IItem,
   parentItem:IItem,
@@ -73,8 +73,7 @@ export interface State {
   layerValuesEnabled:boolean,
   layerValues: Array<ILayervalue>
   showDataLayerSlide:boolean,
-  viewEnabled: boolean,
+  viewEnabled:boolean
-  codeLists:ICodeLists,
 }
 
 export const initialState: State = {
@@ -96,6 +95,7 @@ export const initialState: State = {
   features: [],
   panelVisible: false,
   panelCollapsed: false,
+  panelExtraWide: false,
   selectedFeature: null,
   selectedItem: null,
   parentItem: null,
@@ -119,8 +119,7 @@ export const initialState: State = {
   layerValuesEnabled:false,
   layerValues:[],
   showDataLayerSlide:false,
-  viewEnabled: true,
+  viewEnabled:true
-  codeLists: {}
 }
 
 export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State {
@@ -391,6 +390,9 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
     case mapActions.CLEARLAYERS: {
       return tassign(state, {overlayLayers: [], selectedOverlayLayer: null});
     }
+    case mapActions.CLEARFEATURES: {
+      return tassign(state, {features: [], selectedFeature: null});
+    }
     case mapActions.SETVISIBILITY: {
       const a = action as mapActions.SetVisibility;
       if(state.selectedItemLayer == a.itemLayer) {
@@ -572,11 +574,9 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       }
       return state;
     }
-    case mapActions.SETCODELIST:{
+    case mapActions.SETPANELEXTRAWIDE:{
-      const a = action as mapActions.SetCodeList;
+      const a= action as mapActions.SetPanelExtraWide;
-      const codeLists = tassign(state.codeLists);
+      return tassign(state,{panelExtraWide:a.panelExtraWide});
-      codeLists[a.itemType] = a.values;
-      return tassign(state,{codeLists:codeLists});
     }
     default: {
       return state;
@@ -589,6 +589,7 @@ export const getParentCode = (state: State) => state.parentCode;
 export const getFeatures = (state: State) => state.features;
 export const getPanelVisible = (state: State) => state.panelVisible;
 export const getPanelCollapsed = (state: State) => state.panelCollapsed;
+export const getPanelExtraWide = (state: State) => state.panelExtraWide;
 export const getSelectedFeature = (state: State) => state.selectedFeature;
 export const getSelectedItem = (state: State) => state.selectedItem;
 export const getParentItem = (state: State) => state.parentItem;
@@ -616,7 +617,7 @@ export const getLayerValues = (state:State) => state.layerValues;
 export const getLayerValuesX = (state:State) => state.layerValuesX;
 export const getLayerValuesY = (state:State) => state.layerValuesY;
 export const getViewEnabled = (state:State) => state.viewEnabled;
-export const getCodeLists = (state:State) => state.codeLists;
+
 
 export const selectMapState = createFeatureSelector<State>(MODULE_NAME);
 export const selectGetMapState= createSelector(selectMapState, getMapState);
@@ -624,6 +625,7 @@ export const selectGetParentCode = createSelector(selectMapState, getParentCode)
 export const selectGetFeatures = createSelector(selectMapState, getFeatures);
 export const selectGetPanelVisible = createSelector(selectMapState, getPanelVisible);
 export const selectGetPanelCollapsed = createSelector(selectMapState, getPanelCollapsed);
+export const selectGetPanelExtraWide = createSelector(selectMapState, getPanelExtraWide);
 export const selectGetSelectedFeature = createSelector(selectMapState, getSelectedFeature);
 export const selectGetSelectedItem = createSelector(selectMapState, getSelectedItem);
 export const selectGetParentItem = createSelector(selectMapState, getParentItem);
@@ -651,5 +653,5 @@ export const selectGetLayerValues = createSelector(selectMapState,getLayerValues
 export const selectGetLayerValuesX = createSelector(selectMapState,getLayerValuesX);
 export const selectGetLayerValuesY = createSelector(selectMapState,getLayerValuesY);
 export const selectGetViewEnabled = createSelector(selectMapState,getViewEnabled);
-export const selectGetCodeLists = createSelector(selectMapState, getCodeLists);
+
-export const selectGetCodeList = (id: string) => createSelector(selectGetCodeLists, (codeLists) => codeLists[id]);
+

projects/common-map/src/test.ts

@@ -9,8 +9,6 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
-declare const require: any;
-
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
@@ -18,7 +16,3 @@ getTestBed().initTestEnvironment(
     teardown: { destroyAfterEach: false }
 }
 );
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);

projects/common-map/tsconfig.lib.json

@@ -2,7 +2,6 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2020",
     "module": "es2015",
     "moduleResolution": "node",
     "declaration": true,
@@ -11,18 +10,27 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "importHelpers": true,
+    "esModuleInterop": true,
     "types": [],
     "lib": [
       "dom",
       "es2018"
+    ],
+    "paths": {
+      "@angular/*": [
+
+      "node_modules/@angular/*"
+
       ]
+    }
   },
   "angularCompilerOptions": {
     "skipTemplateCodegen": true,
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true,
-    "enableResourceInlining": true
+    "enableResourceInlining": true,
+    "compilationMode": "partial"
   },
   "exclude": [
     "src/test.ts",

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

@@ -2,7 +2,6 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/lib",
-    "target": "es2020",
     "module": "es2015",
     "moduleResolution": "node",
     "declaration": true,

projects/common-map3d/package-lock.json

@@ -11,17 +11,555 @@
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/common": ">=14.0.0",
+        "@angular/common": "^18.2.3",
-        "@angular/core": ">=14.0.0",
+        "@angular/core": "^18.2.3",
-        "cesium": ">=1.82.1",
+        "cesium": "^1.97.0",
-        "ngx-openlayers": "1.0.0-next.19",
         "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":  ">=14.0.0",
-    "@angular/core":  ">=14.0.0",
-    "ngx-openlayers": "1.0.0-next.19",
-    "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.scss

@@ -1,17 +1,15 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .twotreed {
   display:block; 
   width:2.5em;
   height:2.5em;
-  background-color: $body-bg;
+  background-color: var(--bs-body-bg);
   background-size: contain;
   margin-top:0.5em;
   text-align: center;
   line-height: 2.5em; 
   border-radius: 1.75em;
   padding: 0;
-  color: $secondary;
+  color: var(--bs-secondary);
 }
 
 .fa-spinner {

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

@@ -1,6 +1,6 @@
 import { Component, OnInit,Input,Host  } from '@angular/core';
 import { Interaction} from 'ol/interaction';
-import { MapComponent } from 'ngx-openlayers';
+import { MapComponent } from '@farmmaps/ng-openlayers';
 import OLCesium from 'olcs/OLCesium';
 import RasterSynchronizer from 'olcs/RasterSynchronizer';
 import VectorSynchronizer from 'olcs/VectorSynchronizer';
@@ -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);
         }
       });

projects/common-map3d/src/test.ts

@@ -8,13 +8,6 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
-declare const require: {
-  context(path: string, deep?: boolean, filter?: RegExp): {
-    keys(): string[];
-    <T>(id: string): T;
-  };
-};
-
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
@@ -22,7 +15,3 @@ getTestBed().initTestEnvironment(
     teardown: { destroyAfterEach: false }
 }
 );
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);

projects/common-map3d/tsconfig.lib.json

@@ -11,18 +11,27 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "importHelpers": true,
+    "esModuleInterop": true,
     "types": [],
     "lib": [
       "dom",
       "es2018"
+    ],
+    "paths": {
+      "@angular/*": [
+
+      "node_modules/@angular/*"
+
       ]
+    }
   },
   "angularCompilerOptions": {
     "skipTemplateCodegen": true,
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true,
-    "enableResourceInlining": true
+    "enableResourceInlining": true,
+    "compilationMode": "partial"
   },
   "exclude": [
     "src/test.ts",

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": ">=10.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^17.0.1",
-    "@angular/common": ">=14.0.0",
+    "@angular/common": "18.2.3",
-    "@angular/core": ">=14.0.0",
+    "@angular/core": "18.2.3",
-    "@angular/forms": ">=14.0.0",
+    "@angular/forms": "18.2.3",
-    "@ngrx/effects": ">=14.0.0",
+    "@ngrx/effects": "^18.0.2",
-    "@ngrx/router-store": ">=14.0.0",
+    "@ngrx/router-store": "^18.0.2",
-    "@ngrx/store": ">=14.0.0",
+    "@ngrx/store": "^18.0.2",
-    "tassign": ">=1.0.0",
+    "tassign": "^1.0.0",
-    "bootstrap": ">=4.4.1",
+    "bootstrap": "^5.3.3",
-    "@microsoft/signalr": ">=3.1.3",
+    "@microsoft/signalr": "^3.1.16",
-    "ngx-uploadx": ">=5.1.0",
+    "ngx-uploadx": "^6.2.0",
-    "angular-oauth2-oidc": ">=13.0.0",
+    "angular-oauth2-oidc": "^17.0.2",
-    "moment": ">=2.27.0",
+    "moment": "^2.29.4",
-    "ngx-avatar": ">=4.1.0",
+    "ngx-avatars": "^1.8.0",
-    "ngx-image-cropper": ">=3.3.5",
+    "ngx-image-cropper": "^7.0.0",
-    "ngx-clipboard": ">=14.0.1"
+    "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';
@@ -81,6 +83,8 @@ export const SETPAGEMODE = '[AppCommon] SetPageMode';
 
 export const SETUNREADNOTIFICATIONS = '[AppCommon] SetUnreadNotifications';
 
+export const SWITCHLANGUAGE = '[AppCommon] SwitchLanguage';
+
 export class InitUser implements Action {
   readonly type = INITUSER;
 
@@ -332,6 +336,12 @@ export class ToggleHelpMenu implements Action {
   constructor() { }
 }
 
+export class ToggleSettingMenu implements Action {
+  readonly type = TOGGLESETTINGMENU;
+
+  constructor() { }
+}
+
 export class SetMenuVisible implements Action {
   readonly type = SETMENUVISIBLE;
 
@@ -363,6 +373,12 @@ export class SetUnreadNotifications implements Action {
 
 }
   
+export class SwitchLanguage implements Action {
+  readonly type = SWITCHLANGUAGE;
+
+  constructor(public locale:string) { }
+}
+
 
 export type Actions = OpenModal
   | InitRoot
@@ -408,7 +424,9 @@ export type Actions = OpenModal
   | ToggleAppMenu
   | ToggleNotificationMenu
   | ToggleHelpMenu
+  | ToggleSettingMenu
   | NotificationEvent
-  | SetUnreadNotifications;
+  | SetUnreadNotifications
+  | SwitchLanguage;
 
 

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

@@ -7,6 +7,7 @@ import {NavBarGuard} from './services/nav-bar-guard.service';
 import {FullScreenGuard} from './services/full-screen-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';
 
 
 const routes = [
@@ -21,7 +22,7 @@ const routes = [
   },
   {
     path: '**', component: NotFoundComponent,
-    canActivate: [NavBarGuard]   
+    canActivate: [NavBarGuard, ProductionGuard]
   }
 ];
 

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

@@ -13,11 +13,13 @@ import { SchemaService } from './services/schema.service';
 import { FolderService } from './services/folder.service';
 import { TimespanService } from './services/timespan.service';
 import { ItemService } from './services/item.service';
+import { TaskService } from './services/task.service';
 import { AdminService } from './services/admin.service';
 import { EventService } from './services/event.service';
 import { TypeaheadService } from './services/typeahead.service';
 import { UserService } from './services/user.service';
 import { ImageService } from './services/image.service';
+import { DownloadService } from './services/download.service';
 import { GeolocatorService } from './services/geolocator.service';
 import { WeatherService} from './services/weather.service';
 import { AppConfig } from './shared/app.config';
@@ -43,11 +45,13 @@ export {
   ItemTypeService,
   TimespanService,
   ItemService,
+  TaskService,
   AdminService,
   EventService,
   TypeaheadService,
   UserService,
   ImageService,
+  DownloadService,
   GeolocatorService,
   WeatherService,
   AppConfig,

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

@@ -1,16 +1,16 @@
 // angular modules
-import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector, Optional, SkipSelf,InjectionToken } from '@angular/core';
+import { CommonModule } from '@angular/common';
-import { CommonModule, DatePipe } from '@angular/common';
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
-import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { InjectionToken, NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 
 // external modules
-import { OAuthModule, AuthConfig, OAuthService, OAuthStorage } from 'angular-oauth2-oidc';
-import { StoreModule, Store } from '@ngrx/store';
-import { EffectsModule } from '@ngrx/effects';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { UploadxModule } from 'ngx-uploadx';
+import { EffectsModule } from '@ngrx/effects';
+import { StoreModule } from '@ngrx/store';
+import { OAuthModule } from 'angular-oauth2-oidc';
 import { ClipboardModule } from 'ngx-clipboard';
+import { UploadxModule } from 'ngx-uploadx';
 
 
 // routing module
@@ -19,123 +19,71 @@ import { AppCommonRoutingModule } from './common-routing.module';
 import { MODULE_NAME } from './module-name';
 
 //components
-import { SafePipe } from './shared/safe.pipe';
+import { AvatarModule } from 'ngx-avatars';
-import { AuthConfigFactory, IAuthconfigFactory } from './shared/authconfigFactory';
+import { ImageCropperModule } from 'ngx-image-cropper';
+import * as commonActions from './actions/app-common.actions';
+import { AppMenuComponent } from './components/app-menu/app-menu.component';
 import { AppComponent } from './components/app/app.component';
 import { AuthCallbackComponent } from './components/auth-callback/auth-callback.component';
-import { SessionClearedComponent } from './components/session-cleared/session-cleared.component';
+import { AvatarComponent } from './components/avatar/avatar.component';
-import { ResumableFileUploadComponent } from './components/resumable-file-upload/resumable-file-upload.component';
-import { NotFoundComponent } from './components/not-found/not-found.component';
-import { NotImplementedComponent } from './components/not-implemented/not-implemented.component';
-import { SidePanelComponent } from './components/side-panel/side-panel.component';
-import { TimespanComponent } from './components/timespan/timespan.component';
-import { TagInputComponent } from './components/tag-input/tag-input.component';
-import { MenuBackgroundComponent } from './components/menu-background/menu-background.component';
-import { HasPackageDirective} from './components/has-package/has-package.directive';
-import { PackageExistsDirective} from './components/package-exists/package-exists.directive';
-import { HasClaimDirective } from './components/has-claim/has-claim.directive';
-import { HasRoleDirective } from './components/has-role/has-role.directive';
-import { UserMenuComponent} from './components/user-menu/user-menu.component';
-import { ThumbnailComponent } from './components/thumbnail/thumbnail.component';
-import { Alert } from './enumerations/alert.enum';
-import { IEventMessage } from './models/event.message';
-import { IItem, Item } from './models/item';
-import { WeatherCurrentObservation } from './models/weatherCurrentObservation';
-import { IItemType } from './models/item.type';
-import { IItemTypes } from './models/item.types';
-import { IItemTask, ItemTask } from './models/itemTask';
-import { IListItem } from './models/list.item';
-import { ITypeaheadItem } from './models/typeahead.item'
-import { IJsonline } from './models/json-line';
-import { ISenMLItem } from './models/senml-item';
-import { IPackage,IPackages } from './models/package';
-import { IUser } from './models/user';
-import { IQueryState } from './models/query.state';
-import { IDataLayer } from './models/data.layer';
-import { IColor,IGradientstop} from './models/gradient';
-import * as commonActions from './actions/app-common.actions';
-import * as commonReducers from './reducers/app-common.reducer';
-import * as commonEffects from './effects/app-common.effects';
-import { SecureOAuthStorage} from './shared/secureOAuthStorage';
-import { GradientComponent } from './components/gradient/gradient.component';
-import { GradientSelectComponent } from './components/gradient-select/gradient-select.component';
-import { AppMenuComponent } from './components/app-menu/app-menu.component';
-import { NotificationMenuComponent} from './components/notification-menu/notification-menu.component';
-import { HelpMenuComponent} from './components/help-menu/help-menu.component';
 import { BackButtonComponent } from './components/back-button/back-button.component';
 import { EditImageModalComponent } from './components/edit-image-modal/edit-image-modal.component';
-import { AvatarComponent } from './components/avatar/avatar.component';
+import { GradientSelectComponent } from './components/gradient-select/gradient-select.component';
-import { AvatarModule } from 'ngx-avatar';
+import { GradientComponent } from './components/gradient/gradient.component';
-import { ImageCropperModule } from 'ngx-image-cropper';
+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';
+import { NotImplementedComponent } from './components/not-implemented/not-implemented.component';
+import { NotificationMenuComponent } from './components/notification-menu/notification-menu.component';
+import { PackageExistsDirective } from './components/package-exists/package-exists.directive';
+import { ResumableFileUploadComponent } from './components/resumable-file-upload/resumable-file-upload.component';
+import { SessionClearedComponent } from './components/session-cleared/session-cleared.component';
+import { SidePanelComponent } from './components/side-panel/side-panel.component';
+import { TagInputComponent } from './components/tag-input/tag-input.component';
+import { ThumbnailComponent } from './components/thumbnail/thumbnail.component';
+import { TimespanComponent } from './components/timespan/timespan.component';
+import { UserMenuComponent } from './components/user-menu/user-menu.component';
+import * as commonEffects from './effects/app-common.effects';
+import { Alert } from './enumerations/alert.enum';
+import { IDataLayer } from './models/data.layer';
+import { IEventMessage } from './models/event.message';
+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 { 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';
+import { IQueryState } from './models/query.state';
+import { ISenMLItem } from './models/senml-item';
+import { ITypeaheadItem } from './models/typeahead.item';
+import { IUrlType } from './models/url.type';
+import { IUser } from './models/user';
+import { WeatherCurrentObservation } from './models/weatherCurrentObservation';
+import * as commonReducers from './reducers/app-common.reducer';
+import { AuthConfigFactory, IAuthconfigFactory } from './shared/authconfigFactory';
+import { SafePipe } from './shared/safe.pipe';
+import { SecureOAuthStorage } from './shared/secureOAuthStorage';
 
 export const FM_COMMON_STARTPAGE = new InjectionToken<string>('fm-common-startpage');
 
 export {
-  SafePipe,
+  Alert, AppComponent, AuthCallbackComponent, AuthConfigFactory, AvatarComponent, BackButtonComponent, commonActions,
-  AuthCallbackComponent,
+  commonReducers, EditImageModalComponent,
-  AppComponent,
-  SessionClearedComponent,
-  ResumableFileUploadComponent,
-  NotFoundComponent,
-  NotImplementedComponent,
-  SidePanelComponent,
-  TimespanComponent,
-  TagInputComponent,
-  UserMenuComponent,
-  ThumbnailComponent,
-  HasPackageDirective,
-  PackageExistsDirective,
-  HasClaimDirective,
-  HasRoleDirective,
-  Alert,
-  IEventMessage,
-  IItem,
-  Item,
-  IItemType,
-  IItemTypes,
-  IItemTask,
-  ItemTask,
-  IListItem,
-  ITypeaheadItem,
-  IUser,
-  IQueryState,
-  IPackage,
-  IPackages,
-  commonActions,
-  commonReducers,
-  IAuthconfigFactory,
-  AuthConfigFactory,
-  MenuBackgroundComponent,
-  SecureOAuthStorage,
-  WeatherCurrentObservation,
-  IJsonline,
-  ISenMLItem,
-  IDataLayer,
-  IColor,
-  IGradientstop,
-  BackButtonComponent,
-  AvatarComponent,
-  EditImageModalComponent,
   GradientComponent,
-  GradientSelectComponent
+  GradientSelectComponent, HasClaimDirective, HasPackageDirective, HasRoleDirective, IAuthconfigFactory, IColor, IDataLayer, IEventMessage, IGradientstop, IItem, IItemLinkType, IItemTask, IItemType, IItemTypes, IJsonline, IListItem, IPackage,
+  IPackages, IQueryState, ISenMLItem, Item, ItemLinkComponent, ItemTask, ITypeaheadItem, IUrlType, IUser, MenuBackgroundComponent, NotFoundComponent,
+  NotImplementedComponent, PackageExistsDirective, ResumableFileUploadComponent, SafePipe, SecureOAuthStorage, SessionClearedComponent, SidePanelComponent, TagInputComponent, ThumbnailComponent, TimespanComponent, UserMenuComponent, WeatherCurrentObservation
 };
 
-@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,
@@ -157,10 +105,12 @@ export {
         AppMenuComponent,
         NotificationMenuComponent,
         HelpMenuComponent,
+        SettingMenuComponent,
         BackButtonComponent,
         ThumbnailComponent,
         EditImageModalComponent,
-    AvatarComponent
+        AvatarComponent,
+        ItemLinkComponent
     ],
     exports: [
         NgbModule,
@@ -189,8 +139,18 @@ export {
         BackButtonComponent,
         ThumbnailComponent,
         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

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

@@ -1,9 +1,3 @@
-/* Import Bootstrap & Fonts */
-
-@import "~bootstrap/scss/bootstrap.scss";
-
-
-
 // custom styles
 
 .btn:focus {
@@ -16,7 +10,7 @@
 
 .form-control:focus {
   box-shadow: none;
-  border-color: $input-border-color;
+  border-color: var(--bs-input-border-color);
 }
 
 
@@ -125,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

@@ -45,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);
@@ -115,18 +116,11 @@ export class AppComponent implements OnInit, OnDestroy {
     return action;
   }
 
-  async loadItemTypes() {
-    await this.itemTypeService$.load(this.appConfig$)
-  }
-
   ngOnInit() {
     this.InstallRouteEventHandler();
     this.InstallEventServiceEventHandler();
     this.InstallAuthenticationEventHandler();
     this.InstallHealthCheck();
-
-    //load item types
-    this.loadItemTypes();
   }
 
   @HostListener('document:keyup', ['$event'])

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

@@ -1,4 +1,4 @@
-import { Router, CanActivate } from '@angular/router';
+import { Router } from '@angular/router';
 import { Injectable } from '@angular/core';
 import { OAuthService } from 'angular-oauth2-oidc';
 import {  } from '@angular/router';
@@ -6,7 +6,7 @@ import {  } from '@angular/router';
 @Injectable({
   providedIn: 'root',
 })
-export class AuthCallbackGuard implements CanActivate {
+export class AuthCallbackGuard  {
 
   constructor(private router$: Router,private oauthService$:OAuthService) {}
 

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

@@ -1,10 +1,10 @@
 <span class="avatar-container" [title]="name">
-	<ngx-avatar 
+	<ngx-avatars 
 		class="farmmaps-avatar"
 		[src]="src" 
 		[name]="name" 
 		[size]="size"
 		[round]='true'
 		>
-	</ngx-avatar>
+	</ngx-avatars>
 </span>

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

@@ -1,12 +1,10 @@
-@import "~bootstrap/scss/bootstrap.scss";
-
 .back-button {
   cursor: default;
-  color: $primary;
+  color: var(--bs-primary);
   display: block;  
 }
 
 .back-button:hover {
   cursor: pointer;
-  color: $secondary;
+  color: var(--bs-secondary);
 }

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

@@ -11,7 +11,7 @@
         <i class="fal fa-image"></i>
         <div i18n>No image selected</div>
       </div>
-      <image-cropper #imageCropper
+      <image-cropper #imageCropper output="base64" 
       [imageChangedEvent]="imageChangedEvent"
       [maintainAspectRatio]="true"
       [format]="imageType"

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

@@ -1,5 +1,5 @@
 import { Component, OnInit,ViewChild,ElementRef,EventEmitter, Output } from '@angular/core';
-import { HttpClient, HttpParams,HttpHeaders } from "@angular/common/http";
+import { HttpClient, HttpParams, HttpHeaders } from "@angular/common/http";
 import {NgbModal} from "@ng-bootstrap/ng-bootstrap"
 import { ImageCroppedEvent,LoadedImage } from 'ngx-image-cropper';
 import {ImageService } from '../../services/image.service';

projects/common/src/fm/components/item-link/item-link.component.html

@@ -0,0 +1 @@
+<span class="item-link" (click)="copylink(copiedtt)" 	triggers="manual"	ngbTooltip="Link copied" #copiedtt="ngbTooltip" ><i ngbTooltip='Copy link' class="fa-solid fa-link"></i> <span *ngIf="showText" i18n>Copy link</span></span>

projects/common/src/fm/components/item-link/item-link.component.ts

@@ -0,0 +1,44 @@
+import { Component, Input, OnDestroy} from '@angular/core';
+import { IItemLinkType} from '../../models/itemlink.type'
+import { IUrlType } from '../../models/url.type';
+import { ItemService } from '../../common-service.module';
+import { Subscription } from 'rxjs';
+import { ClipboardService } from 'ngx-clipboard'
+
+
+@Component({
+  selector: 'fm-item-link',
+  templateUrl: './item-link.component.html'
+})
+export class ItemLinkComponent implements OnDestroy {
+
+  @Input() itemCode:string;
+  @Input() pathSuffix:string;
+  @Input() query:string;
+  @Input() validMinutes:number;
+  @Input() showText:boolean;
+
+  private sub : Subscription = null;
+
+  constructor(private itemService:ItemService,private clipboardService$: ClipboardService) { }
+
+  copylink(tooltip) {
+    if(this.sub)  {
+        this.sub.unsubscribe();
+    }
+    let link: IItemLinkType = {itemcode:this.itemCode,pathsuffix:this.pathSuffix,query:this.query,validminutes:this.validMinutes}
+    this.sub = this.itemService.getItemLink(link).subscribe((url:IUrlType) => { 
+        this.clipboardService$.copy(url.url);
+        tooltip.open();
+        setTimeout(() => {
+            tooltip.close();
+        }, 2000);
+    })
+  }
+
+  ngOnDestroy(): void {
+    if(this.sub) {
+        this.sub.unsubscribe();
+    }      
+  }
+}

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

@@ -1,13 +1,10 @@
-/* Import Bootstrap & Fonts */
-
-@import "~bootstrap/scss/bootstrap.scss";
-
 div.resumable-file-upload {
   position: fixed;
   right: 0px;
   bottom: 0px;
   width: 300px;
   max-height: 250px;
+  z-index: 1;
   /*z-index:2000 !important;*/
 }
 
@@ -76,7 +73,7 @@ div.card-header span.fa {
   }
 
 .upload-file.busy > div > span.fa-times {
-  color: $danger;
+  color: var(--bs-danger);
   width: 20px;
   display: inline-block;
   vertical-align: middle;
@@ -94,7 +91,7 @@ div.card-header span.fa {
   }
 
   .upload-file > div.errormessage {
-    color: $danger;
+    color: var(--bs-danger);
     display: none;
   }
 

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,4 +1,4 @@
-<div class="side-panel hidden" [ngClass]="{'hidden':!visible,'collapsed':collapsed,'resizeable':(resizeable && mobile),'resizing':resizing,'left':left}" [ngStyle]="{'top':top}">
+<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($event)">
     <i class="fal fa-chevron-left" aria-hidden="true"></i>
   </div>

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

@@ -15,7 +15,7 @@
 }
 
 .side-panel.collapsed {
-  left:-22rem;
+  left:-44rem;
 }
 
 .arrow {
@@ -76,7 +76,6 @@ div.resizegrip > span {
 
 .resizeable .resizegrip {
   display:block;  
-  
 }
 
 .resizeable .content {
@@ -94,10 +93,17 @@ div.resizegrip > span {
 
   .side-panel.hidden {
     width: 22rem;
-    left:-24rem;
+    left:-22rem;
     height:100%;
     top: 0px;
   }
+  
+  .side-panel.extrawide {
+    top:0px;
+    width: 44rem;
+    height:100%;
+    left:0px;
+  }  
 }
 
 

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

@@ -1,4 +1,4 @@
-import { Component, Input,Output,ViewChild,EventEmitter, ElementRef,OnChanges,SimpleChanges,HostListener,ChangeDetectorRef  } from '@angular/core';
+import { Component, Input,Output,ViewChild,EventEmitter, ElementRef,OnChanges,SimpleChanges,HostListener,ChangeDetectorRef, ViewEncapsulation  } from '@angular/core';
 
 @Component({
   selector: 'fm-side-panel',
@@ -13,6 +13,7 @@ export class SidePanelComponent  implements OnChanges {
   @Input() public collapsable: boolean;
   @Input() public resizeable = false;
   @Input() public left = false;
+  @Input() public extrawide: boolean;
   @Output() onResize: EventEmitter<number> = new EventEmitter<number>();
   @ViewChild("resizeGrip") elementView: ElementRef;
   public mobile = true;
@@ -41,7 +42,7 @@ export class SidePanelComponent  implements OnChanges {
   }
 
   ngAfterViewInit() {
-    this.parentHeight = this.element.nativeElement.offsetParent.clientHeight;
+    this.parentHeight = this.element.nativeElement.offsetParent?.clientHeight;
     this.setTop();
   }
 

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

@@ -5,6 +5,9 @@
                 <div  class="card" *ngIf="user">           
                     <div class="card-body">
                         <div class="username">{{user.name}}</div>
+                        <div *ngIf="getProvider(); let provider">
+                            <small><span i18n>Provider</span><span> {{provider}}</span></small>
+                        </div>
                         <div><a href="#" (click)="logout($event)" i18n>logout</a></div>
                     </div>
                 </div>                

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

@@ -20,11 +20,14 @@ export class UserMenuComponent implements OnInit {
   ngOnInit(): void {
   }
 
-  getLetter():string {
+  getProvider():string | null {
-    if (this.user && this.user.firstName && this.user.lastName)
+    const ownedClaims = this.oauthService.getIdentityClaims();
-      return this.user.firstName.substr(0,1).toUpperCase() + 
+    if(ownedClaims) {
-             this.user.lastName.substr(0,1).toUpperCase();
+      if (ownedClaims["idp"] != "local") {
-    return this.user && this.user.name ? this.user.name.substr(0,1).toUpperCase():"";
+        return ownedClaims["idp"];
+      }
+    }
+    return null;
   }
 
   logout(event:MouseEvent) {

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

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, Inject, LOCALE_ID } from '@angular/core';
 import { Router } from '@angular/router';
 import { OAuthService,UserInfo } from 'angular-oauth2-oidc';
 import { Store } from '@ngrx/store';
@@ -16,6 +16,7 @@ import {StateSerializerService} from '../services/state-serializer.service';
 
 @Injectable()
 export class AppCommonEffects {
+  locale: string;
 
   login$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.LOGIN),
@@ -47,11 +48,27 @@ export class AppCommonEffects {
     first(),
     switchMap((action) => {
         return zip(this.userService$.getCurrentUser(),from(this.oauthService$.loadUserProfile())).pipe(
-        switchMap(([user,userInfo]) => {return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))} ),
+        switchMap(([user,userInfo]) => {
+          if (location.hostname === 'localhost' || user.language === undefined || user.language === this.locale) 
+          {
+            return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))
+          }
+          return of(new appCommonActions.SwitchLanguage(user.language))
+        }),
         catchError(error => of(new appCommonActions.Fail(error))))
     }
   )));
 
+  switchLanguage$ = createEffect(() => this.actions$.pipe(
+    ofType(appCommonActions.SWITCHLANGUAGE),
+    switchMap((action) => {
+      const a = action as appCommonActions.SwitchLanguage;
+      if (location.pathname.includes(`/${this.locale}/`)) {
+        const newPath = location.pathname.replace(`/${this.locale}/`, `/${a.locale}/`);
+        location.replace(newPath);
+      }
+      return of(undefined);
+    })),{ dispatch:false});
 
   initUserPackages$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.INITUSERPACKAGES),
@@ -139,16 +156,23 @@ export class AppCommonEffects {
           const itemType = itemtypes[a.item.itemType];
           var editor = itemType && itemType.editor ? itemType.editor : editor;  
         }
-      this.router$.navigate(['/editor',editor,'item', a.item.code])
+        if (editor == 'croppingscheme') { 
+          // Exeception: no 'item' in route
+          this.router$.navigate(['/editor', editor, a.item.code])
+        }
+        else {
+          this.router$.navigate(['/editor', editor, 'item', a.item.code])
+        }
         return [];
       }
-  )));
+    )
+  ));
 
   viewItem$ =  createEffect(() => this.actions$.pipe(
     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;
@@ -201,7 +225,8 @@ export class AppCommonEffects {
 
 
 
-  constructor(private actions$: Actions, private store$: Store<appCommonReducers.State>, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService) {
+  constructor(private actions$: Actions, private store$: Store<appCommonReducers.State>, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService, @Inject(LOCALE_ID) locale: string) {
+    this.locale = locale;
     store$.dispatch(new appCommonActions.LoadItemTypes());
   }
 }

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

@@ -1,6 +1,7 @@
 
 export interface IItemTask  {
   code?: string;
+  workflowCode?: string;
   taskType?: string;
   attributes?: any;
   message?: string,
@@ -11,6 +12,7 @@ export interface IItemTask  {
 
 export class ItemTask implements IItemTask {
   public code?:string;
+  public workflowCode?: string;
   public taskType?: string;
   public attributes?: any;
   public message?: string;

projects/common/src/fm/models/itemlink.type.ts

@@ -0,0 +1,6 @@
+export interface IItemLinkType {
+  itemcode: string;
+  pathsuffix?: string;
+  query?: string;
+  validminutes?: number;
+}

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/models/url.type.ts

@@ -0,0 +1,3 @@
+export interface IUrlType {
+  url: string;
+}

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

@@ -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
@@ -64,6 +66,8 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
         code:a.user.code,
         email:claims["email"]!== undefined ? claims["email"] : a.user.name,
         name:claims["name"]!== undefined?claims["name"] : a.user.email,
+        lastName:a.user.lastName,
+        firstName:a.user.firstName,
         claims:claims,
         searchable: false
       };
@@ -104,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;
@@ -201,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;
@@ -225,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

@@ -1,9 +1,11 @@
+import { HttpClient, HttpParams } from "@angular/common/http";
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { IItem } from '../models/item';
-import { HttpClient, HttpParams } from "@angular/common/http";
+import { IItemTask } from '../models/itemTask';
+import { IUser } from '../models/user';
 import { AppConfig } from "../shared/app.config";
-import {ItemTypeService} from './itemtype.service';
+import { ItemTypeService } from './itemtype.service';
 
 @Injectable({
   providedIn: 'root',
@@ -42,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);
+  }
 }