update masterportalapi-related dependencies

warm-coolguy · warm-coolguy · commit 86faf2cbaf44 · 2025-01-07T10:47:19.000+01:00
diff --git a/jest.config.ts b/jest.config.ts
@@ -23,7 +23,7 @@ const config: Config.InitialOptions = {
   setupFiles: ['jest-canvas-mock'],
   setupFilesAfterEnv: ['./__mocks__/jest.setup.js'],
   transformIgnorePatterns: [
-    '/node_modules/(?!(@repositoryname/vuex-generators|@masterportal/masterportalapi|ol|geotiff|quick-lru|color-(space|parse|rgba|name))/)',
+    '/node_modules/(?!(@repositoryname/vuex-generators|@masterportal/masterportalapi|ol|pbf|earcut|geotiff|rbush|quickselect|quick-lru|color-(space|parse|rgba|name))/)',
   ],
 }
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -56,8 +56,9 @@
     "@actions/github": "^6.0.0",
     "@babel/core": "^7.24.8",
     "@babel/preset-env": "^7.24.8",
-    "@cesium/engine": "^9.2.0",
+    "@cesium/engine": "^12.0.1",
     "@jest/types": "^29.3.1",
+    "@masterportal/masterportalapi": "2.42.1",
     "@nx/js": "^19.8.2",
     "@playwright/test": "^1.47.2",
     "@swc-node/register": "~1.9.1",
@@ -73,6 +74,7 @@
     "@vue/test-utils": "^1.2.2",
     "@vue/vue2-jest": "^28.1.0",
     "babel-core": "^7.0.0-bridge.0",
+    "cesium": "^1.125.0",
     "copyfiles": "^2.4.1",
     "eslint": "^8.6.0",
     "eslint-config-prettier": "^8.3.0",
@@ -106,6 +108,5 @@
     "vite": "^5.4.8",
     "vite-plugin-commonjs": "^0.6.2",
     "vue-template-compiler": "^2.7.16"
-  },
-  "dependencies": {}
+  }
 }
diff --git a/packages/clients/dish/package.json b/packages/clients/dish/package.json
@@ -22,7 +22,7 @@
     "dev": "vite --host"
   },
   "devDependencies": {
-    "@masterportal/masterportalapi": "2.40.0",
+    "@masterportal/masterportalapi": "2.42.1",
     "@polar/core": "^2.0.0",
     "@polar/lib-custom-types": "^1.5.0",
     "@polar/lib-get-features": "^2.0.0",
diff --git a/packages/clients/meldemichel/src/polar-client.ts b/packages/clients/meldemichel/src/polar-client.ts
@@ -1,7 +1,7 @@
 import core, { NineLayoutTag } from '@polar/core'
 import merge from 'lodash.merge'
 import { Vector } from 'ol/layer'
-import { Feature, Map } from 'ol'
+import { Map } from 'ol'
 import { MapInstance } from '@polar/core/src/types'
 import packageInfo from '../package.json'
 import { MODE } from './enums'
@@ -26,7 +26,7 @@ const hideHamburgBorder = (map: Map) => {
     map
       .getLayers()
       .getArray()
-      .find((layer) => layer.get('id') === hamburgBorder) as Vector<Feature>
+      .find((layer) => layer.get('id') === hamburgBorder) as Vector
   ).setStyle(null)
 }
 
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -20,7 +20,6 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^6.5.2",
-    "@masterportal/masterportalapi": "2.40.0",
     "@polar/components": "^2.2.0",
     "@polar/lib-idx": "^1.0.0",
     "@polar/lib-get-cluster": "^2.0.0",
@@ -39,7 +38,8 @@
     "vuex": "^3.6.2"
   },
   "peerDependencies": {
-    "ol": "^9.2.4"
+    "@masterportal/masterportalapi": "2.42.1",
+    "ol": "^10.2.1"
   },
   "devDependencies": {
     "@polar/lib-custom-types": "^1.4.0"
diff --git a/packages/lib/getCluster/package.json b/packages/lib/getCluster/package.json
@@ -19,6 +19,6 @@
     "directory": "packages/lib/getCluster"
   },
   "peerDependencies": {
-    "ol": "^9.2.4"
+    "ol": "^10.2.1"
   }
 }
diff --git a/packages/lib/getFeatures/package.json b/packages/lib/getFeatures/package.json
@@ -20,7 +20,7 @@
     "directory": "packages/lib/getFeatures"
   },
   "peerDependencies": {
-    "ol": "^9.2.4"
+    "ol": "^10.2.1"
   },
   "devDependencies": {
     "@polar/lib-custom-types": "^1.5.0"
diff --git a/packages/lib/invisibleStyle/package.json b/packages/lib/invisibleStyle/package.json
@@ -20,6 +20,6 @@
     "directory": "packages/lib/invisibleStyle"
   },
   "peerDependencies": {
-    "ol": "^9.2.4"
+    "ol": "^10.2.1"
   }
 }
