Aw5739 update to Angular v15

Aw5739 typescript required minimum version
2023-12-27 16:28:34 +01:00 · 2023-12-27 16:23:26 +01:00 · 2023-12-27 14:19:01 +01:00 · 2023-12-27 14:15:12 +01:00 · 2023-12-27 13:53:50 +01:00
80 changed files with 16096 additions and 10023 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -51,5 +51,4 @@ 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/
--- a/README.md
+++ b/README.md
@@ -1,65 +1,65 @@
-# Farmmaps viewer
-
-This is a sample FarmMaps client in Angular 7.x.
-
-
-## Quick start
-
-Use one of the two options below to get started.
-
-## Option 1, Using docker
-
-*Dependencies*  
-
-* docker desktop
-
-*Setup*
-
-```
-docker pull node:12.13.1
-docker run -t -i --entrypoint /bin/bash -p 4200:4200 node:12.13.1
-```
-
-Inside the running container 
-```
-git clone https://git.akkerweb.nl/FarmMaps/FarmMapsLib.git
-cd FarmMapsLib
-npm config set @farmmaps:registry https://repository.akkerweb.nl/repository/npm-group/
-npm install -g @angular/cli
-npm install
-ng serve --host 0.0.0.0
-```
-*Go*
-
-Point your browser to http://localhost:4200
-
-## Option 2, Using local machine
-
-*Dependencies*
-
-* npm 6.9.0
-* nodejs 10.16.0
-* git
-
-*Setup*
-
-```
-git clone https://git.akkerweb.nl/FarmMaps/FarmMapsLib.git
-cd FarmMapsLib
-npm config set @farmmaps:registry https://repository.akkerweb.nl/repository/npm-group/
-npm install -g @angular/cli
-npm install
-ng serve
-```
-*Go*`
-
-Point your browser to http://localhost:4200 
-
-*ESLint*
-
-```
-npm run lint src
-npm run lint projects/common/src
-npm run lint projects/common-map/src
-npm run lint projects/common-map3d/src
+# Farmmaps viewer
+
+This is a sample FarmMaps client in Angular 7.x.
+
+
+## Quick start
+
+Use one of the two options below to get started.
+
+## Option 1, Using docker
+
+*Dependencies*  
+
+* docker desktop
+
+*Setup*
+
+```
+docker pull node:12.13.1
+docker run -t -i --entrypoint /bin/bash -p 4200:4200 node:12.13.1
+```
+
+Inside the running container 
+```
+git clone https://git.akkerweb.nl/FarmMaps/FarmMapsLib.git
+cd FarmMapsLib
+npm config set @farmmaps:registry https://repository.akkerweb.nl/repository/npm-group/
+npm install -g @angular/cli
+npm install
+ng serve --host 0.0.0.0
+```
+*Go*
+
+Point your browser to http://localhost:4200
+
+## Option 2, Using local machine
+
+*Dependencies*
+
+* npm 6.9.0
+* nodejs 10.16.0
+* git
+
+*Setup*
+
+```
+git clone https://git.akkerweb.nl/FarmMaps/FarmMapsLib.git
+cd FarmMapsLib
+npm config set @farmmaps:registry https://repository.akkerweb.nl/repository/npm-group/
+npm install -g @angular/cli
+npm install
+ng serve
+```
+*Go*
+
+Point your browser to http://localhost:4200
+
+*ESLint*
+
+```
+npm run lint src
+npm run lint projects/common/src
+npm run lint projects/common-map/src
+npm run lint projects/common-map3d/src
 ```
--- a/angular.json
+++ b/angular.json
@@ -215,7 +215,7 @@
              "tsConfig": "projects/common-map/tsconfig.lib.prod.json"
            }
          }
-        },
+},
        "test": {
          "builder": "@angular-devkit/build-angular:karma",
          "options": {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "farmmaps-lib-app",
-  "version": "4.5.0",
+  "version": "4.2.0",
  "scripts": {
    "ng": "ng",
    "start": "ng serve",
@@ -11,24 +11,23 @@
  },
  "private": true,
  "dependencies": {
-    "@angular/animations": "^17.3.3",
-    "@angular/common": "^17.3.3",
-    "@angular/compiler": "^17.3.3",
-    "@angular/core": "^17.3.3",
    "@angular-eslint/eslint-plugin": "^15.2.1",
-    "@angular/forms": "^17.3.3",
-    "@angular/platform-browser": "^17.3.3",
-    "@angular/platform-browser-dynamic": "^17.3.3",
-    "@angular/router": "^17.3.3",
+    "@angular/animations": "^15.2.10",
+    "@angular/common": "^15.2.10",
+    "@angular/compiler": "^15.2.10",
+    "@angular/core": "^15.2.10",
+    "@angular/forms": "^15.2.10",
+    "@angular/platform-browser": "^15.2.10",
+    "@angular/platform-browser-dynamic": "^15.2.10",
+    "@angular/router": "^15.2.10",
    "@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": "^16.0.0",
-    "@ngrx/effects": "^17",
-    "@ngrx/router-store": "^17",
-    "@ngrx/store": "^17",
+    "@ng-bootstrap/ng-bootstrap": "^13.0.0",
+    "@ngrx/effects": "^14",
+    "@ngrx/router-store": "^14",
+    "@ngrx/store": "^14",
    "@popperjs/core": "^2.11.6",
    "angular-oauth2-oidc": "^13",
    "assert": "^2.0.0",
@@ -39,12 +38,13 @@
    "core-js": "^2.6.12",
    "https-browserify": "^1.0.0",
    "moment": "^2.29.4",
-    "ngrx-store-localstorage": "17.0.0",
-    "ngx-avatars": "1.7.0",
-    "ngx-clipboard": "16.0.0",
-    "ngx-image-cropper": "^7.2.1",
-    "ngx-uploadx": "^6.2.0",
-    "ol": "^8.2.0",
+    "ngrx-store-localstorage": "^14",
+    "ngx-avatar": "^4.1.0",
+    "ngx-clipboard": "^14.0.1",
+    "ngx-image-cropper": "^3.3.5",
+    "ngx-openlayers": "1.0.0-next.19",
+    "ngx-uploadx": "^5.2.0",
+    "ol": "6.14.1",
    "olcs": "^2.13.1",
    "resumablejs": "^1.1.0",
    "rxjs": "^7.8.1",
@@ -54,23 +54,22 @@
    "tslib": "^2.4.0",
    "url": "^0.11.0",
    "util": "^0.12.4",
-    "zone.js": "~0.14.4"
+    "zone.js": "~0.11.4"
  },
  "devDependencies": {
-    "@angular-builders/custom-webpack": "^17",
-    "@angular-devkit/build-angular": "^17.3.3",
-    "@angular/cli": "^17.3.3",
-    "@angular/compiler-cli": "^17.3.3",
-    "@angular/language-service": "^17.3.3",
-    "@angular/localize": "^17.3.3",
+    "@angular-builders/custom-webpack": "^14",
+    "@angular-devkit/build-angular": "^15.2.10",
+    "@angular/cli": "^15.2.10",
+    "@angular/compiler-cli": "^15.2.10",
+    "@angular/language-service": "^15.2.10",
+    "@angular/localize": "^15.2.10",
    "@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": "^6.18.0",
-    "@typescript-eslint/eslint-plugin-tslint": "^6.18.0",
-    "@typescript-eslint/parser": "^6.18.0",
-    "codelyzer": "^0.0.28",
+    "@typescript-eslint/eslint-plugin": "^5.54.0",
+    "@typescript-eslint/eslint-plugin-tslint": "^5.54.0",
+    "@typescript-eslint/parser": "^5.54.0",
    "eslint": "^8.35.0",
    "eslint-config-prettier": "^8.6.0",
    "eslint-plugin-import": "^2.27.5",
@@ -81,9 +80,9 @@
    "karma-coverage-istanbul-reporter": "^3.0.3",
    "karma-jasmine": "^5.1.0",
    "karma-jasmine-html-reporter": "^2.0.0",
-    "ng-packagr": "^17.3.0",
+    "ng-packagr": "^15.2.2",
    "protractor": "~7.0.0",
    "ts-node": "^8.8.1",
-    "typescript": "~5.4.4"
+    "typescript": "~4.8.0"
  }
-}
+}
--- a/projects/common-map/package-lock.json
+++ b/projects/common-map/package-lock.json
@@ -11,14 +11,14 @@
        "tslib": "^2.0.0"
      },
      "peerDependencies": {
-        "@angular/core": "^17.3.3",
-        "@ngrx/effects": "^17",
-        "@ngrx/router-store": "^17",
-        "@ngrx/store": "^17",
-        "ng-openlayers": "17.1.3",
-        "ngrx-store-localstorage": "^17",
-        "ol": "^8.2.0",
-        "tassign": "^1.0.0"
+        "@angular/core": ">=14.0.0",
+        "@ngrx/effects": ">=14.0.0",
+        "@ngrx/router-store": ">=14.0.0",
+        "@ngrx/store": ">=14.0.0",
+        "ngrx-store-localstorage": ">=14.0.0",
+        "ngx-openlayers": ">=1.0.0-next.19",
+        "ol": ">=6.8.1",
+        "tassign": ">=1.0.0"
      }
    },
    "node_modules/tslib": {
--- a/projects/common-map/package.json
+++ b/projects/common-map/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@farmmaps/common-map",
-  "version": "2.0.0",
+  "version": "2.1.0",
  "publishConfig": {
    "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
  },
@@ -8,13 +8,13 @@
    "tslib": "^2.0.0"
  },
  "peerDependencies": {
-    "@angular/core": "^17.3.3",
-    "ngrx-store-localstorage": "^17",
-    "@ngrx/effects": "^17",
-    "@ngrx/router-store": "^17",
-    "@ngrx/store": "^17",
-    "tassign": "^1.0.0",
-    "ng-openlayers": "17.1.3",
-    "ol": "^8.2.0"
+    "@angular/core": ">=15.0.0",
+    "ngrx-store-localstorage": ">=15.0.0",
+    "@ngrx/effects": ">=15.0.0",
+    "@ngrx/router-store":">=15.0.0",
+    "@ngrx/store":">=15.0.0",
+    "tassign": ">=1.0.0",
+    "ngx-openlayers": ">=1.0.0-next.19",
+    "ol": ">=6.8.1"
  }
 }
