Merge branch 'develop'

# Conflicts:
#	package-lock.json

.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

@@ -1,54 +1,24 @@
+@Library('farmmaps-shared-library') _
+
 pipeline {
-  agent any
+  agent any;
-  environment {
+  options {
-     PACKAGE_VERSION_PREFIX=sh(script: 'jq .version package.json |sed "s/\\"//g"', returnStdout: true).trim()
+    copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
-     PACKAGE_VERSION="${PACKAGE_VERSION_PREFIX}"
+    disableConcurrentBuilds();
   }
   stages {
-    stage('npm install'){
+    stage('FarmmapsLibBuildAll') {
       steps {
-        sh '''rm -rf node_modules/
+        stepFarmmapsLibBuildAll();
-        npm install --legacy-peer-deps
-        cd projects/common
-        npm install --legacy-peer-deps
-        cd ../common-map
-        npm install --legacy-peer-deps
-        cd ../common-map3d
-        npm install --legacy-peer-deps
-        '''
       }
     }
-    stage('build'){
-      steps {
-        sh '''ng build common --configuration production
-        ng build common-map --configuration production
-        ng build common-map3d --configuration production'''
-      }
-    }
-    stage('npm publish'){
-      steps {
-        sh '''cd dist/common
-        npm version ${PACKAGE_VERSION} --allow-same-version
-        npm publish
-        cd ../common-map
-        npm version ${PACKAGE_VERSION} --allow-same-version
-        npm publish
-        cd ../common-map3d
-        npm version ${PACKAGE_VERSION} --allow-same-version
-        npm publish'''
-      }
-    }
-
   }
   post {
+    success {
+      postSuccess();
+    }
     always {
-      emailext (
+      postAlways();
-        body: '${DEFAULT_CONTENT}',
-        mimeType: 'text/html',
-        replyTo: '${DEFAULT_REPLYTO}',
-        subject: '${DEFAULT_SUBJECT}',
-        to: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])
-      )
     }
   }
 }

Jenkinsfile.develop