diff --git a/packages/lib/passesBoundaryCheck/index.ts b/packages/lib/passesBoundaryCheck/index.ts
@@ -1,4 +1,4 @@
-import { Feature, Map } from 'ol'
+import { Map } from 'ol'
 import { Coordinate } from 'ol/coordinate'
 import VectorLayer from 'ol/layer/Vector'
 import VectorSource from 'ol/source/Vector'
@@ -50,9 +50,7 @@ export const passesBoundaryCheck = async (
   const boundaryLayer = map
     .getLayers()
     .getArray()
-    .find(
-      (layer) => layer.get('id') === boundaryLayerId
-    ) as VectorLayer<Feature>
+    .find((layer) => layer.get('id') === boundaryLayerId) as VectorLayer
 
   if (!boundaryLayer) {
     console.error(
diff --git a/packages/lib/passesBoundaryCheck/package.json b/packages/lib/passesBoundaryCheck/package.json
@@ -14,6 +14,6 @@
   },
   "devDependencies": {
     "@polar/lib-custom-types": "^1.1.0",
-    "ol": "^9.2.4"
+    "ol": "^10.2.1"
   }
 }
diff --git a/packages/plugins/AddressSearch/package.json b/packages/plugins/AddressSearch/package.json
@@ -26,9 +26,9 @@
     "CHANGELOG.md"
   ],
   "peerDependencies": {
-    "@masterportal/masterportalapi": "2.40.0",
+    "@masterportal/masterportalapi": "2.42.1",
     "@repositoryname/vuex-generators": "^1.1.2",
-    "ol": "^9.2.4",
+    "ol": "^10.2.1",
     "vue": "^2.6.14",
     "vuex": "^3.6.2"
   },
diff --git a/packages/plugins/Attributions/package.json b/packages/plugins/Attributions/package.json
@@ -32,6 +32,6 @@
   "devDependencies": {
     "@polar/lib-custom-types": "^1.5.0",
     "@polar/lib-test-mount-parameters": "^1.3.0",
-    "ol": "^9.2.4"
+    "ol": "^10.2.1"
   }
 }
diff --git a/packages/plugins/Draw/package.json b/packages/plugins/Draw/package.json
@@ -25,7 +25,7 @@
   ],
   "peerDependencies": {
     "@repositoryname/vuex-generators": "^1.1.2",
-    "ol": "^9.2.4",
+    "ol": "^10.2.1",
     "vue": "^2.6.14",
     "vuex": "^3.6.2"
   },
diff --git a/packages/plugins/Filter/package.json b/packages/plugins/Filter/package.json
@@ -19,7 +19,7 @@
   ],
   "peerDependencies": {
     "@repositoryname/vuex-generators": "^1.1.2",
-    "ol": "^9.2.4",
+    "ol": "^10.2.1",
     "vue": "^2.6.14",
     "vuex": "^3.6.2"
   },
diff --git a/packages/plugins/GeoLocation/package.json b/packages/plugins/GeoLocation/package.json
@@ -24,7 +24,7 @@
     "CHANGELOG.md"
   ],
   "peerDependencies": {
-    "ol": "^9.2.4"
+    "ol": "^10.2.1"
   },
   "devDependencies": {
     "@polar/lib-passes-boundary-check": "^2.0.0",
diff --git a/packages/plugins/Gfi/package.json b/packages/plugins/Gfi/package.json
@@ -24,9 +24,9 @@
     "CHANGELOG.md"
   ],
   "peerDependencies": {
-    "@masterportal/masterportalapi": "2.40.0",
+    "@masterportal/masterportalapi": "2.42.1",
     "@repositoryname/vuex-generators": "^1.1.2",
-    "ol": "^9.2.4",
+    "ol": "^10.2.1",
     "vue": "^2.6.14",
     "vuex": "^3.6.2"
   },
diff --git a/packages/plugins/Gfi/src/store/actions/debouncedGfiRequest.ts b/packages/plugins/Gfi/src/store/actions/debouncedGfiRequest.ts
@@ -6,8 +6,7 @@ import {
   MapConfig,
   PolarActionContext,
 } from '@polar/lib-custom-types'
-import { Map, Feature } from 'ol'
-import { Geometry } from 'ol/geom'
+import { Map } from 'ol'
 import VectorLayer from 'ol/layer/Vector'
 import compare from 'just-compare'
 import { addFeature } from '../../utils/displayFeatureLayer'
@@ -137,7 +136,7 @@ const errorSymbol = (err) => Symbol(err)
  */
 // eslint-disable-next-line max-lines-per-function
 const gfiRequest =
-  (featureDisplayLayer: VectorLayer<Feature<Geometry>>) =>
+  (featureDisplayLayer: VectorLayer) =>
   async (
     {
       commit,
@@ -188,6 +187,5 @@ const gfiRequest =
       )
   }
 