--- a/projects/common-map/src/fm-map/actions/map.actions.ts
+++ b/projects/common-map/src/fm-map/actions/map.actions.ts
@@ -58,7 +58,7 @@ export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess'
 export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
 export const SETVIEWSTATE = '[Map] SetViewState'
 export const CLEARFEATURES = '[Map] ClearFeatures';
-export const SETPANELEXTRAWIDE = '[Map] SetPanelExtraWide';
+

 export class Clear implements Action {
  readonly type = CLEAR;
@@ -342,11 +342,6 @@ export class ClearFeatures implements Action {
  constructor() {}
 }

-export class SetPanelExtraWide implements Action {
-  readonly type = SETPANELEXTRAWIDE;
-  constructor(public panelExtraWide:boolean) {}
-}
-
 export type Actions = SetMapState
  | Init
  | Clear
@@ -394,6 +389,5 @@ export type Actions = SetMapState
  | SetPeriod
  | ToggleShowDataLayerSlide
  | SetViewState
-  | ClearFeatures
-  | SetPanelExtraWide;
+  | ClearFeatures;

--- a/projects/common-map/src/fm-map/common-map.module.ts
+++ b/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 'ng-openlayers';
+import { AngularOpenlayersModule } from 'ngx-openlayers';
 import { StoreModule, ActionReducer, MetaReducer } from '@ngrx/store';
 import { EffectsModule } from '@ngrx/effects';
 import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
@@ -169,119 +169,119 @@ export {
  GeometryThumbnailComponent
 }

-@NgModule({
-    imports: [
-        CommonModule,
-        AngularOpenlayersModule,
-        MapRoutingModule,
-        StoreModule.forFeature(MODULE_NAME, mapReducers.reducer, { metaReducers: metaReducers }),
-        EffectsModule.forFeature([mapEffects.MapEffects]),
-        NgbModule,
-        FormsModule,
-        ReactiveFormsModule,
-        AppCommonModule
-    ],
-    declarations: [
-        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,
-        HistogramDetailsComponent,
-        StatisticsDetailsComponent,
-        ifZoomToShowDirective,
-        ZoomToShowAlert,
-        LayerValuesComponent,
-        GeometryThumbnailComponent
-    ],
-    exports: [
-        ItemVectorSourceComponent,
-        ItemLayersComponent,
-        FileDropTargetComponent,
-        MetaDataModalComponent,
-        MapComponent,
-        GpsLocation,
-        PanToLocation,
-        LayerSwitcher,
-        FeatureListFeatureComponent,
-        FeatureListFeatureCropfieldComponent,
-        FeatureListFeatureCroppingschemeComponent,
-        SelectedItemContainerComponent,
-        SelectedItemComponent,
-        SelectedItemCropfieldComponent,
-        SelectedItemGeotiffComponent,
-        SelectedItemTemporalComponent,
-        SelectedItemShapeComponent,
-        ItemListItemComponent,
-        ItemListItemContainerComponent,
-        ItemListComponent,
-        ItemWidgetListComponent,
-        WidgetStatusComponent,
-        RotationResetComponent,
-        MapSearchComponent,
-        SelectPeriodModalComponent,
-        LayerListComponent,
-        LegendComponent,
-        LayerVectorImageComponent,
-        FeatureListComponent,
-        WidgetHostDirective,
-        FeatureListContainerComponent,
-        FeatureListCroppingschemeComponent,
-        FeatureListCropfieldComponent,
-        FeatureListFeatureContainerComponent,
-        ZoomToExtentComponent,
-        ifZoomToShowDirective,
-        ZoomToShowAlert,
-        GeometryThumbnailComponent
-    ],
-    providers: [
-        FeatureIconService,
-        GeolocationService,
-        DeviceOrientationService,
-        TemporalService,
-        { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
-        { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
-        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
-        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
-        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
-        { provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
-        { provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
-        { provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
-        { provide: AbstractSelectedItemComponent, useClass: SelectedItemTemporalComponent, multi: true },
-        { provide: AbstractSelectedItemComponent, useClass: SelectedItemShapeComponent, multi: true },
-        { provide: AbstractItemListItemComponent, useClass: ItemListItemComponent, multi: true },
-        { provide: AbstractItemListComponent, useClass: ItemListComponent, multi: true }
-    ]
+@NgModule({
+    imports: [
+        CommonModule,
+        AngularOpenlayersModule,
+        MapRoutingModule,
+        StoreModule.forFeature(MODULE_NAME, mapReducers.reducer, { metaReducers: metaReducers }),
+        EffectsModule.forFeature([mapEffects.MapEffects]),
+        NgbModule,
+        FormsModule,
+        ReactiveFormsModule,
+        AppCommonModule
+    ],
+    declarations: [
+        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,
+        HistogramDetailsComponent,
+        StatisticsDetailsComponent,
+        ifZoomToShowDirective,
+        ZoomToShowAlert,
+        LayerValuesComponent,
+        GeometryThumbnailComponent
+    ],
+    exports: [
+        ItemVectorSourceComponent,
+        ItemLayersComponent,
+        FileDropTargetComponent,
+        MetaDataModalComponent,
+        MapComponent,
+        GpsLocation,
+        PanToLocation,
+        LayerSwitcher,
+        FeatureListFeatureComponent,
+        FeatureListFeatureCropfieldComponent,
+        FeatureListFeatureCroppingschemeComponent,
+        SelectedItemContainerComponent,
+        SelectedItemComponent,
+        SelectedItemCropfieldComponent,
+        SelectedItemGeotiffComponent,
+        SelectedItemTemporalComponent,
+        SelectedItemShapeComponent,
+        ItemListItemComponent,
+        ItemListItemContainerComponent,
+        ItemListComponent,
+        ItemWidgetListComponent,
+        WidgetStatusComponent,
+        RotationResetComponent,
+        MapSearchComponent,
+        SelectPeriodModalComponent,
+        LayerListComponent,
+        LegendComponent,
+        LayerVectorImageComponent,
+        FeatureListComponent,
+        WidgetHostDirective,
+        FeatureListContainerComponent,
+        FeatureListCroppingschemeComponent,
+        FeatureListCropfieldComponent,
+        FeatureListFeatureContainerComponent,
+        ZoomToExtentComponent,
+        ifZoomToShowDirective,
+        ZoomToShowAlert,
+        GeometryThumbnailComponent
+    ],
+    providers: [
+        FeatureIconService,
+        GeolocationService,
+        DeviceOrientationService,
+        TemporalService,
+        { provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
+        { provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
+        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
+        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
+        { provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
+        { provide: AbstractSelectedItemComponent, useClass: SelectedItemComponent, multi: true },
+        { provide: AbstractSelectedItemComponent, useClass: SelectedItemCropfieldComponent, multi: true },
+        { provide: AbstractSelectedItemComponent, useClass: SelectedItemGeotiffComponent, multi: true },
+        { provide: AbstractSelectedItemComponent, useClass: SelectedItemTemporalComponent, multi: true },
+        { provide: AbstractSelectedItemComponent, useClass: SelectedItemShapeComponent, multi: true },
+        { provide: AbstractItemListItemComponent, useClass: ItemListItemComponent, multi: true },
+        { provide: AbstractItemListComponent, useClass: ItemListComponent, multi: true }
+    ]
 })


--- a/projects/common-map/src/fm-map/components/aol/file-drop-target/file-drop-target.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/file-drop-target/file-drop-target.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, OnDestroy, OnInit, EventEmitter, Output, Inject } from '@angular/core';
-import { MapComponent } from 'ng-openlayers';
+import { MapComponent } from 'ngx-openlayers';

 import * as proj  from 'ol/proj';
 import {Point,Geometry} from 'ol/geom';
--- a/projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.scss
+++ b/projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.scss
@@ -1,3 +1,6 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
 .gps-location {
  display:none; 
 }
@@ -11,7 +14,7 @@
 }

 .tolerance {
-  fill: var(--bs-primary);
+  fill: $primary;
  fill-opacity:0.4;
 }

@@ -20,20 +23,20 @@
 }

 .border {
-  fill: var(--bs-white);
+  fill: $white;
 }

 .center {
-  fill: var(--bs-primary);
+  fill: $primary;
 }

 .stop1 {
-  stop-color: var(--bs-primary);
+  stop-color: $primary;
  stop-opacity:1;
 }

 .stop2 {
-  stop-color:var(--bs-primary);
+  stop-color:$primary;
  stop-opacity: 0;
 }

--- a/projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, ViewChild, ElementRef, OnChanges, SimpleChanges ,Host} from '@angular/core';
-import { MapComponent } from 'ng-openlayers';
+import { MapComponent } from 'ngx-openlayers';
 import  Overlay  from 'ol/Overlay';
 import { fromLonLat, toLonLat } from 'ol/proj';

--- a/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts
@@ -1,5 +1,5 @@
 import { Component, Host, Input, Output, EventEmitter,OnDestroy, OnInit, OnChanges, SimpleChanges, forwardRef } from '@angular/core';
-import { LayerGroupComponent, MapComponent } from 'ng-openlayers';
+import { LayerGroupComponent, MapComponent } from 'ngx-openlayers';
 import { ItemService,IItem,AppConfig } from '@farmmaps/common';
 import { IItemLayer, ITemporalItemLayer} from '../../../models/item.layer';
 import { ILayerData} from '../../../models/layer.data';
@@ -19,7 +19,6 @@ 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',
@@ -181,9 +180,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<Feature<Geometry>>;
+          const source = this as VectorSource<Geometry>;
          __this.itemService.getItemFeatures(item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) {
-            const features = format.readFeatures(data).filter(feature => feature instanceof Feature) as Feature[];
+            const features = format.readFeatures(data);
            for (const f of features) {
              if (f.get("code")) {
                f.setId(f.get("code"));
--- a/projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts
@@ -1,5 +1,5 @@
 import { Component, Host, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges, forwardRef, Inject, InjectionToken, OnDestroy, LOCALE_ID } from '@angular/core';
-import { LayerVectorComponent, SourceVectorComponent, MapComponent } from 'ng-openlayers';
+import { LayerVectorComponent, SourceVectorComponent, MapComponent } from 'ngx-openlayers';
 import { ItemService, ItemTypeService, IItem, IItemType, FolderService } from '@farmmaps/common';

 import { Feature } from 'ol';
@@ -29,7 +29,7 @@ import { formatNumber } from '@angular/common';
  ]
 })
 export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnDestroy, OnChanges {
-  instance: Vector<Feature<Geometry>>;
+  instance: Vector<Geometry>;
  private _format: GeoJSON;
  private _select: Select;
  private _hoverSelect: Select;
@@ -83,7 +83,6 @@ 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) {
--- a/projects/common-map/src/fm-map/components/aol/layer-values/layer-values.component.ts
+++ b/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 'ng-openlayers';
+import { MapComponent } from 'ngx-openlayers';
 import { ILayervalue } from '../../../models/layer.value';
 import { Observable, interval, Subject } from 'rxjs';
 import { debounce, throttle } from 'rxjs/operators';
--- a/projects/common-map/src/fm-map/components/aol/layer-vector-image/layer-vector-image.component.ts
+++ b/projects/common-map/src/fm-map/components/aol/layer-vector-image/layer-vector-image.component.ts
@@ -1,9 +1,8 @@
 import { Component, OnDestroy, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
-import { LayerVectorComponent, MapComponent } from 'ng-openlayers';
+import { LayerVectorComponent, MapComponent } from 'ngx-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',
@@ -15,7 +14,7 @@ export class LayerVectorImageComponent extends LayerVectorComponent implements O
  //public source: Vector;

  @Input()
-  renderMode: RenderType<VectorSource<Feature<Geometry>>> | string = "image";  
+  renderMode: RenderType<VectorSource<Geometry>> | string = "image";  

  constructor(map: MapComponent) {
    super(map);
--- a/projects/common-map/src/fm-map/components/aol/pan-to-location/pan-to-location.component.scss
+++ b/projects/common-map/src/fm-map/components/aol/pan-to-location/pan-to-location.component.scss
@@ -1,8 +1,11 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
 .gps-location {
  display:block; 
  width:2.5em;
  height:2.5em;
-  background-color: var(--bs-body-bg);
+  background-color: $body-bg;
  background-size: contain;
  margin-top:0.5em;
  border-radius: 1.75em;
@@ -14,15 +17,15 @@
 }

 .pan-to {
-  fill: var(--bs-secondary);
+  fill: $secondary;
 }

 div.gps-location:hover .pan-to {
-  fill: var(--bs-white);
+  fill: $white;
 }

 .pan-to-centered {
-  fill: var(--bs-primary);
+  fill: $primary;
 }

 div.gps-location:hover .pan-to-centered {
@@ -30,5 +33,5 @@ div.gps-location:hover .pan-to-centered {
 }

 .pan-to.pan-to-disabled {
-  fill: var(--bs-gray-300);
+  fill: $gray-300;
 }
--- a/projects/common-map/src/fm-map/components/aol/pan-to-location/pan-to-location.component.ts
+++ b/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 'ng-openlayers';
+import { MapComponent } from 'ngx-openlayers';
 import {IMapState} from '../../../models/map.state'
 import {View} from 'ol';
 import { fromLonLat } from 'ol/proj';
--- a/projects/common-map/src/fm-map/components/aol/rotation-reset/rotation-reset.component.scss
+++ b/projects/common-map/src/fm-map/components/aol/rotation-reset/rotation-reset.component.scss
@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .compass {
  width:2.5em;
  height:2.5em;
@@ -11,7 +13,7 @@

 #north {
  display: none;
-  fill:var(--bs-black);
+  fill:$black;
 }

 #top-l {
@@ -31,23 +33,23 @@
 }

 div.compass:hover #top-l {
-  fill:var(--bs-white);
+  fill:$white;
 }

 div.compass:hover #top-r {
-  fill:var(--bs-gray-300);
+  fill:$gray-300;
 }

 div.compass:hover #bottom-l {
-  fill:var(--bs-gray-300);
+  fill:$gray-300;
 }

 div.compass:hover #bottom-r {
-  fill:var(--bs-white);
+  fill:$white;
 }

 div.compass:hover #north {
-  fill:var(--bs-white);
+  fill:$white;
 }

 .compass-n {    
--- a/projects/common-map/src/fm-map/components/aol/rotation-reset/rotation-reset.component.ts
+++ b/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 'ng-openlayers';
+import { ViewComponent, MapComponent } from 'ngx-openlayers';

 import {View} from 'ol';

--- a/projects/common-map/src/fm-map/components/aol/zoom-to-extent/zoom-to-extent.component.ts
+++ b/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 'ng-openlayers';
+import { ViewComponent, MapComponent } from 'ngx-openlayers';

 
@Component({
--- a/projects/common-map/src/fm-map/components/feature-list-container/feature-list-container.component.scss
+++ b/projects/common-map/src/fm-map/components/feature-list-container/feature-list-container.component.scss
@@ -1,10 +1,14 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
 .row {
-  border-bottom: 1px solid var(--bs-gray-500);
+  border-bottom: 1px solid $gray-500;
  user-select: none;
 }

 .row.selected {
-  background-color: var(--bs-gray-100);
+  background-color: $gray-100;
 }

@media screen and (min-width: 44rem)  {
--- a/projects/common-map/src/fm-map/components/feature-list-cropfield/feature-list-cropfield.component.scss
+++ b/projects/common-map/src/fm-map/components/feature-list-cropfield/feature-list-cropfield.component.scss
@@ -1,20 +1,22 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 fm-map-feature-list-feature-container {
  width:100%;
  pointer-events:none;
 }

 .row {
-  border-bottom: 1px solid var(--bs-gray-500);
+  border-bottom: 1px solid $gray-500;
  user-select: none;
  padding-left:1.5rem;
 }

 .row.selected {
-  background-color: var(--bs-gray-100);
+  background-color: $gray-100;
 }

 .cropfields {
-  border-top: 1px solid var(--bs-gray-500);
+  border-top: 1px solid $gray-500;
  margin-left: -1.25rem;
  margin-right: -1.25rem;
 }
--- a/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.scss
+++ b/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.scss
@@ -1,20 +1,22 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 fm-map-feature-list-feature-container {
  width:100%;
  pointer-events:none;
 }

 .row {
-  border-bottom: 1px solid var(--bs-gray-500);
+  border-bottom: 1px solid $gray-500;
  user-select: none;
  padding-left:1.5rem;
 }

 .row.selected {
-  background-color: var(--bs-gray-100);
+  background-color: $gray-100;
 }

 .farms {
-  border-top: 1px solid var(--bs-gray-500);
+  border-top: 1px solid $gray-500;
  margin-left: -1.25rem;
  margin-right: -1.25rem;
 }
--- a/projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.scss
+++ b/projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.scss
@@ -1,3 +1,7 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
 .card-title {
  font-size: 1rem;
  white-space: nowrap;
--- a/projects/common-map/src/fm-map/components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component.scss
+++ b/projects/common-map/src/fm-map/components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component.scss
@@ -1,3 +1,7 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
 .card-title {
  font-size: 1rem;
  white-space: nowrap;
--- a/projects/common-map/src/fm-map/components/feature-list-feature/feature-list-feature.component.scss
+++ b/projects/common-map/src/fm-map/components/feature-list-feature/feature-list-feature.component.scss
@@ -1,3 +1,7 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
 .card-title {
  font-size: 1rem;
  white-space: nowrap;
--- a/projects/common-map/src/fm-map/components/feature-list/feature-list.component.scss
+++ b/projects/common-map/src/fm-map/components/feature-list/feature-list.component.scss
@@ -1,13 +1,15 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 fm-map-feature-list-feature-container {
  width: 100%;
  pointer-events: none;
 }

 .row {
-  border-bottom: 1px solid var(--bs-gray-500);
+  border-bottom: 1px solid $gray-500;
  user-select: none;
 }

 .row.selected {
-  background-color: var(--bs-gray-100);
+  background-color: $gray-100;
 }
--- a/projects/common-map/src/fm-map/components/if-zoom-to-show/if-zoom-to-show.directive.ts
+++ b/projects/common-map/src/fm-map/components/if-zoom-to-show/if-zoom-to-show.directive.ts
@@ -1,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 'ng-openlayers';
+import { MapComponent } from 'ngx-openlayers';

@Directive({
  selector: '[fmMapIfZoomToShow]',
--- a/projects/common-map/src/fm-map/components/item-list-item/item-list-item.component.scss
+++ b/projects/common-map/src/fm-map/components/item-list-item/item-list-item.component.scss
@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .widget {
  padding:0.8rem;
  height:100%;
--- a/projects/common-map/src/fm-map/components/item-list/item-list.component.scss
+++ b/projects/common-map/src/fm-map/components/item-list/item-list.component.scss
@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .widget-container {
  overflow:auto;
  margin-bottom:1rem;
@@ -5,7 +7,7 @@

 .widget {
  position:relative;
-  border: 1px solid var(--bs-gray-500);
+  border: 1px solid $gray-500;
  user-select: none;
  display:inline-block;
  width:50%;
@@ -26,7 +28,7 @@
 }

 .widget:hover {
-  background-color: var(--bs-gray-100);
+  background-color: $gray-100;
 }

 .widget-container {
--- a/projects/common-map/src/fm-map/components/item-widget-list/item-widget-list.component.scss
+++ b/projects/common-map/src/fm-map/components/item-widget-list/item-widget-list.component.scss
@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .widget-container {
  overflow:auto;
  margin-bottom:1rem;
@@ -5,7 +7,7 @@

 .widget {
  position:relative;
-  border: 1px solid var(--bs-gray-500);
+  border: 1px solid $gray-500;
  user-select: none;
  display:inline-block;
  width:50%;
@@ -26,7 +28,7 @@
 }

 .widget:hover {
-  background-color: var(--bs-gray-100);
+  background-color: $gray-100;
 }

 .widget-container {
--- a/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.scss
+++ b/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.scss
@@ -1,15 +1,18 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
 .layer-switcher {  
  display:block; 
  width:2.5em;
  height:2.5em;
-  background-color: var(--bs-body-bg);
+  background-color: $body-bg;
  background-size: contain;
  margin-top:0.5em;
  text-align: center;
  line-height: 2.5em; 
  border-radius: 1.75em;
  padding: 0;
-  color: var(--bs-secondary);
+  color: $secondary;
 }

 .layer-switcher i {
@@ -21,7 +24,7 @@
 }

 .layers {
-  color:var(--bs-secondary);
+  color:$secondary;
  position: absolute;
  overflow: hidden;
  bottom: -1em;
--- a/projects/common-map/src/fm-map/components/map-search/map-search.component.scss
+++ b/projects/common-map/src/fm-map/components/map-search/map-search.component.scss
@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 div.map-search {
  position: absolute;
  top: 0.5rem;
@@ -104,7 +106,7 @@ div.map-search.searchcollapsed button[type="submit"] {
 }

 .form-control, .form-control:focus {
-  border-color: var(--bs-secondary);
+  border-color: $secondary;
 }


--- a/projects/common-map/src/fm-map/components/map/map.component.html
+++ b/projects/common-map/src/fm-map/components/map/map.component.html
@@ -10,7 +10,6 @@
  panelVisible:panelVisible$|async,
  openedModalName:openedModalName$|async,
  panelCollapsed:panelCollapsed$|async,
-  panelExtraWide:panelExtraWide$|async,
  searchMinified:searchMinified$|async,
  selectedItem:selectedItem$|async,
  parentItem:parentItem$|async,
@@ -65,7 +64,7 @@
    </div>
    <div class="side-panel-container">
      
-      <fm-side-panel [resizeable]="true" (onResize)="handlePanelResize($event)" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false" [extrawide]="state.panelExtraWide">
+      <fm-side-panel [resizeable]="true" (onResize)="handlePanelResize($event)" [visible]="state.panelVisible && noContent" [collapsed]="state.panelCollapsed" [collapsable]="false">
        <div class="panel-wrapper" *ngIf="noContent">
          <div class="panel-top bg-secondary" *ngIf="!(state.searchMinified)">
          </div>
@@ -85,7 +84,7 @@
          </div>
        </div>  
      </fm-side-panel>
-      <fm-side-panel [resizeable]="true" [visible]="!noContent" [extrawide]="state.panelExtraWide">
+      <fm-side-panel [resizeable]="true" [visible]="!noContent">
        <router-outlet (activate)="handleSidepaneloutletActivate($event)" (deactivate)="handleSidepaneloutletDeactivate($event)"></router-outlet>
      </fm-side-panel>
    </div>   
--- a/projects/common-map/src/fm-map/components/map/map.component.scss
+++ b/projects/common-map/src/fm-map/components/map/map.component.scss
@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 aol-map { position:absolute;width:100%;height:calc( 100vh );}

 .arrow {
@@ -193,7 +195,7 @@ timespan.menuVisible {
  width: 4rem;
  overflow: hidden;
  text-overflow: ellipsis;
-  color: var(--bs-primary);
+  color: $primary;
 }

 .shortcut-icon > .farm-icon {
--- a/projects/common-map/src/fm-map/components/map/map.component.ts
+++ b/projects/common-map/src/fm-map/components/map/map.component.ts
@@ -66,7 +66,6 @@ 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);
@@ -209,18 +208,12 @@ 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) {
--- a/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.scss
+++ b/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.scss
@@ -1,9 +1,13 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
 .row {
-  border-bottom: 1px solid var(--bs-gray-500);
+  border-bottom: 1px solid $gray-500;
  user-select: none;
 }

 .row:hover {
-  background-color: var(--bs-gray-100);
+  background-color: $gray-100;
 }

--- a/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.scss
+++ b/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.scss
@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .big-icon {
  width: 100%;
  color: white;
--- a/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.scss
+++ b/projects/common-map/src/fm-map/components/selected-item-geotiff/selected-item-geotiff.component.scss
@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .big-icon {
  width: 100%;
  color: white;
--- a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.scss
+++ b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.scss
@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .big-icon {
  width: 100%;
  color: white;
--- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.scss
+++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.scss
@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .big-icon {
  width: 100%;
  color: white;
--- a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.scss
+++ b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.scss
@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .big-icon {
  width: 100%;
  color: white;
--- a/projects/common-map/src/fm-map/effects/map.effects.ts
+++ b/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.getRouterSelectors(getRouterState);
+} = fromRouter.getSelectors(getRouterState);


@Injectable()
@@ -133,7 +133,7 @@ export class MapEffects {
                f.id = f.properties["code"];
              }
            }
-            return of(new mapActions.StartSearchSuccess(this._geojsonFormat.readFeatures(features).filter(feature => feature instanceof Feature) as Feature[], a.queryState));
+            return of(new mapActions.StartSearchSuccess(this._geojsonFormat.readFeatures(features), 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) as Feature;
+            const f = this._geojsonFormat.readFeature(feature);
            f.setId(action.item.code);
            return new mapActions.AddFeatureSuccess(f);
          }),
--- a/projects/common-map/src/fm-map/reducers/map.reducer.ts
+++ b/projects/common-map/src/fm-map/reducers/map.reducer.ts
@@ -49,7 +49,6 @@ export interface State {
  features: Array<Feature<Geometry>>,
  panelVisible: boolean,
  panelCollapsed: boolean,
-  panelExtraWide: boolean,
  selectedFeature: Feature<Geometry>,
  selectedItem:IItem,
  parentItem:IItem,
@@ -95,7 +94,6 @@ export const initialState: State = {
  features: [],
  panelVisible: false,
  panelCollapsed: false,
-  panelExtraWide: false,
  selectedFeature: null,
  selectedItem: null,
  parentItem: null,
@@ -574,10 +572,6 @@ 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;
    }
@@ -589,7 +583,6 @@ 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;
@@ -625,7 +618,6 @@ 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);
--- a/projects/common-map/tsconfig.lib.json
+++ b/projects/common-map/tsconfig.lib.json
@@ -10,27 +10,18 @@
    "emitDecoratorMetadata": true,
    "experimentalDecorators": true,
    "importHelpers": true,
-    "esModuleInterop": true,
    "types": [],
    "lib": [
      "dom",
      "es2018"
-    ],
-    "paths": {
-      "@angular/*": [
-
-      "node_modules/@angular/*"
-
-      ]
-    }
+    ]
  },
  "angularCompilerOptions": {
    "skipTemplateCodegen": true,
    "strictMetadataEmit": true,
    "fullTemplateTypeCheck": true,
    "strictInjectionParameters": true,
-    "enableResourceInlining": true,
-    "compilationMode": "partial"
+    "enableResourceInlining": true
  },
  "exclude": [
    "src/test.ts",
--- a/projects/common-map3d/package-lock.json
+++ b/projects/common-map3d/package-lock.json
@@ -11,10 +11,10 @@
        "tslib": "^2.0.0"
      },
      "peerDependencies": {
-        "@angular/common": "^17.3.3",
-        "@angular/core": "^17.3.3",
+        "@angular/common": ">=14.0.0",
+        "@angular/core": ">=14.0.0",
        "cesium": ">=1.82.1",
-        "ng-openlayers": "17.1.3",
+        "ngx-openlayers": "1.0.0-next.19",
        "ol-cesium": ">=2.13.0"
      }
    },
--- a/projects/common-map3d/package.json
+++ b/projects/common-map3d/package.json
@@ -1,13 +1,13 @@
 {
  "name": "@farmmaps/common-map3d",
-  "version": "2.0.0",
+  "version": "2.1.0",
  "publishConfig": {
    "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
  },
  "peerDependencies": {
-    "@angular/common":  "^17.3.3",
-    "@angular/core":  "^17.3.3",
-    "ng-openlayers": "17.1.3",
+    "@angular/common":  ">=15.0.0",
+    "@angular/core":  ">=15.0.0",
+    "ngx-openlayers": "1.0.0-next.19",
    "cesium": ">=1.82.1",
    "ol-cesium": ">=2.13.0"
  },
--- a/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.scss
+++ b/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.scss
@@ -1,15 +1,17 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .twotreed {
  display:block; 
  width:2.5em;
  height:2.5em;
-  background-color: var(--bs-body-bg);
+  background-color: $body-bg;
  background-size: contain;
  margin-top:0.5em;
  text-align: center;
  line-height: 2.5em; 
  border-radius: 1.75em;
  padding: 0;
-  color: var(--bs-secondary);
+  color: $secondary;
 }

 .fa-spinner {
--- a/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts
+++ b/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 'ng-openlayers';
+import { MapComponent } from 'ngx-openlayers';
 import OLCesium from 'olcs/OLCesium';
 import RasterSynchronizer from 'olcs/RasterSynchronizer';
 import VectorSynchronizer from 'olcs/VectorSynchronizer';
--- a/projects/common-map3d/tsconfig.lib.json
+++ b/projects/common-map3d/tsconfig.lib.json
@@ -11,27 +11,18 @@
    "emitDecoratorMetadata": true,
    "experimentalDecorators": true,
    "importHelpers": true,
-    "esModuleInterop": true,
    "types": [],
    "lib": [
      "dom",
      "es2018"
-    ],
-    "paths": {
-      "@angular/*": [
-
-      "node_modules/@angular/*"
-
-      ]
-    }
+    ]
  },
  "angularCompilerOptions": {
    "skipTemplateCodegen": true,
    "strictMetadataEmit": true,
    "fullTemplateTypeCheck": true,
    "strictInjectionParameters": true,
-    "enableResourceInlining": true,
-    "compilationMode": "partial"
+    "enableResourceInlining": true
  },
  "exclude": [
    "src/test.ts",
--- a/projects/common/package-lock.json
+++ b/projects/common/package-lock.json
@@ -8,22 +8,22 @@
      "name": "@farmmaps/common",
      "version": "2.0.0",
      "peerDependencies": {
-        "@angular/common": "^17.3.3",
-        "@angular/core": "^17.3.3",
-        "@angular/forms": "^17.3.3",
-        "@microsoft/signalr": "^3.1.16",
-        "@ng-bootstrap/ng-bootstrap": "^16.0.0",
-        "@ngrx/effects": "^17",
-        "@ngrx/router-store": "^17",
-        "@ngrx/store": "^17",
-        "angular-oauth2-oidc": "^13",
-        "bootstrap": "^5.2.0",
-        "moment": "^2.29.4",
-        "ngx-avatars": "1.7.0",
-        "ngx-clipboard": "16.0.0",
-        "ngx-image-cropper": "^7.2.1",
-        "ngx-uploadx": "^6.2.0",
-        "tassign": "^1.0.0"
+        "@angular/common": ">=14.0.0",
+        "@angular/core": ">=14.0.0",
+        "@angular/forms": ">=14.0.0",
+        "@microsoft/signalr": ">=3.1.3",
+        "@ng-bootstrap/ng-bootstrap": ">=10.0.0",
+        "@ngrx/effects": ">=14.0.0",
+        "@ngrx/router-store": ">=14.0.0",
+        "@ngrx/store": ">=14.0.0",
+        "angular-oauth2-oidc": ">=13.0.0",
+        "bootstrap": ">=4.4.1",
+        "moment": ">=2.27.0",
+        "ngx-avatar": ">=4.1.0",
+        "ngx-clipboard": ">=14.0.1",
+        "ngx-image-cropper": ">=3.3.5",
+        "ngx-uploadx": ">=5.1.0",
+        "tassign": ">=1.0.0"
      }
    }
  }
--- a/projects/common/package.json
+++ b/projects/common/package.json
@@ -1,25 +1,25 @@
 {
  "name": "@farmmaps/common",
-  "version": "2.0.0",
+  "version": "2.1.0",
  "publishConfig": {
    "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
  },
  "peerDependencies": {
-    "@ng-bootstrap/ng-bootstrap": "^16.0.0",
-    "@angular/common": "^17.3.3",
-    "@angular/core": "^17.3.3",
-    "@angular/forms": "^17.3.3",
-    "@ngrx/effects": "^17",
-    "@ngrx/router-store": "^17",
-    "@ngrx/store": "^17",
-    "tassign": "^1.0.0",
-    "bootstrap": "^5.2.0",
-    "@microsoft/signalr": "^3.1.16",
-    "ngx-uploadx": "^6.2.0",
-    "angular-oauth2-oidc": "^13",
-    "moment": "^2.29.4",
-    "ngx-avatars": "1.7.0",
-    "ngx-image-cropper": "^7.2.1",
-    "ngx-clipboard": "16.0.0"
+    "@ng-bootstrap/ng-bootstrap": ">=10.0.0",
+    "@angular/common": ">=15.0.0",
+    "@angular/core": ">=15.0.0",
+    "@angular/forms": ">=15.0.0",
+    "@ngrx/effects": ">=14.0.0",
+    "@ngrx/router-store": ">=15.0.0",
+    "@ngrx/store": ">=15.0.0",
+    "tassign": ">=1.0.0",
+    "bootstrap": ">=4.4.1",
+    "@microsoft/signalr": ">=3.1.3",
+    "ngx-uploadx": ">=5.1.0",
+    "angular-oauth2-oidc": ">=13.0.0",
+    "moment": ">=2.27.0",
+    "ngx-avatar": ">=4.1.0",
+    "ngx-image-cropper": ">=3.3.5",
+    "ngx-clipboard": ">=14.0.1"
  }
 }
--- a/projects/common/src/fm/common-routing.module.ts
+++ b/projects/common/src/fm/common-routing.module.ts
@@ -7,7 +7,6 @@ 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 = [
@@ -22,7 +21,7 @@ const routes = [
  },
  {
    path: '**', component: NotFoundComponent,
-    canActivate: [NavBarGuard, ProductionGuard]
+    canActivate: [NavBarGuard]   
  }
 ];

--- a/projects/common/src/fm/common-service.module.ts
+++ b/projects/common/src/fm/common-service.module.ts
@@ -18,7 +18,6 @@ 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';
@@ -49,7 +48,6 @@ export {
  TypeaheadService,
  UserService,
  ImageService,
-  DownloadService,
  GeolocatorService,
  WeatherService,
  AppConfig,
--- a/projects/common/src/fm/common.module.ts
+++ b/projects/common/src/fm/common.module.ts
@@ -68,7 +68,7 @@ import { BackButtonComponent } from './components/back-button/back-button.compon
 import { EditImageModalComponent } from './components/edit-image-modal/edit-image-modal.component';
 import { AvatarComponent } from './components/avatar/avatar.component';
 import { ItemLinkComponent } from './components/item-link/item-link.component';
-import { AvatarModule } from 'ngx-avatars';
+import { AvatarModule } from 'ngx-avatar';
 import { ImageCropperModule } from 'ngx-image-cropper';

 export const FM_COMMON_STARTPAGE = new InjectionToken<string>('fm-common-startpage');
--- a/projects/common/src/fm/components/app/app.component.scss
+++ b/projects/common/src/fm/components/app/app.component.scss
@@ -1,3 +1,9 @@
+/* Import Bootstrap & Fonts */
+
+@import "~bootstrap/scss/bootstrap.scss";
+
+
+
 // custom styles

 .btn:focus {
@@ -10,7 +16,7 @@

 .form-control:focus {
  box-shadow: none;
-  border-color: var(--bs-input-border-color);
+  border-color: $input-border-color;
 }


--- a/projects/common/src/fm/components/auth-callback/auth-callback.guard.ts
+++ b/projects/common/src/fm/components/auth-callback/auth-callback.guard.ts
@@ -1,4 +1,4 @@
-import { Router } from '@angular/router';
+import { Router, CanActivate } 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  {
+export class AuthCallbackGuard implements CanActivate {

  constructor(private router$: Router,private oauthService$:OAuthService) {}

--- a/projects/common/src/fm/components/avatar/avatar.component.html
+++ b/projects/common/src/fm/components/avatar/avatar.component.html
@@ -1,10 +1,10 @@
 <span class="avatar-container" [title]="name">
-	<ngx-avatars 
+	<ngx-avatar 
 		class="farmmaps-avatar"
 		[src]="src" 
 		[name]="name" 
 		[size]="size"
 		[round]='true'
 		>
-	</ngx-avatars>
+	</ngx-avatar>
 </span>
--- a/projects/common/src/fm/components/back-button/back-button.component.scss
+++ b/projects/common/src/fm/components/back-button/back-button.component.scss
@@ -1,10 +1,12 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .back-button {
  cursor: default;
-  color: var(--bs-primary);
+  color: $primary;
  display: block;  
 }

 .back-button:hover {
  cursor: pointer;
-  color: var(--bs-secondary);
+  color: $secondary;
 }
--- a/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss
+++ b/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss
@@ -1,3 +1,7 @@
+/* Import Bootstrap & Fonts */
+
+@import "~bootstrap/scss/bootstrap.scss";
+
 div.resumable-file-upload {
  position: fixed;
  right: 0px;
@@ -72,7 +76,7 @@ div.card-header span.fa {
  }

 .upload-file.busy > div > span.fa-times {
-  color: var(--bs-danger);
+  color: $danger;
  width: 20px;
  display: inline-block;
  vertical-align: middle;
@@ -90,7 +94,7 @@ div.card-header span.fa {
  }

  .upload-file > div.errormessage {
-    color: var(--bs-danger);
+    color: $danger;
    display: none;
  }

--- a/projects/common/src/fm/components/side-panel/side-panel.component.html
+++ b/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,'extrawide':extrawide}" [ngStyle]="{'top':top}">
+<div class="side-panel hidden" [ngClass]="{'hidden':!visible,'collapsed':collapsed,'resizeable':(resizeable && mobile),'resizing':resizing,'left':left}" [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>
--- a/projects/common/src/fm/components/side-panel/side-panel.component.scss
+++ b/projects/common/src/fm/components/side-panel/side-panel.component.scss
@@ -15,7 +15,7 @@
 }

 .side-panel.collapsed {
-  left:-44rem;
+  left:-22rem;
 }

 .arrow {
@@ -75,7 +75,8 @@ div.resizegrip > span {
 }

 .resizeable .resizegrip {
-  display:block;  
+  display:block;
+  
 }

 .resizeable .content {
@@ -93,16 +94,9 @@ div.resizegrip > span {

  .side-panel.hidden {
    width: 22rem;
-    left:-22rem;
+    left:-24rem;
    height:100%;
    top: 0px;
-  }
-  
-  .side-panel.extrawide {
-    top:0px;
-    width: 44rem;
-    height:100%;
-    left:0px;
  }  
 }

--- a/projects/common/src/fm/components/side-panel/side-panel.component.ts
+++ b/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, ViewEncapsulation  } from '@angular/core';
+import { Component, Input,Output,ViewChild,EventEmitter, ElementRef,OnChanges,SimpleChanges,HostListener,ChangeDetectorRef  } from '@angular/core';

@Component({
  selector: 'fm-side-panel',
@@ -12,8 +12,7 @@ export class SidePanelComponent  implements OnChanges {
  @Input() public collapsed: boolean;
  @Input() public collapsable: boolean;
  @Input() public resizeable = false;
-  @Input() public left = false;
-  @Input() public extrawide: boolean;
+  @Input() public left = false;  
  @Output() onResize: EventEmitter<number> = new EventEmitter<number>();
  @ViewChild("resizeGrip") elementView: ElementRef;
  public mobile = true;
@@ -42,7 +41,7 @@ export class SidePanelComponent  implements OnChanges {
  }

  ngAfterViewInit() {
-    this.parentHeight = this.element.nativeElement.offsetParent?.clientHeight;
+    this.parentHeight = this.element.nativeElement.offsetParent.clientHeight;
    this.setTop();
  }

--- a/projects/common/src/fm/components/user-menu/user-menu.component.html
+++ b/projects/common/src/fm/components/user-menu/user-menu.component.html
@@ -5,9 +5,6 @@
                <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>                
--- a/projects/common/src/fm/components/user-menu/user-menu.component.ts
+++ b/projects/common/src/fm/components/user-menu/user-menu.component.ts
@@ -20,14 +20,11 @@ export class UserMenuComponent implements OnInit {
  ngOnInit(): void {
  }

-  getProvider():string | null {
-    const ownedClaims = this.oauthService.getIdentityClaims();
-    if(ownedClaims) {
-      if (ownedClaims["idp"] != "local") {
-        return ownedClaims["idp"];
-      }
-    }
-    return null;
+  getLetter():string {
+    if (this.user && this.user.firstName && this.user.lastName)
+      return this.user.firstName.substr(0,1).toUpperCase() + 
+             this.user.lastName.substr(0,1).toUpperCase();
+    return this.user && this.user.name ? this.user.name.substr(0,1).toUpperCase():"";
  }

  logout(event:MouseEvent) {
--- a/projects/common/src/fm/reducers/app-common.reducer.ts
+++ b/projects/common/src/fm/reducers/app-common.reducer.ts
@@ -64,8 +64,6 @@ 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
      };
--- a/projects/common/src/fm/services/auth-guard.service.ts
+++ b/projects/common/src/fm/services/auth-guard.service.ts
@@ -1,5 +1,11 @@
 import { Injectable } from '@angular/core';
-import { Router, Route, ActivatedRouteSnapshot, RouterStateSnapshot, UrlSegment, UrlTree } from '@angular/router';
+import {
+  CanActivate, Router, CanLoad, Route, CanActivateChild ,
+  ActivatedRouteSnapshot,
+  RouterStateSnapshot,
+  UrlSegment,
+  UrlTree
+} from '@angular/router';


 import { Store } from '@ngrx/store';
@@ -13,7 +19,7 @@ import * as appCommonReducer from '../reducers/app-common.reducer';
@Injectable({
  providedIn: 'root',
 })
-export class AuthGuard   { 
+export class AuthGuard implements CanActivate, CanLoad, CanActivateChild  { 
 
  constructor(private oauthService: OAuthService, private router: Router, private store: Store<appCommonReducer.State>) { }
  
--- a/projects/common/src/fm/services/download.service.ts
+++ b/projects/common/src/fm/services/download.service.ts
@@ -1,29 +0,0 @@
-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({});
-  }
-}
--- a/projects/common/src/fm/services/full-screen-guard.service.ts
+++ b/projects/common/src/fm/services/full-screen-guard.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { CanActivate, CanActivateChild, 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  { 
+export class FullScreenGuard implements CanActivate,CanActivateChild { 
 
  private loginDispatched = false;
  constructor(private store: Store<appCommonReducer.State> ) { }
--- a/projects/common/src/fm/services/item.service.ts
+++ b/projects/common/src/fm/services/item.service.ts
@@ -152,13 +152,6 @@ 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}`);
  }
@@ -203,4 +196,5 @@ export class ItemService {
  getBreadcrumbs(itemCode: string): Observable<IListItem[]> {
    return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/items/${itemCode}/breadcrumbs`);
  }
+
 }
--- a/projects/common/src/fm/services/itemtype.service.ts
+++ b/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] && this.itemTypes[itemType].extraAttributes) extraAttributes = this.itemTypes[itemType].extraAttributes;
+      if (this.itemTypes[itemType]) extraAttributes = this.itemTypes[itemType].extraAttributes;
      return extraAttributes;
    }

--- a/projects/common/src/fm/services/nav-bar-guard.service.ts
+++ b/projects/common/src/fm/services/nav-bar-guard.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Route, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import { CanLoad, Route, CanActivate, CanDeactivate, 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  {
+export class NavBarGuard implements CanActivate {

  private loginDispatched = false;
  constructor(private store: Store<appCommonReducer.State>) { }
--- a/projects/common/src/fm/services/package-guard.service.ts
+++ b/projects/common/src/fm/services/package-guard.service.ts
@@ -1,11 +1,11 @@
 import {Injectable} from '@angular/core';
-import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import {ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot} from '@angular/router';
 import {PackageService} from './package.service';

@Injectable({
  providedIn: 'root',
 })
-export class PackageGuard  {
+export class PackageGuard implements CanActivate {

  constructor(private packageService: PackageService) { }

--- a/projects/common/src/fm/services/production-guard.service.ts
+++ b/projects/common/src/fm/services/production-guard.service.ts
@@ -1,10 +0,0 @@
-import { Injectable, isDevMode } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ProductionGuard {
-  canActivate(): boolean {
-    return !isDevMode();
-  } 
-}
--- a/projects/common/tsconfig.lib.json
+++ b/projects/common/tsconfig.lib.json
@@ -29,8 +29,7 @@
    "strictMetadataEmit": true,
    "fullTemplateTypeCheck": true,
    "strictInjectionParameters": true,
-    "enableResourceInlining": true,
-    "compilationMode": "partial"
+    "enableResourceInlining": true
  },
  "exclude": [
    "src/test.ts",
--- a/src/app/landingpage/landingpage.component.scss
+++ b/src/app/landingpage/landingpage.component.scss
@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 /*!
 * Start Bootstrap - Landing Page v5.0.8 (https://startbootstrap.com/themes/landing-page)
 * Copyright 2013-2020 Start Bootstrap
--- a/src/app/menu/menu.component.scss
+++ b/src/app/menu/menu.component.scss
@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .menu-card {
    padding-left:7px;
    padding-right:7px;
@@ -27,7 +29,7 @@
    width: 4rem;
    overflow: hidden;
    text-overflow: ellipsis;
-    color: var(--bs-primary);
+    color: $primary;
  }
  
  .shortcut-icon > .farm-icon {
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -1,34 +0,0 @@
-{
-  "compileOnSave": false,
-  "compilerOptions": {
-    "skipLibCheck": true,
-    "baseUrl": ".",
-    "outDir": "./dist/out-tsc",
-    "sourceMap": true,
-    "declaration": false,
-    "downlevelIteration": true,
-    "experimentalDecorators": true,
-    "module": "es2020",
-    "moduleResolution": "node",
-    "importHelpers": true,
-    "target": "ES2022",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
-    "lib": [
-      "es2018",
-      "dom"
-    ],
-    "useDefineForClassFields": false,
-    "rootDir": "."
-  },
-  "angularCompilerOptions": {
-    "skipLibs": true,
-    "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true
-  },
-  "exclude": [
-    "node_modules",
-    "tmp"
-  ]
-}
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -31,9 +31,6 @@
      "common-map3d": [
        "dist/common-map3d/common-map3d",
        "dist/common-map3d"
-      ],
-      "ng-openlayers/*": [
-        "dist/ng-openlayers/*"
      ]
    },
    "useDefineForClassFields": false
Author	SHA1	Message	Date
Peter Bastiani	43c0d477c6	Aw5739 update to Angular v15	2023-12-27 16:28:34 +01:00
Peter Bastiani	60e779db53	Aw5739 update to Angular v15	2023-12-27 16:23:26 +01:00
Peter Bastiani	27bf09531b	Aw5739 typescript required minimum version	2023-12-27 14:19:01 +01:00
Peter Bastiani	780a8c0fe6	Aw5739 Codelyzer depricated angular >v11	2023-12-27 14:15:12 +01:00
Peter Bastiani	6f9270b2e8	Aw5739 Prepare for Angular migration	2023-12-27 13:53:50 +01:00