@@ -1,54 +1,24 @@
+@Library('farmmaps-shared-library') _
+
 pipeline {
-  agent any
+  agent any;
-  environment {
+  options {
-     PACKAGE_VERSION_PREFIX=sh(script: 'jq .version package.json |sed "s/\\"//g"', returnStdout: true).trim()
+    copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
-     PACKAGE_VERSION="${PACKAGE_VERSION_PREFIX + '-prerelease.' + env.BUILD_NUMBER}"
+    disableConcurrentBuilds();
   }
   stages {
-    stage('npm install'){
+    stage('FarmmapsLibBuildAll') {
       steps {
-        sh '''rm -rf node_modules/
+        stepFarmmapsLibBuildAll();
-        npm install --legacy-peer-deps
-        cd projects/common
-        npm install --legacy-peer-deps
-        cd ../common-map
-        npm install --legacy-peer-deps
-        cd ../common-map3d
-        npm install --legacy-peer-deps
-        '''
       }
     }
-    stage('build'){
-      steps {
-        sh '''ng build common --configuration production
-        ng build common-map --configuration production
-        ng build common-map3d --configuration production'''
-      }
-    }
-    stage('npm publish'){
-      steps {
-        sh '''cd dist/common
-        npm version ${PACKAGE_VERSION}
-        npm publish
-        cd ../common-map
-        npm version ${PACKAGE_VERSION}
-        npm publish
-        cd ../common-map3d
-        npm version ${PACKAGE_VERSION}
-        npm publish'''
-      }
-    }
-
   }
   post {
+    success {
+      postSuccess();
+    }
     always {
-      emailext (
+      postAlways();
-        body: '${DEFAULT_CONTENT}',
-        mimeType: 'text/html',
-        replyTo: '${DEFAULT_REPLYTO}',
-        subject: '${DEFAULT_SUBJECT}',
-        to: emailextrecipients([[$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']])
-      )
     }
   }
 }

README.md

@@ -51,7 +51,7 @@ npm install -g @angular/cli
 npm install
 ng serve
 ```
-*Go*
+*Go*`
 
 Point your browser to http://localhost:4200 
 

fonts/FMIconFont/style.css

@@ -51,7 +51,17 @@
   content: "i";
 }
 
-hallo
+.fm-carbon:before {
+  content: "j";
+}
+
+.fm-bo-akkerbouw:before {
+  content: "k";
+}
+
+.fm-grass:before {
+  content: "l";
+}
 
 @font-face {
   font-family: "FarmMaps";

package.json

@@ -1,6 +1,6 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "3.0.2",
+  "version": "4.5.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -11,23 +11,24 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^14.1.3",
+    "@angular/animations": "^17.3.3",
-    "@angular/common": "^14.1.3",
+    "@angular/common": "^17.3.3",
-    "@angular/compiler": "^14.1.3",
+    "@angular/compiler": "^17.3.3",
-    "@angular/core": "^14.1.3",
+    "@angular/core": "^17.3.3",
     "@angular-eslint/eslint-plugin": "^15.2.1",
-    "@angular/forms": "^14.1.3",
+    "@angular/forms": "^17.3.3",
-    "@angular/platform-browser": "^14.1.3",
+    "@angular/platform-browser": "^17.3.3",
-    "@angular/platform-browser-dynamic": "^14.1.3",
+    "@angular/platform-browser-dynamic": "^17.3.3",
-    "@angular/router": "^14.1.3",
+    "@angular/router": "^17.3.3",
     "@farmmaps/common": "file:dist/common",
     "@farmmaps/common-map": "file:dist/common-map",
     "@farmmaps/common-map3d": "file:dist/common-map3d",
+    "ng-openlayers": "17.1.3",
     "@microsoft/signalr": "^3.1.16",
-    "@ng-bootstrap/ng-bootstrap": "^13.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^16.0.0",
-    "@ngrx/effects": "^14",
+    "@ngrx/effects": "^17",
-    "@ngrx/router-store": "^14",
+    "@ngrx/router-store": "^17",
-    "@ngrx/store": "^14",
+    "@ngrx/store": "^17",
     "@popperjs/core": "^2.11.6",
     "angular-oauth2-oidc": "^13",
     "assert": "^2.0.0",
@@ -38,38 +39,37 @@
     "core-js": "^2.6.12",
     "https-browserify": "^1.0.0",
     "moment": "^2.29.4",
-    "ngrx-store-localstorage": "^14",
+    "ngrx-store-localstorage": "17.0.0",
-    "ngx-avatar": "^4.1.0",
+    "ngx-avatars": "1.7.0",
-    "ngx-clipboard": "^14.0.1",
+    "ngx-clipboard": "16.0.0",
-    "ngx-image-cropper": "^3.3.5",
+    "ngx-image-cropper": "^7.2.1",
-    "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.4"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "^14",
+    "@angular-builders/custom-webpack": "^17",
-    "@angular-devkit/build-angular": "^14.1.3",
+    "@angular-devkit/build-angular": "^17.3.3",
-    "@angular/cli": "^14.1.3",
+    "@angular/cli": "^17.3.3",
-    "@angular/compiler-cli": "^14.1.3",
+    "@angular/compiler-cli": "^17.3.3",
-    "@angular/language-service": "^14.1.3",
+    "@angular/language-service": "^17.3.3",
-    "@angular/localize": "^14.1.3",
+    "@angular/localize": "^17.3.3",
     "@types/arcgis-rest-api": "^10.4.5",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "^2.0.9",
     "@types/node": "^12.20.15",
-    "@typescript-eslint/eslint-plugin": "^5.54.0",
+    "@typescript-eslint/eslint-plugin": "^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",
     "eslint": "^8.35.0",
     "eslint-config-prettier": "^8.6.0",
@@ -81,9 +81,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": "^17.3.0",
     "protractor": "~7.0.0",
     "ts-node": "^8.8.1",
-    "typescript": "~4.6.4"
+    "typescript": "~5.4.4"
   }
 }

projects/common-map/package-lock.json

@@ -11,14 +11,14 @@
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/core": ">=14.0.0",
+        "@angular/core": "^17.3.3",
-        "@ngrx/effects": ">=14.0.0",
+        "@ngrx/effects": "^17",
-        "@ngrx/router-store": ">=14.0.0",
+        "@ngrx/router-store": "^17",
-        "@ngrx/store": ">=14.0.0",
+        "@ngrx/store": "^17",
-        "ngrx-store-localstorage": ">=14.0.0",
+        "ng-openlayers": "17.1.3",
-        "ngx-openlayers": ">=1.0.0-next.19",
+        "ngrx-store-localstorage": "^17",
-        "ol": ">=6.8.1",
+        "ol": "^8.2.0",
-        "tassign": ">=1.0.0"
+        "tassign": "^1.0.0"
       }
     },
     "node_modules/tslib": {

projects/common-map/package.json

@@ -8,13 +8,13 @@
     "tslib": "^2.0.0"
   },
   "peerDependencies": {
-    "@angular/core": ">=14.0.0",
+    "@angular/core": "^17.3.3",
-    "ngrx-store-localstorage": ">=14.0.0",
+    "ngrx-store-localstorage": "^17",
-    "@ngrx/effects": ">=14.0.0",
+    "@ngrx/effects": "^17",
-    "@ngrx/router-store":">=14.0.0",
+    "@ngrx/router-store": "^17",
-    "@ngrx/store":">=14.0.0",
+    "@ngrx/store": "^17",
-    "tassign": ">=1.0.0",
+    "tassign": "^1.0.0",
-    "ngx-openlayers": ">=1.0.0-next.19",
+    "ng-openlayers": "17.1.3",
-    "ol": ">=6.8.1"
+    "ol": "^8.2.0"
   }
 }

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

@@ -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 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,12 +337,23 @@ export class SetViewState implements Action {
   constructor(public enabled:boolean) {}
 }
 
+export class ClearFeatures implements Action {
+  readonly type = CLEARFEATURES;
+  constructor() {}
+}
+
+export class SetPanelExtraWide implements Action {
+  readonly type = SETPANELEXTRAWIDE;
+  constructor(public panelExtraWide:boolean) {}
+}
+
 export type Actions = SetMapState
   | Init
   | Clear
   | SetParent
   | StartSearch
   | StartSearchSuccess