-export const debouncedGfiRequest = (
-  featureDisplayLayer: VectorLayer<Feature<Geometry>>
-) => debounce(gfiRequest(featureDisplayLayer), 50)
+export const debouncedGfiRequest = (featureDisplayLayer: VectorLayer) =>
+  debounce(gfiRequest(featureDisplayLayer), 50)
diff --git a/packages/plugins/Gfi/src/utils/displayFeatureLayer.ts b/packages/plugins/Gfi/src/utils/displayFeatureLayer.ts
@@ -26,7 +26,7 @@ function isVectorSource(source): source is Vector {
 /**
  * reset feature layer's features.
  */
-export function clear(featureDisplayLayer: VectorLayer<Feature>): void {
+export function clear(featureDisplayLayer: VectorLayer): void {
   const source = featureDisplayLayer.getSource()
   if (isVectorSource(source)) {
     source.clear()
@@ -38,10 +38,13 @@ export function clear(featureDisplayLayer: VectorLayer<Feature>): void {
  */
 export function addFeature(
   feature: GeoJsonFeature,
-  featureDisplayLayer: VectorLayer<Feature>
+  featureDisplayLayer: VectorLayer
 ): void {
   const source = featureDisplayLayer.getSource()
   if (isVectorSource(source)) {
-    source.addFeature(new GeoJSON().readFeature(feature))
+    const geoJsonFeature = new GeoJSON().readFeature(feature)
+    source.addFeature(
+      Array.isArray(geoJsonFeature) ? geoJsonFeature[0] : geoJsonFeature
+    )
   }
 }
diff --git a/packages/plugins/LayerChooser/package.json b/packages/plugins/LayerChooser/package.json
@@ -24,9 +24,9 @@
     "CHANGELOG.md"
   ],
   "peerDependencies": {
-    "@masterportal/masterportalapi": "2.40.0",
+    "@masterportal/masterportalapi": "2.42.1",
     "@repositoryname/vuex-generators": "^1.1.2",
-    "ol": "^9.2.4",
+    "ol": "^10.2.1",
     "vue": "^2.6.14",
     "vuex": "^3.6.2"
   },
diff --git a/packages/plugins/Legend/package.json b/packages/plugins/Legend/package.json
@@ -27,6 +27,6 @@
     "@polar/lib-custom-types": "^1.5.0"
   },
   "peerDependencies": {
-    "@masterportal/masterportalapi": "2.40.0"
+    "@masterportal/masterportalapi": "2.42.1"
   }
 }
diff --git a/packages/plugins/Pins/package.json b/packages/plugins/Pins/package.json
@@ -25,7 +25,7 @@
   ],
   "peerDependencies": {
     "@repositoryname/vuex-generators": "^1.1.2",
-    "ol": "^9.2.4",
+    "ol": "^10.2.1",
     "vue": "^2.6.14",
     "vuex": "^3.6.2"
   },
diff --git a/packages/plugins/ReverseGeocoder/package.json b/packages/plugins/ReverseGeocoder/package.json
@@ -23,7 +23,7 @@
     "CHANGELOG.md"
   ],
   "peerDependencies": {
-    "ol": "^9.2.4",
+    "ol": "^10.2.1",
     "xml2js": "^0.4.23"
   },
   "devDependencies": {
diff --git a/packages/plugins/Scale/package.json b/packages/plugins/Scale/package.json
@@ -25,7 +25,7 @@
   "peerDependencies": {
     "@repositoryname/vuex-generators": "^1.1.2",
     "i18next": "^23.x",
-    "ol": "^9.2.4",
+    "ol": "^10.2.1",
     "vue": "^2.6.14",
     "vuex": "^3.6.2"
   },

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ const config: Config.InitialOptions = {`
`23`	`23`	`setupFiles: ['jest-canvas-mock'],`
`24`	`24`	`setupFilesAfterEnv: ['./__mocks__/jest.setup.js'],`
`25`	`25`	`transformIgnorePatterns: [`
`26`		`- '/node_modules/(?!(@repositoryname/vuex-generators\|@masterportal/masterportalapi\|ol\|geotiff\|quick-lru\|color-(space\|parse\|rgba\|name))/)',`
	`26`	`+ '/node_modules/(?!(@repositoryname/vuex-generators\|@masterportal/masterportalapi\|ol\|pbf\|earcut\|geotiff\|rbush\|quickselect\|quick-lru\|color-(space\|parse\|rgba\|name))/)',`
`27`	`27`	`],`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@`
`19`	`19`	`"directory": "packages/lib/getCluster"`
`20`	`20`	`},`
`21`	`21`	`"peerDependencies": {`
`22`		`- "ol": "^9.2.4"`
	`22`	`+ "ol": "^10.2.1"`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,6 @@`
`20`	`20`	`"directory": "packages/lib/invisibleStyle"`
`21`	`21`	`},`
`22`	`22`	`"peerDependencies": {`
`23`		`- "ol": "^9.2.4"`
	`23`	`+ "ol": "^10.2.1"`
`24`	`24`	`}`
`25`	`25`	`}`