Merge branch 'feature/AW5739AngularV15ToV16' into develop

# Conflicts:
#	package-lock.json

package.json

@@ -11,24 +11,24 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^15.2.10",
+    "@angular/animations": "^16.2.12",
-    "@angular/common": "^15.2.10",
+    "@angular/common": "^16.2.12",
-    "@angular/compiler": "^15.2.10",
+    "@angular/compiler": "^16.2.12",
-    "@angular/core": "^15.2.10",
+    "@angular/core": "^16.2.12",
     "@angular-eslint/eslint-plugin": "^15.2.1",
-    "@angular/forms": "^15.2.10",
+    "@angular/forms": "^16.2.12",
-    "@angular/platform-browser": "^15.2.10",
+    "@angular/platform-browser": "^16.2.12",
-    "@angular/platform-browser-dynamic": "^15.2.10",
+    "@angular/platform-browser-dynamic": "^16.2.12",
-    "@angular/router": "^15.2.10",
+    "@angular/router": "^16.2.12",
     "@farmmaps/common": "file:dist/common",
     "@farmmaps/common-map": "file:dist/common-map",
     "@farmmaps/common-map3d": "file:dist/common-map3d",
     "ngx-openlayers": "file:dist/ngx-openlayers",
     "@microsoft/signalr": "^3.1.16",
-    "@ng-bootstrap/ng-bootstrap": "^13.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^14.0.0",
-    "@ngrx/effects": "^14",
+    "@ngrx/effects": "^16",
-    "@ngrx/router-store": "^14",
+    "@ngrx/router-store": "^16",
-    "@ngrx/store": "^14",
+    "@ngrx/store": "^16",
     "@popperjs/core": "^2.11.6",
     "angular-oauth2-oidc": "^13",
     "assert": "^2.0.0",
@@ -39,10 +39,10 @@
     "core-js": "^2.6.12",
     "https-browserify": "^1.0.0",
     "moment": "^2.29.4",
-    "ngrx-store-localstorage": "^14",
+    "ngrx-store-localstorage": "^15",
-    "ngx-avatars": "1.4.0",
+    "ngx-avatars": "1.5.0",
     "ngx-clipboard": "^15.1.0",
-    "ngx-image-cropper": "^3.3.5",
+    "ngx-image-cropper": "^7.2.1",
     "ngx-uploadx": "^5.2.0",
     "ol": "~6.3.1",
     "olcs": "^2.13.1",
@@ -54,22 +54,22 @@
     "tslib": "^2.4.0",
     "url": "^0.11.0",
     "util": "^0.12.4",
-    "zone.js": "~0.11.4"
+    "zone.js": "~0.13.3"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "^14",
+    "@angular-builders/custom-webpack": "^15",
-    "@angular-devkit/build-angular": "^15.2.10",
+    "@angular-devkit/build-angular": "^16.2.11",
-    "@angular/cli": "^15.2.10",
+    "@angular/cli": "^16.2.11",
-    "@angular/compiler-cli": "^15.2.10",
+    "@angular/compiler-cli": "^16.2.12",
-    "@angular/language-service": "^15.2.10",
+    "@angular/language-service": "^16.2.12",
-    "@angular/localize": "^15.2.10",
+    "@angular/localize": "^16.2.12",
     "@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": "^15.2.2",
+    "ng-packagr": "^16.2.3",
     "protractor": "~7.0.0",
     "ts-node": "^8.8.1",
-    "typescript": "~4.8.2"
+    "typescript": "~4.9.3"
   }
 }

projects/common-map/package-lock.json

@@ -11,12 +11,12 @@
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/core": ">=14.0.0",
+        "@angular/core": ">=15.0.0",
-        "@farmmaps/ngx-openlayers": "file:dist/ngx-openlayers",
+        "@ngrx/effects": ">=15.0.0",
-        "@ngrx/effects": ">=14.0.0",
+        "@ngrx/router-store": ">=15.0.0",
-        "@ngrx/router-store": ">=14.0.0",
+        "@ngrx/store": ">=15.0.0",
-        "@ngrx/store": ">=14.0.0",
+        "ngrx-store-localstorage": ">=15.0.0",
-        "ngrx-store-localstorage": ">=14.0.0",
+        "ngx-openlayers": "file:dist/ngx-openlayers",
         "ol": ">=6.8.1",
         "tassign": ">=1.0.0"
       }

