Merge branch 'develop'

# Conflicts:
#	package-lock.json
#	package.json

README.md

@@ -52,6 +52,7 @@ ng serve
 ```
 *Go*`
 
+
 Point your browser to http://localhost:4200 
 
 *ESLint*

package.json

@@ -1,6 +1,6 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "4.21.0",
+  "version": "4.19.1",
   "scripts":   {
     "ng": "ng",
     "start": "ng serve",
@@ -11,39 +11,39 @@
   },
   "private": true,
   "dependencies":   {
-    "@angular-eslint/eslint-plugin": "20.7.0",
+    "@angular-eslint/eslint-plugin": "^18.2.0",
-    "@angular/animations": "21.1.0",
+    "@angular/animations": "18.2.3",
-    "@angular/common": "21.1.0",
+    "@angular/common": "18.2.3",
-    "@angular/compiler": "21.1.0",
+    "@angular/compiler": "18.2.3",
-    "@angular/core": "21.1.0",
+    "@angular/core": "18.2.3",
-    "@angular/forms": "21.1.0",
+    "@angular/forms": "18.2.3",
-    "@angular/platform-browser": "21.1.0",
+    "@angular/platform-browser": "18.2.3",
-    "@angular/platform-browser-dynamic": "21.1.0",
+    "@angular/platform-browser-dynamic": "18.2.3",
-    "@angular/router": "21.1.0",
+    "@angular/router": "18.2.3",
     "@farmmaps/common": "file:dist/common",
     "@farmmaps/common-map": "file:dist/common-map",
     "@farmmaps/common-map3d": "file:dist/common-map3d",
     "@farmmaps/ng-openlayers": "file:dist/ng-openlayers",
-    "@microsoft/signalr": "10.0.0",
+    "@microsoft/signalr": "^3.1.16",
-    "@ng-bootstrap/ng-bootstrap": "20.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^17.0.1",
-    "@ngrx/effects": "21.0.1",
+    "@ngrx/effects": "^18.0.2",
-    "@ngrx/router-store": "21.0.1",
+    "@ngrx/router-store": "^18.0.2",
-    "@ngrx/store": "21.0.1",
+    "@ngrx/store": "^18.0.2",
-    "@popperjs/core": "2.11.8",
+    "@popperjs/core": "^2.11.8",
-    "angular-oauth2-oidc": "20.0.2",
+    "angular-oauth2-oidc": "^17.0.2",
-    "assert": "2.1.0",
+    "assert": "^2.0.0",
-    "bootstrap": "5.3.8",
+    "bootstrap": "^5.3.3",
     "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "cesium": "^1.97.0",
     "core-js": "^2.6.12",
     "https-browserify": "^1.0.0",
     "moment": "^2.29.4",
-    "ngrx-store-localstorage": "20.1.0",
+    "ngrx-store-localstorage": "^18.0.0",
-    "ngx-avatars": "1.10.1",
+    "ngx-avatars": "^1.8.0",
     "ngx-clipboard": "^16.0.0",
     "ngx-image-cropper": "^7.0.0",
-    "ngx-uploadx": "7.0.1",
+    "ngx-uploadx": "^6.2.0",
     "ol": "^8.2.0",
     "olcs": "^2.13.1",
     "resumablejs": "^1.1.0",
@@ -54,47 +54,40 @@
     "tslib": "^2.4.0",
     "url": "^0.11.0",
     "util": "^0.12.4",
-    "zone.js": "~0.15.1"
+    "zone.js": "~0.14.10"
   },
   "optionalDependencies":   {
     "@lmdb/lmdb-linux-x64": "^3.1.0",
     "@rollup/rollup-linux-x64-gnu": "^4.21.2"
   },
   "devDependencies":   {
-    "@angular-builders/custom-webpack": "21.0.3",
+    "@angular-builders/custom-webpack": "^18.0.0",
-    "@angular-devkit/build-angular": "21.1.0",
+    "@angular-devkit/build-angular": "18.2.3",
-    "@angular/build": "21.1.0",
+    "@angular/cli": "18.2.3",
-    "@angular/cli": "21.1.0",
+    "@angular/compiler-cli": "18.2.3",
-    "@angular/compiler-cli": "21.1.0",
+    "@angular/language-service": "18.2.3",
-    "@angular/language-service": "21.1.0",
+    "@angular/localize": "18.2.3",
-    "@angular/localize": "21.1.0",
     "@types/arcgis-rest-api": "^10.4.5",
+    "@types/jasmine": "~2.8.8",
+    "@types/jasminewd2": "^2.0.9",
     "@types/node": "^22.5.4",
-    "@typescript-eslint/eslint-plugin": "8.53.1",
+    "@typescript-eslint/eslint-plugin": "^6.18.0",
-    "@typescript-eslint/parser": "8.53.1",
+    "@typescript-eslint/eslint-plugin-tslint": "^6.18.0",
-    "@vitest/browser": "4.0.17",
+    "@typescript-eslint/parser": "^6.18.0",
-    "@vitest/browser-playwright": "^4.0.17",
+    "codelyzer": "^6.0.2",
-    "eslint": "9.39.2",
+    "eslint": "^8.35.0",
-    "eslint-config-prettier": "10.1.8",
+    "eslint-config-prettier": "^8.6.0",
-    "eslint-plugin-import": "2.32.0",
+    "eslint-plugin-import": "^2.27.5",
-    "jsdom": "^27.4.0",
+    "jasmine-core": "^4.3.0",
-    "ng-packagr": "21.1.0",
+    "jasmine-spec-reporter": "^7.0.0",
+    "karma": "^6.3.20",
+    "karma-chrome-launcher": "~3.1.0",
+    "karma-coverage-istanbul-reporter": "^3.0.3",
+    "karma-jasmine": "^5.1.0",
+    "karma-jasmine-html-reporter": "^2.0.0",
+    "ng-packagr": "^18.2.1",
+    "protractor": "~7.0.0",
     "ts-node": "^8.8.1",
-    "typescript": "~5.9.3",
+    "typescript": "~5.4.4"
-    "vitest": "4.0.17"
-  },
-  "overrides":   {
-    "ngrx-store-localstorage":     {
-      "@angular/common": "$@angular/common",
-      "@angular/core": "$@angular/core"
-    },
-    "ngx-avatars":     {
-      "@angular/common": "$@angular/common",
-      "@angular/core": "$@angular/core"
-    },
-    "ngx-uploadx":     {
-      "@angular/common": "$@angular/common",
-      "@angular/core": "$@angular/core"
-    }
   }
 }