+  | ClickFeature
   | SelectFeature
   | SelectItem
   | SelectItemSuccess
@@ -374,5 +393,7 @@ export type Actions = SetMapState
   | GetLayerValue
   | SetPeriod
   | ToggleShowDataLayerSlide
-  | SetViewState;
+  | SetViewState
+  | ClearFeatures
+  | SetPanelExtraWide;
 

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

@@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 //external modules
-import { AngularOpenlayersModule } from 'ngx-openlayers';
+import { AngularOpenlayersModule } from 'ng-openlayers';
 import { StoreModule, ActionReducer, MetaReducer } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 import { NgbModule } from "@ng-bootstrap/ng-bootstrap";

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 '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 '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 '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"));
@@ -250,8 +251,8 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
             return new style.Style(
               {               
                 stroke: new style.Stroke({
-                  color: 'red',
+                  color: '#0d6efd',
-                  width: 2
+                  width: 3
                 })
               }
             );

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

@@ -66,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);
@@ -119,7 +120,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
       this.querySub = this.query$.pipe(skip(1), withLatestFrom(this.mapState$)).subscribe(([query,mapState]) =>{
         if(query && query.querystate) {
           let newQueryState = tassign(mapReducers.initialQueryState);
-          console.debug(`Do Query`);
+          //console.debug(`Do Query`);
           const urlparts=[];
           if (query.querystate.itemCode && query.querystate.itemCode != "") {
             if(query.querystate.itemType && query.querystate.itemType!= "") {
@@ -192,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);
   }
 
@@ -207,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) {
@@ -242,7 +250,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
 
   ngOnInit() {    
     this.initialized = false;
-    console.debug("Init");
+    //console.debug("Init");
     this.store.dispatch(new mapActions.Clear());
     this.selectedFeatures$.next({x:0,y:0,features:[]});
     this.selectedFeatures$.next(null);
@@ -314,7 +322,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   }
 
   ngAfterViewInit() {
-    console.debug("View init");
+    //console.debug("View init");
     this.noContent=true;
     this.route.children.forEach((entry) => {
       if(entry.outlet=="primary") {
@@ -348,7 +356,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
       })).subscribe((action) => {
         if(action) {
           this.zone.run(() => {
-            console.debug("Url to state");
+            //console.debug("Url to state");
             this.store.dispatch(action);
           });
         }
@@ -365,9 +373,9 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
       else {
         return of(null);
       }
-      })).subscribe((newUrlState) =>{
+    })).subscribe((newUrlState: any) => {
         if(newUrlState) {
-          console.debug(`State to url`);
+          //console.debug(`State to url`);
           this.replaceUrl(newUrlState.mapState,newUrlState.queryState,newUrlState.replaceUrl);
         }
       });
@@ -425,7 +433,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
           parts.push(mapState.baseLayerCode);
           parts.push( this.serializeService.serialize(queryState));
           
-          console.debug("Replace url",parts);
+          //console.debug("Replace url",parts);
           this.router.navigate(parts, { replaceUrl: replace,relativeTo:this.route.parent });
         }  
       }     