projects/common-map/package.json

@@ -8,11 +8,11 @@
     "tslib": "^2.0.0"
   },
   "peerDependencies": {
-    "@angular/core": ">=14.0.0",
+    "@angular/core": ">=15.0.0",
-    "ngrx-store-localstorage": ">=14.0.0",
+    "ngrx-store-localstorage": ">=15.0.0",
-    "@ngrx/effects": ">=14.0.0",
+    "@ngrx/effects": ">=15.0.0",
-    "@ngrx/router-store":">=14.0.0",
+    "@ngrx/router-store":">=15.0.0",
-    "@ngrx/store":">=14.0.0",
+    "@ngrx/store":">=15.0.0",
     "tassign": ">=1.0.0",
     "ngx-openlayers": "file:dist/ngx-openlayers",
     "ol": ">=6.8.1"

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()

projects/common-map3d/package-lock.json

@@ -14,7 +14,7 @@
         "@angular/common": ">=14.0.0",
         "@angular/core": ">=14.0.0",
         "cesium": ">=1.82.1",
-        "ngx-openlayers": "1.0.0-next.19",
+        "ngx-openlayers": "file:dist/ngx-openlayers",
         "ol-cesium": ">=2.13.0"
       }
     },

projects/common/package-lock.json

@@ -8,20 +8,20 @@
       "name": "@farmmaps/common",
       "version": "2.0.0",
       "peerDependencies": {
-        "@angular/common": ">=14.0.0",
+        "@angular/common": ">=15.0.0",
-        "@angular/core": ">=14.0.0",
+        "@angular/core": ">=15.0.0",
-        "@angular/forms": ">=14.0.0",
+        "@angular/forms": ">=15.0.0",
         "@microsoft/signalr": ">=3.1.3",
-        "@ng-bootstrap/ng-bootstrap": ">=10.0.0",
+        "@ng-bootstrap/ng-bootstrap": ">=15.0.0",
-        "@ngrx/effects": ">=14.0.0",
+        "@ngrx/effects": ">=15.0.0",
-        "@ngrx/router-store": ">=14.0.0",
+        "@ngrx/router-store": ">=15.0.0",
-        "@ngrx/store": ">=14.0.0",
+        "@ngrx/store": ">=15.0.0",
         "angular-oauth2-oidc": ">=13.0.0",
         "bootstrap": ">=4.4.1",
         "moment": ">=2.27.0",
-        "ngx-avatars": ">=1.5.0",
+        "ngx-avatars": "1.5.0",
-        "ngx-clipboard": ">=14.0.1",
+        "ngx-clipboard": ">=15.1.0",
-        "ngx-image-cropper": ">=3.3.5",
+        "ngx-image-cropper": ">=7.2.1",
         "ngx-uploadx": ">=5.1.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": ">=15.0.0",
-    "@angular/common": ">=14.0.0",
+    "@angular/common": ">=15.0.0",
-    "@angular/core": ">=14.0.0",
+    "@angular/core": ">=15.0.0",
-    "@angular/forms": ">=14.0.0",
+    "@angular/forms": ">=15.0.0",
-    "@ngrx/effects": ">=14.0.0",
+    "@ngrx/effects": ">=15.0.0",
-    "@ngrx/router-store": ">=14.0.0",
+    "@ngrx/router-store": ">=15.0.0",
-    "@ngrx/store": ">=14.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-avatars": "1.4.0",
+    "ngx-avatars": "1.5.0",
-    "ngx-image-cropper": ">=3.3.5",
+    "ngx-image-cropper": ">=7.2.1",
     "ngx-clipboard": ">=15.1.0"
   }
 }

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/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,7 +13,7 @@ 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>) { }
   

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/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/ngx-openlayers/package-lock.json

@@ -0,0 +1,17 @@
+{
+  "name": "ngx-openlayers",
+  "version": "2.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "ngx-openlayers",
+      "version": "2.0.0",
+      "peerDependencies": {
+        "@angular/common": ">=14.x.x",
+        "@angular/core": ">=14.x.x",
+        "ol": "^6.0.0"
+      }
+    }
+  }
+}