@masterportal/masterportalapi 2.37.0 → 2.38.0

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 
  The [Semantic Versioning](https://semver.org/spec/v2.0.0.html) is used.
 
+## 2.38.0 - 2024-06-04
+
+### Added
+- Added support for Node LTS version ^20.12.2 and npm Version ^10.5.0.
+
+### Changed
+- The following packages have been updated:
+    - dependencies:
+        - ol: 9.1.0 to 9.2.4
+        - olcs: 2.19.3 to 2.20.0
+
+### Fixed
+- The mitigation for issue 666 in ol-cesium since version 2.37.0 is removed
+- Webgl: vectorTiles were not displayed.
+- WMS-Layer: special loadFunction is only used if layer's attribute `isSecured` is true.
+
+---
+
 ## 2.37.0 - 2024-04-23
 
 ### Fixed

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@masterportal/masterportalapi",
   "author": "Implementierungspartnerschaft Masterportal <info@masterportal.org> (https://www.masterportal.org)",
-  "version": "2.37.0",
+  "version": "2.38.0",
   "license": "MIT",
   "description": "Basic functions of the Masterportal as api",
   "repository": {
@@ -21,9 +21,9 @@
   "dependencies": {
     "core-js": "^3.33.1",
     "dayjs": "^1.11.10",
-    "ol": "9.1.0",
+    "ol": "9.2.4",
     "ol-mapbox-style": "12.2.1",
-    "olcs": "2.19.3",
+    "olcs": "2.20.0",
     "proj4": "^2.10.0",
     "xml2js": "^0.6.2"
   },
@@ -59,8 +59,8 @@
     "@cesium/engine": "^6.2.0"
   },
   "engines": {
-    "node": "^16.13.2 || ^18.12.0 || ^20.9.0",
-    "npm": "^8.1.2 || ^9.3.1 || ^10.1.0"
+    "node": "^16.13.2 || ^18.12.0 || ^20.12.2",
+    "npm": "^8.1.2 || ^9.3.1 || ^10.5.0"
   },
   "homepage": "https://bitbucket.org/geowerkstatt-hamburg/masterportalapi#readme",
   "directories": {

package/src/layer/wms.js

@@ -77,13 +77,12 @@ export function makeParams (rawLayer) {
 }
 
 /**
- * Return a ol tile or image load function for the rawLayer.
- * @param {object} rawLayer - layer specification as in services.json
+ * Return a ol tile or image load function for the rawLayer. Fetches with credentials: 'include'.
  * @returns {function} tile/image load function
  */
-export function defaultLoadFunction ({isSecured}) {
+export function loadFunctionWithCredentials () {
     return async (image, src) => {
-        const response = await fetch(src, {credentials: isSecured ? "include" : "omit"}),
+        const response = await fetch(src, {credentials: "include"}),
             data = await response.blob();
 
         image.getImage().src = URL.createObjectURL(data);
@@ -100,7 +99,7 @@ export function defaultLoadFunction ({isSecured}) {
  * @param {string|number} [rawLayer.tilesize] - optional needed to create the tileGrid
  * @param {string|"anonymous"} [rawLayer.crossOrigin] - optional needed for CORS requests of image data, to enable canvas export
  * @param {string} [rawLayer.cqlFilter] - optional CQL filter to add to the request
- * @param {boolean} [rawLayer.isSecured] - whether the layer is secured by BasicAuth and should include or omit the credentials prompt
+ * @param {boolean} [rawLayer.isSecured] - if the layer is secured by BasicAuth, images are loaded with credentials: 'include'.
  * @param {object} options - optional resolutions and origin to create the TileGrid
  * @param {Array} [options.resolutions] - optional resolutions to create the TileGrid, must be in descending order
  * @param {Array} [options.origin] - optional origin to create the TileGrid
@@ -120,8 +119,8 @@ export function createLayerSource (rawLayer, options) {
             projection: projection,
             attributions: rawLayer.olAttribution,
             crossOrigin: rawLayer.crossOrigin,
-            ...rawLayer.isSecured ? { // TODO: Remove this guard when olcs#666 is resolved
-                imageLoadFunction: defaultLoadFunction(rawLayer)
+            ...rawLayer.isSecured ? {
+                imageLoadFunction: loadFunctionWithCredentials()
             } : {}
         });
     }
@@ -140,7 +139,9 @@ export function createLayerSource (rawLayer, options) {
         projection: projection,
         attributions: rawLayer.olAttribution,
         crossOrigin: rawLayer.crossOrigin,
-        tileLoadFunction: defaultLoadFunction(rawLayer)
+        ...rawLayer.isSecured ? {
+            tileLoadFunction: loadFunctionWithCredentials()
+        } : {}
     });
 }
 

package/src/maps/ol/olMap.js

@@ -148,7 +148,8 @@ export function createMap (config = defaults, {mapParams, callback, errorCallbac
     crs.registerProjections(config.namedProjections);
     setBackgroundImage(config);
     setGazetteerUrl(config.gazetteerUrl);
-    const selectedInteractions = config.mapInteractions?.interactionModes ? config.mapInteractions?.interactionModes : {dragPan: false, altShiftDragRotate: false, pinchRotate: false},
+
+    const selectedInteractions = Object.assign({}, {dragPan: false, altShiftDragRotate: false, pinchRotate: false}, config.mapInteractions?.interactionModes),
         map = new Map(Object.assign({
             target: config.target || defaults.target,
             interactions: olDefaultInteractions(selectedInteractions).extend([
@@ -157,7 +158,7 @@ export function createMap (config = defaults, {mapParams, callback, errorCallbac
                         if (event.originalEvent.shiftKey) {
                             return false;
                         }
-                        return (!event.originalEvent.pointerType || event.originalEvent.pointerType === "mouse") || (config.twoFingerPan && this.getPointerCount() === 2) || !config.twoFingerPan;
+                        return (!event.originalEvent.pointerType || event.originalEvent.pointerType === "mouse") || (config.mapInteractions?.interactionModes?.twoFingerPan && this.getPointerCount() === 2) || !config.mapInteractions?.interactionModes?.twoFingerPan;
                     }
                 })
             ]),

package/src/renderer/webgl.js

@@ -107,6 +107,7 @@ export function createVectorTileLayerRenderer () {
                         fragment: result.builder.getSymbolFragmentShader(),
                         vertex: result.builder.getSymbolVertexShader()
                     },
+                    builder: result.builder,
                     attributes: {
                         fillColor: {
                             size: 2,

package/test/layer/wms.test.js

@@ -102,7 +102,7 @@ describe("wms.js", function () {
         });
     });
 
-    describe("defaultLoadFunction", function () {
+    describe("loadFunctionWithCredentials", function () {
         beforeEach(() => {
             const blob = new Blob();
 
@@ -121,19 +121,12 @@ describe("wms.js", function () {
         });
 
         it("passes credentials if isSecured is set", async function () {
-            const result = wms.defaultLoadFunction({isSecured: true}),
+            const result = wms.loadFunctionWithCredentials(),
                 input = {src: ""};
 
             await result({getImage: () => input}, "SECURE_WMS");
             expect(input.src).toEqual("blob:BLOB");
         });
-        it("does not pass credentials if isSecured is not set", async function () {
-            const result = wms.defaultLoadFunction({isSecured: false}),
-                input = {src: ""};
-
-            await result({getImage: () => input}, "INSECURE_WMS");
-            expect(input.src).toEqual("blob:BLOB");
-        });
     });
 
     describe("createLayerSource", function () {