@@ -434,7 +442,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   handleOnMoveEnd(event) {    
     if(this.initialized && this.viewEnabled) {
       this.zone.run(() =>{
-        console.debug("Move end");
+        //console.debug("Move end");
         const map = event.map;
         const view = map.getView();
         const rotation = view.getRotation();
@@ -443,7 +451,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
         const viewExtent = view.calculateExtent(this.map.instance.getSize());
         const mapState: IMapState = { xCenter: center[0], yCenter: center[1], zoom: zoom, rotation: rotation, baseLayerCode: null };
         const state = { mapState: mapState, viewExtent: viewExtent };
-        console.debug("Center: ",center[0],center[1] );
+        //console.debug("Center: ",center[0],center[1] );
         const source = from([state]);
         source.pipe(withLatestFrom(this.selectedBaseLayer$)).subscribe(([state, baselayer]) => {
           if (mapState && baselayer) { // do not react on first move

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

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

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

@@ -49,6 +49,7 @@ export interface State {
   features: Array<Feature<Geometry>>,
   panelVisible: boolean,
   panelCollapsed: boolean,
+  panelExtraWide: boolean,
   selectedFeature: Feature<Geometry>,
   selectedItem:IItem,
   parentItem:IItem,
@@ -94,6 +95,7 @@ export const initialState: State = {
   features: [],
   panelVisible: false,
   panelCollapsed: false,
+  panelExtraWide: false,
   selectedFeature: null,
   selectedItem: null,
   parentItem: null,
@@ -388,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) {
@@ -569,6 +574,10 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       }
       return state;
     }
+    case mapActions.SETPANELEXTRAWIDE:{
+      const a= action as mapActions.SetPanelExtraWide;
+      return tassign(state,{panelExtraWide:a.panelExtraWide});
+    }
     default: {
       return state;
     }
@@ -580,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;
@@ -588,6 +598,7 @@ export const getClearEnabled = (state: State) => state.clearEnabled;
 export const getSearchCollapsed = (state: State) => state.searchCollapsed;
 export const getSearchMinified = (state: State) => state.searchMinified;
 export const getExtent = (state: State) => state.extent;
+export const getViewExtent = (state: State) => state.viewExtent;
 export const getOverlayLayers = (state: State) => state.overlayLayers;
 export const getBaseLayers = (state: State) => state.baseLayers;
 export const getProjection = (state: State) => state.projection;
@@ -614,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);
@@ -622,6 +634,7 @@ export const selectGetClearEnabled = createSelector(selectMapState, getClearEnab
 export const selectGetSearchCollapsed = createSelector(selectMapState, getSearchCollapsed);
 export const selectGetSearchMinified = createSelector(selectMapState, getSearchMinified);
 export const selectGetExtent = createSelector(selectMapState, getExtent);
+export const selectGetViewExtent = createSelector(selectMapState, getViewExtent);
 export const selectGetOverlayLayers = createSelector(selectMapState, getOverlayLayers);
 export const selectGetBaseLayers = createSelector(selectMapState, getBaseLayers);
 export const selectGetProjection = createSelector(selectMapState, getProjection);

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,10 +11,10 @@
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/common": ">=14.0.0",
+        "@angular/common": "^17.3.3",
-        "@angular/core": ">=14.0.0",
+        "@angular/core": "^17.3.3",
         "cesium": ">=1.82.1",
-        "ngx-openlayers": "1.0.0-next.19",
+        "ng-openlayers": "17.1.3",
         "ol-cesium": ">=2.13.0"
       }
     },

projects/common-map3d/package.json

@@ -5,9 +5,9 @@
     "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
   },
   "peerDependencies": {
-    "@angular/common":  ">=14.0.0",
+    "@angular/common":  "^17.3.3",
-    "@angular/core":  ">=14.0.0",
+    "@angular/core":  "^17.3.3",
-    "ngx-openlayers": "1.0.0-next.19",
+    "ng-openlayers": "17.1.3",
     "cesium": ">=1.82.1",
     "ol-cesium": ">=2.13.0"
   },

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 'ng-openlayers';
 import OLCesium from 'olcs/OLCesium';
 import RasterSynchronizer from 'olcs/RasterSynchronizer';
 import VectorSynchronizer from 'olcs/VectorSynchronizer';

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-lock.json

@@ -8,22 +8,22 @@
       "name": "@farmmaps/common",
       "version": "2.0.0",
       "peerDependencies": {
-        "@angular/common": ">=14.0.0",
+        "@angular/common": "^17.3.3",
-        "@angular/core": ">=14.0.0",
+        "@angular/core": "^17.3.3",
-        "@angular/forms": ">=14.0.0",
+        "@angular/forms": "^17.3.3",
-        "@microsoft/signalr": ">=3.1.3",
+        "@microsoft/signalr": "^3.1.16",
-        "@ng-bootstrap/ng-bootstrap": ">=10.0.0",
+        "@ng-bootstrap/ng-bootstrap": "^16.0.0",
-        "@ngrx/effects": ">=14.0.0",
+        "@ngrx/effects": "^17",
-        "@ngrx/router-store": ">=14.0.0",
+        "@ngrx/router-store": "^17",
-        "@ngrx/store": ">=14.0.0",
+        "@ngrx/store": "^17",
-        "angular-oauth2-oidc": ">=13.0.0",
+        "angular-oauth2-oidc": "^13",
-        "bootstrap": ">=4.4.1",
+        "bootstrap": "^5.2.0",
-        "moment": ">=2.27.0",
+        "moment": "^2.29.4",
-        "ngx-avatar": ">=4.1.0",
+        "ngx-avatars": "1.7.0",
-        "ngx-clipboard": ">=14.0.1",
+        "ngx-clipboard": "16.0.0",
-        "ngx-image-cropper": ">=3.3.5",
+        "ngx-image-cropper": "^7.2.1",
-        "ngx-uploadx": ">=5.1.0",
+        "ngx-uploadx": "^6.2.0",
-        "tassign": ">=1.0.0"
+        "tassign": "^1.0.0"
       }
     }
   }

projects/common/package.json

@@ -5,21 +5,21 @@
     "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
   },
   "peerDependencies": {
-    "@ng-bootstrap/ng-bootstrap": ">=10.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^16.0.0",
-    "@angular/common": ">=14.0.0",
+    "@angular/common": "^17.3.3",
-    "@angular/core": ">=14.0.0",
+    "@angular/core": "^17.3.3",
-    "@angular/forms": ">=14.0.0",
+    "@angular/forms": "^17.3.3",
-    "@ngrx/effects": ">=14.0.0",
+    "@ngrx/effects": "^17",
-    "@ngrx/router-store": ">=14.0.0",
+    "@ngrx/router-store": "^17",
-    "@ngrx/store": ">=14.0.0",
+    "@ngrx/store": "^17",
-    "tassign": ">=1.0.0",
+    "tassign": "^1.0.0",
-    "bootstrap": ">=4.4.1",
+    "bootstrap": "^5.2.0",
-    "@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": "^13",
-    "moment": ">=2.27.0",
+    "moment": "^2.29.4",
-    "ngx-avatar": ">=4.1.0",
+    "ngx-avatars": "1.7.0",
-    "ngx-image-cropper": ">=3.3.5",
+    "ngx-image-cropper": "^7.2.1",
-    "ngx-clipboard": ">=14.0.1"
+    "ngx-clipboard": "16.0.0"
   }
 }

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

@@ -126,7 +126,7 @@ export class InitUserSettingsRoot implements Action {
 export class InitUserSettingsRootSuccess implements Action {
   readonly type = INITUSERSETTINGSROOTSUCCESS;
 
-  constructor(public item: IItem ) { }
+  constructor(public item: IListItem ) { }
 }
 
 export class InitRoot implements Action {

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

@@ -18,6 +18,7 @@ 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';
@@ -48,6 +49,7 @@ export {
   TypeaheadService,
   UserService,
   ImageService,
+  DownloadService,
   GeolocatorService,
   WeatherService,
   AppConfig,

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

@@ -42,6 +42,8 @@ import { IEventMessage } from './models/event.message';
 import { IItem, Item } from './models/item';
 import { WeatherCurrentObservation } from './models/weatherCurrentObservation';
 import { IItemType } from './models/item.type';
+import { IItemLinkType} from './models/itemlink.type';
+import {IUrlType} from './models/url.type';
 import { IItemTypes } from './models/item.types';
 import { IItemTask, ItemTask } from './models/itemTask';
 import { IListItem } from './models/list.item';
@@ -65,7 +67,8 @@ 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 { AvatarModule } from 'ngx-avatar';
+import { ItemLinkComponent } from './components/item-link/item-link.component';
+import { AvatarModule } from 'ngx-avatars';
 import { ImageCropperModule } from 'ngx-image-cropper';
 
 export const FM_COMMON_STARTPAGE = new InjectionToken<string>('fm-common-startpage');
@@ -92,6 +95,8 @@ export {
   IItem,
   Item,
   IItemType,
+  IItemLinkType,
+  IUrlType,
   IItemTypes,
   IItemTask,
   ItemTask,
@@ -115,6 +120,7 @@ export {
   IGradientstop,
   BackButtonComponent,
   AvatarComponent,
+  ItemLinkComponent,
   EditImageModalComponent,
   GradientComponent,
   GradientSelectComponent
@@ -160,7 +166,8 @@ export {
     BackButtonComponent,
     ThumbnailComponent,
     EditImageModalComponent,
-    AvatarComponent
+    AvatarComponent,
+    ItemLinkComponent
   ],
   exports: [
     NgbModule,
@@ -189,6 +196,7 @@ export {
     BackButtonComponent,
     ThumbnailComponent,
     AvatarComponent,
+    ItemLinkComponent,
     EditImageModalComponent
   ]
 })

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);
 }
 
 

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

@@ -69,7 +69,7 @@ export class AppComponent implements OnInit, OnDestroy {
 
   getActionFromEvent(event: IEventMessage): Action {
     let action: Action = null;
-    console.debug(`${event.eventType} Event received`);
+    //console.debug(`${event.eventType} Event received`);
     switch (event.eventType) {
       case "ItemChanged": {
         action = new commonActions.ItemChangedEvent(event.itemCode, event.attributes);
@@ -115,18 +115,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'])
@@ -146,12 +139,12 @@ export class AppComponent implements OnInit, OnDestroy {
   private InstallAuthenticationEventHandler() {
     // auth event handler
     this.oauthService$.events.subscribe((event) => {
-      console.debug(event.type);
+      //console.debug(event.type);
       if (event.type == 'token_error' || event.type == 'silent_refresh_timeout' || event.type == 'logout') {
         const e = event as OAuthErrorEvent;
         const p = e.params as any;
         if (event.type == 'silent_refresh_timeout' || event.type == 'logout' || (p.error && p.error == 'login_required')) {
-          console.debug("Session expired");
+          //console.debug("Session expired");
           this.router.navigate(['loggedout'], { queryParams: { redirectTo: this.router.url } });
         }
       }

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/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,7 +1,3 @@
-/* Import Bootstrap & Fonts */
-
-@import "~bootstrap/scss/bootstrap.scss";
-
 div.resumable-file-upload {
   position: fixed;
   right: 0px;
@@ -76,7 +72,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 +90,7 @@ div.card-header span.fa {
   }
 
   .upload-file > div.errormessage {
-    color: $danger;
+    color: var(--bs-danger);
     display: none;
   }
 

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

@@ -85,9 +85,8 @@ export class AppCommonEffects {
   
   initUserSettingsRoot$ =  createEffect(() => this.actions$.pipe(
     ofType(appCommonActions.INITUSERSETTINGSROOT),
-    withLatestFrom(this.store$.select(appCommonReducers.SelectGetUser)),
+    switchMap(_ => {
-    switchMap(([, user]) => {
+      return this.folderService$.getFolder('my_settings').pipe(
-      return this.itemService$.getItem(user.code + ':USER_SETTINGS').pipe(
         switchMap((item) => of(new appCommonActions.InitUserSettingsRootSuccess(item))),
         catchError(error =>  of(new appCommonActions.Fail(error)))
       )
@@ -170,7 +169,7 @@ export class AppCommonEffects {
         this.router$.navigate(['/map', query ])
       }else if(viewer == 'edit_in_editor') {
         this.router$.navigate(['/editor', editor, 'item', a.item.code])
-      } else  {
+      } else if(viewer) {
         this.router$.navigate(['/viewer', viewer, 'item', a.item.code])
       }
       return [];
@@ -182,18 +181,18 @@ export class AppCommonEffects {
     ofType(appCommonActions.FAIL),
     map((action) => {
       const failAction = action as appCommonActions.Fail;
-      console.debug(failAction.payload)
+      //console.debug(failAction.payload)
       return null;
     })),{dispatch:false});
 
     online$ =  createEffect(() => this.actions$.pipe(
       ofType(appCommonActions.ONLINE),
       switchMap((action) => {
-          console.debug("Online: Check token");
+          //console.debug("Online: Check token");
           if(!this.oauthService$.hasValidAccessToken()) {
-            console.debug("No valid token, try to refresh");
+            //console.debug("No valid token, try to refresh");
             if(this.oauthService$.getRefreshToken() != null ) {
-              console.debug("We have a refresh token");
+              //console.debug("We have a refresh token");
               this.oauthService$.refreshToken();              
             }
           }

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

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

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

@@ -64,6 +64,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
       };

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

@@ -1,11 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
+import { Router, Route, ActivatedRouteSnapshot, RouterStateSnapshot, UrlSegment, UrlTree } from '@angular/router';
-  CanActivate, Router, CanLoad, Route, CanActivateChild ,
-  ActivatedRouteSnapshot,
-  RouterStateSnapshot,
-  UrlSegment,
-  UrlTree
-} from '@angular/router';
 
 
 import { Store } from '@ngrx/store';
@@ -19,49 +13,58 @@ import * as appCommonReducer from '../reducers/app-common.reducer';
 @Injectable({
   providedIn: 'root',
 })
-export class AuthGuard implements CanActivate, CanLoad, CanActivateChild  { 
+export class AuthGuard   { 
  
   constructor(private oauthService: OAuthService, private router: Router, private store: Store<appCommonReducer.State>) { }
   
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean | UrlTree | Observable<boolean | UrlTree> | Promise<boolean | UrlTree> {
-    console.debug("AuthGuard->canActivate", route, state);
+    //console.debug("AuthGuard->canActivate", route, state);
     const url: string = state.url;
 
     return this.checkLogin(url, route);
   }
   
   canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean | UrlTree | Observable<boolean | UrlTree> | Promise<boolean | UrlTree> {
-    console.debug("AuthGuard->canActivateChild", childRoute, state);
+    //console.debug("AuthGuard->canActivateChild", childRoute, state);
     const url: string = state.url;
 
     return this.checkLogin(url, childRoute);
   }
   
   canLoad(route: Route, segments: UrlSegment[]): boolean | UrlTree | Observable<boolean | UrlTree> | Promise<boolean | UrlTree> {
-    console.debug("AuthGuard->canLoad", route, segments);
+    //console.debug("AuthGuard->canLoad", route, segments);
     return this.checkLogin(route.path, null);
   }
 
   checkLogin(url: string, route: ActivatedRouteSnapshot): boolean {
-    console.debug("AuthGuard->checkLogin", url, route);
+    //console.debug("AuthGuard->checkLogin", url, route);
     if (!this.oauthService.hasValidAccessToken()) {
-      console.debug("No valid token");
+      //console.debug("No valid token");
       this.oauthService.initCodeFlow(url);
       return false;
     } else {
       const requiredRoleClaim = route.data.role;
       if (!requiredRoleClaim) { return true; }
       const ownedClaims = this.oauthService.getIdentityClaims();
-      if (!ownedClaims) { console.debug("No owned claims"); return false; }
+      if (!ownedClaims) {
+        //console.debug("No owned claims");
+        return false;
+      }
       const ownedRoleClaims: string[] = ownedClaims['role'];
-      if (!ownedRoleClaims) { console.debug("No owned role claims"); return false; }
+      if (!ownedRoleClaims) {
+        // console.debug("No owned role claims"); 
+        return false;
+      }
       if (Array.isArray(ownedRoleClaims)) {
-        if (ownedRoleClaims.findIndex(r => r === requiredRoleClaim) <= -1) { console.debug("No required role claim", ownedRoleClaims, requiredRoleClaim); return false; }
+        if (ownedRoleClaims.findIndex(r => r === requiredRoleClaim) <= -1) {
+          //console.debug("No required role claim", ownedRoleClaims, requiredRoleClaim);
+          return false;
+        }
       }
       else {
         if (ownedRoleClaims !== requiredRoleClaim) { console.debug("No required role claim", ownedRoleClaims, requiredRoleClaim); return false; }
       }
-      console.debug("Has required role claim", requiredRoleClaim);
+      //console.debug("Has required role claim", requiredRoleClaim);
       return true;
     }
   }

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

@@ -0,0 +1,29 @@
+import { Injectable } from '@angular/core';
+import { Observable, of } from 'rxjs';
+import { IItem } from '../models/item';
+import { HttpClient } from "@angular/common/http";
+import { AppConfig } from "../shared/app.config";
+import {ItemTypeService} from './itemtype.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class DownloadService {
+  constructor(public httpClient: HttpClient, public appConfig: AppConfig,private itemTypeService:ItemTypeService) {
+  }
+
+  ApiEndpoint() {
+    return this.appConfig.getConfig("apiEndPoint");
+  }
+
+  getData(itemCode: string): Observable<any> {
+    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/items/${itemCode}/data`);
+  }
+
+  getData2(item: IItem): Observable<any> {
+    if (item.size > 0) {
+      return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/items/${item.code}/data`)
+    }
+    return of({});
+  }
+}

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

@@ -1,17 +1,17 @@
 import {Injectable} from '@angular/core';
-import { Observable ,  Observer } from 'rxjs';
+import {Observable} from 'rxjs';
-import {map} from 'rxjs/operators';
 import {IListItem} from '../models/list.item';
 import {IItem} from '../models/item';
-import { HttpClient } from "@angular/common/http";
+import {HttpClient} from '@angular/common/http';
-import { AppConfig } from "../shared/app.config";
+import {AppConfig} from '../shared/app.config';
+import {ItemService} from './item.service';
 
 @Injectable({
   providedIn: 'root',
 })
 export class FolderService {
 
-  constructor(public httpClient: HttpClient, public appConfig: AppConfig) {
+  constructor(public httpClient: HttpClient, public appConfig: AppConfig, public itemService: ItemService) {
   }
 
   ApiEndpoint() {
@@ -27,15 +27,16 @@ export class FolderService {
     }
 
     getFolderParents(code: string): Observable<IListItem[]> {
-      return this.httpClient.get<IListItem[]>(`${this.ApiEndpoint()}/api/v1/folders/${code}/parents`);
+      return this.itemService.getBreadcrumbs(code);
     }
 
     getChildFolders(code: string): Observable<IListItem[]> {
-      return this.httpClient.get<IListItem[]>(`${this.ApiEndpoint()}/api/v1/folders/${code}/listfolders`);
+      const folderItemTypes = "FOLDER,FTP_FOLDER";
+      return this.itemService.getChildItemList(code, folderItemTypes);
     }
 
     getItems(code: string,skip:number, take:number): Observable<IListItem[]> {
-      return this.httpClient.get<IListItem[]>(`${this.ApiEndpoint()}/api/v1/folders/${code}/list?skip=${skip}&take=${take}`);
+      return this.itemService.getChildItemList(code, null, null, 1, true, null, null, skip, take);
     }
 
     moveItem(itemCode: string, newParentCode: string): Observable<IListItem> {

projects/common/src/fm/services/full-screen-guard.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { CanActivate, CanActivateChild, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
+import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 
 import { Store } from '@ngrx/store';
 
@@ -10,7 +10,7 @@ import * as appCommonActions from '../actions/app-common.actions';
 @Injectable({
   providedIn: 'root',
 })
-export class FullScreenGuard implements CanActivate,CanActivateChild { 
+export class FullScreenGuard  { 
  
   private loginDispatched = false;
   constructor(private store: Store<appCommonReducer.State> ) { }

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

@@ -2,12 +2,15 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { IItemType } from '../models/item.type';
+import { IItemLinkType } from '../models/itemlink.type';
+import { IUrlType } from '../models/url.type';
 import { IItem } from '../models/item';
 import { IJsonline } from '../models/json-line';
 import { IItemTask } from '../models/itemTask';
 import { HttpClient, HttpParams,HttpHeaders } from "@angular/common/http";
 import { AppConfig } from "../shared/app.config";
 import {ItemTypeService} from './itemtype.service';
+import {IListItem} from '../models/list.item';
 
 @Injectable({
   providedIn: 'root',
@@ -62,6 +65,10 @@ export class ItemService {
     return this.httpClient.get<IItem>(`${this.ApiEndpoint()}/api/v1/items/${code}`);
   }
 
+  getItemLink(itemLink: IItemLinkType): Observable<any> {
+    return this.httpClient.post<IItemLinkType>(`${this.ApiEndpoint()}/api/v1/itemlink`,itemLink);
+  }
+
   getItemData(code: string,start?:number,size?:number): Observable<ArrayBuffer> {
     let headers = new HttpHeaders();
     if(start !== undefined && size !== undefined) headers=headers.set("Range",`bytes=${start}-${size-1}`);
@@ -72,7 +79,7 @@ export class ItemService {
     return this.httpClient.get<IItem>(`${this.ApiEndpoint()}/api/v1/items/${code}/${itemType}`);
   }
 
-  getItemList(itemType?: string, dataFilter?: any, level?: number, atItemLocationItemCode?: string, indexed?: boolean, validToday?: boolean): Observable<IItem[]> {
+  getItemList(itemType?: string, dataFilter?: any, level?: number, atItemLocationItemCode?: string, indexed?: boolean, validToday?: boolean,tags?:string,crs?:string): Observable<IItem[]> {
     let params = new HttpParams();
     if(itemType)  params = params.append("it", itemType);
     if(dataFilter) params = params.append("df", JSON.stringify(dataFilter));
@@ -80,11 +87,13 @@ export class ItemService {
     if(indexed) params = params.append("ind",indexed?"true":"false");
     if (level) params = params.append("lvl", level.toFixed());
     if (validToday) params = params.append("vt", validToday ? "true" : "false");
+    if (tags) params = params.append("t", tags);
+    if (crs) params = params.append("crs", crs);
     return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/`, { params: params });
   }
 
   getChildItemList(parentcode: string, itemType: string, dataFilter?: any, level = 1, deep = true,
-                   startDate?: Date, endDate?: Date): Observable<IItem[]> {
+                   startDate?: Date, endDate?: Date, skip?: number, take?: number): Observable<IItem[]> {
     let params = new HttpParams();
     if(itemType != null) {
       params = params.append("it", itemType);
@@ -96,6 +105,9 @@ export class ItemService {
     params = params.append("deep", deep.toString());
     if (startDate) params = params.append("sDate", startDate.toISOString());
     if (endDate) params = params.append("eDate", endDate.toISOString());
+
+    if(skip) params = params.append("skip", skip);
+    if(take) params = params.append("take", take);
     return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params });
   }
 
@@ -140,6 +152,13 @@ export class ItemService {
     return this.httpClient.put<IItem>(`${this.ApiEndpoint()}/api/v1/items/${item.code}`,item);
   }
 
+  putItemFile(item: IItem, jsonObject: any): Observable<IItem> {
+    const formData = new FormData();
+    const file = new File([JSON.stringify(jsonObject, undefined, '\t')], 'data.dat', {type: 'application/json'});
+    formData.append('file', file);
+    return this.httpClient.put<any>(`${this.ApiEndpoint()}/api/v1/items/${item.code}/data`, formData);
+  }
+
   deleteItem(code: string): Observable<any> {
     return this.httpClient.delete<any>(`${this.ApiEndpoint()}/api/v1/items/${code}`);
   }
@@ -181,4 +200,7 @@ export class ItemService {
     return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/items/${itemCode}/value/layer/${layerIndex}?c=${x},${y}&crs=${crs}`);
   }
 
+  getBreadcrumbs(itemCode: string): Observable<IListItem[]> {
+    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/items/${itemCode}/breadcrumbs`);
+  }
 }

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

@@ -27,7 +27,7 @@ export class ItemTypeService {
 
      getExtraAttributes(itemType: string) {
       let extraAttributes = null;
-      if (this.itemTypes[itemType]) extraAttributes = this.itemTypes[itemType].extraAttributes;
+      if (this.itemTypes[itemType] && this.itemTypes[itemType].extraAttributes) extraAttributes = this.itemTypes[itemType].extraAttributes;
       return extraAttributes;
     }
 

projects/common/src/fm/services/nav-bar-guard.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { CanLoad, Route, CanActivate, CanDeactivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { Route, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 
 import { Store } from '@ngrx/store';
 
@@ -10,7 +10,7 @@ import * as appCommonActions from '../actions/app-common.actions';
 @Injectable({
   providedIn: 'root',
 })
-export class NavBarGuard implements CanActivate {
+export class NavBarGuard  {
 
   private loginDispatched = false;
   constructor(private store: Store<appCommonReducer.State>) { }

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

@@ -1,11 +1,11 @@
 import {Injectable} from '@angular/core';
-import {ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot} from '@angular/router';
+import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 import {PackageService} from './package.service';
 
 @Injectable({
   providedIn: 'root',
 })
-export class PackageGuard implements CanActivate {
+export class PackageGuard  {
 
   constructor(private packageService: PackageService) { }
 

projects/common/src/fm/services/package-preload-strategy.service.ts

@@ -21,7 +21,7 @@ export class PackagePreloadStrategy extends PreloadingStrategy {
         }
         if(route.data && route.data.package) {
             if(this.packageService$.hasPackage(route.data.package)) {
-                console.debug(`Load module for package ${route.data.package}`)
+                //console.debug(`Load module for package ${route.data.package}`)
                 this.loading.add(route);
                 return load()
             }

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

@@ -0,0 +1,10 @@
+import { Injectable, isDevMode } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ProductionGuard {
+  canActivate(): boolean {
+    return !isDevMode();
+  } 
+}

projects/common/src/fm/shared/app.config.factory.ts

@@ -12,6 +12,7 @@ export function appConfigFactory(injector:Injector, appConfig: AppConfig, oauthS
   return (): Promise<any> => {
     return new Promise<void>((resolve,reject) => {
       appConfig.load().then(() => {
+        itemtypeService.load(appConfig);
         oauthService.configure(authconfigFactory.getAuthConfig(appConfig));
         oauthService.setStorage(authStorage);
         oauthService.setupAutomaticSilentRefresh();