@masterportal/masterportalapi 2.48.0 → 2.49.0

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 
  The [Semantic Versioning](https://semver.org/spec/v2.0.0.html) is used.
 
+## Unreleased - in development
+
+### __Breaking Changes__
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+---
+
+## 2.49.0 - 2025-04-294
+
+### Added
+- Add new parameters polygonStrokeDash, polygonStrokeDashOffset in styleObject of drawInteraction.
+
+### Changed
+- The following packages have been updated:
+    - dependencies:
+        - ol-mapbox-style: 12.4.0 to 12.5.0
+
+### Fixed
+- wms: Fix passing layerParams from layerBuilder.
+- wms-time: layers that are updated daily don't run into errors due to late promise-resolving anymore.
+- Issue #1386: handle label creation if values are empty.
+
+---
+
 ## 2.48.0 - 2025-04-01
 
 ### Fixed

package/babel.config.json

@@ -1,5 +1,5 @@
 {
-    "presets": [],
+  "presets": [],
     "plugins": [
         "@babel/plugin-transform-modules-commonjs"
     ]

package/jest.config.js

@@ -6,7 +6,7 @@ module.exports = {
     /** ol prints errors without HTMLCanvasElement being available in test environment */
     "setupFiles": ["jest-canvas-mock"],
     /** node_modules are usually ignored by babel-jest, but ol is published in ES6 */
-    "transformIgnorePatterns": ["/node_modules/(?!(ol|olcs|ol-mapbox-style|geotiff|quick-lru|color-space|color-rgba|color-parse|color-name|rbush|quickselect|earcut|pbf)/).*/"],
+    "transformIgnorePatterns": ["/node_modules/(?!(ol|olcs|ol-mapbox-style|mapbox-to-css-font|geotiff|quick-lru|color-space|color-rgba|color-parse|color-name|rbush|quickselect|earcut|pbf)/).*/"],
     /** only consider files in src/ for coverage */
     "collectCoverageFrom": ["src/**/*.js"],
     /** coverage reporters */
@@ -14,7 +14,8 @@ module.exports = {
     /** mapping svg to string representation since jest can't handle svg and mapping olcs paths*/
     "moduleNameMapper": {
         "marker.svg": "<rootDir>/public/stringMarker.js",
-        "olcs/lib/olcs/(.*)$": "<rootDir>/node_modules/olcs/lib/olcs/$1"
+        "olcs/lib/olcs/(.*)$": "<rootDir>/node_modules/olcs/lib/olcs/$1",
+        "ol-mapbox-style$": "<rootDir>/node_modules/ol-mapbox-style/src/$1"
     },
     "testEnvironment": "jsdom",
     "setupFilesAfterEnv": ["./jest.setup.js"],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@masterportal/masterportalapi",
   "author": "Implementierungspartnerschaft Masterportal <info@masterportal.org> (https://www.masterportal.org)",
-  "version": "2.48.0",
+  "version": "2.49.0",
   "license": "MIT",
   "description": "Basic functions of the Masterportal as api",
   "repository": {
@@ -22,7 +22,7 @@
     "core-js": "^3.33.1",
     "dayjs": "^1.11.10",
     "ol": "^10.4.0",
-    "ol-mapbox-style": "12.4.0",
+    "ol-mapbox-style": "12.5.0",
     "olcs": "^2.22.1",
     "proj4": "^2.10.0",
     "xml2js": "^0.6.2"

package/src/layer/vectorTile.js

@@ -4,11 +4,11 @@ import VectorTileSource from "ol/source/VectorTile";
 import OpenLayersTileGrid from "ol/tilegrid/TileGrid";
 import {extentFromProjection} from "ol/tilegrid";
 import * as webgl from "../renderer/webgl";
-
-import {stylefunction, apply} from "ol-mapbox-style";
+import {apply, stylefunction} from "ol-mapbox-style";
 
 import defaults from "../defaults";
 
+
 const OL_DEFAULT_VECTOR_TILE_GRID_CRS = "EPSG:3857";
 
 /**

package/src/layer/wms.js

@@ -112,6 +112,14 @@ export function createLayerSource (rawLayer, options) {
         projection = rawLayer.crs ? getProjection(rawLayer.crs) : undefined;
     let tileGrid = null;
 
+
+    // Fix for daily updated WMS-Time Layer, which use 'current' as the default value of the time-Extent in their getCapabilities
+    // The promise isn't resolved quickly enough for the continued work with the layer.
+    // Its resolved value would be the current date, so it is hardcoded here.
+    if (rawLayer.TIME && rawLayer.TIME.toString() === "[object Promise]") {
+        params.TIME = new Date().toISOString();
+    }
+
     if (rawLayer.singleTile) {
         return new ImageWMS({
             url: rawLayer.url,
@@ -154,13 +162,15 @@ export function createLayerSource (rawLayer, options) {
  * @param {function} [rawLayer.olAttribution] - optional function that takes a module:ol/Map~FrameState and returns a string or an array of strings representing source attributions
  * @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 {object} layerParams - additional layer params
+ * @param {object} [optionalParams] - optional params
+ * @param {object} [optionalParams.layerParams] - additional layer params
+ * @param {options} [optionalParams.options] - additional options
  * @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
  * @returns {ol.Layer} Layer that can be added to map.
  */
-export function createLayer (rawLayer, layerParams = {}, options) {
+export function createLayer (rawLayer = {}, {layerParams = {}, options = {}} = {}) {
     const source = createLayerSource(rawLayer, options),
         Layer = rawLayer.singleTile ? ImageLayer : TileLayer;
 

package/src/maps/interactions/drawInteraction.js

@@ -169,6 +169,8 @@ function setStyleObject (currentLayout, outerCircle = false) {
                         lineStrokeWidth: currentLayout.strokeWidth,
                         polygonFillColor: fillColorRgba,
                         polygonStrokeColor: currentLayout.strokeColor,
+                        polygonStrokeDash: currentLayout.polygonDash,
+                        polygonStrokeDashOffset: currentLayout.polygonStrokeDashOffset,
                         polygonStrokeWidth: currentLayout.strokeWidth
                     }
                 }

package/src/vectorStyle/styles/styleText.js

@@ -120,7 +120,7 @@ class TextStyle extends StyleClass {
         const feature = this.feature,
             featureProperties = feature.getProperties(),
             textSuffix = this.attributes.textSuffix;
-        let text = mapAttributes(featureProperties, this.attributes.labelField, false);
+        let text = mapAttributes(featureProperties, this.attributes.labelField, false) ?? "";
 
         if (textSuffix !== "") {
             text = text + " " + textSuffix;

package/test/layer/wms.test.js

@@ -250,7 +250,7 @@ describe("wms.js", function () {
                     name: "name",
                     layers: "layer1, layer2"
                 },
-                layer = wms.createLayer({singleTile: false, tilesize: "10", extent: [10, 20, 11, 22]}, layerParams, options);
+                layer = wms.createLayer({singleTile: false, tilesize: "10", extent: [10, 20, 11, 22]}, {layerParams, options});
 
             expect(layer).toBeInstanceOf(TileLayer);
             expect(layer.get("name")).toEqual("name");
@@ -266,7 +266,7 @@ describe("wms.js", function () {
                     name: "name",
                     layers: "layer1, layer2"
                 },
-                layer = wms.createLayer({singleTile: true}, layerParams);
+                layer = wms.createLayer({singleTile: true}, {layerParams});
 
             expect(layer).toBeInstanceOf(ImageLayer);
             expect(layer.get("name")).toEqual("name");

package/test/maps/interactions/drawInteraction.test.js

@@ -86,7 +86,8 @@ describe("src/maps/interactions/drawInteraction.js", () => {
                 fillColor: [55, 126, 184],
                 fillTransparency: 0,
                 strokeColor: [0, 0, 0],
-                strokeWidth: 1
+                strokeWidth: 1,
+                polygonDash: [4]
             };
 
             drawInteractions.setStyleObject(currentLayout);
@@ -124,6 +125,8 @@ describe("src/maps/interactions/drawInteraction.js", () => {
                                 0,
                                 0
                             ],
+                            polygonStrokeDash: [4],
+                            polygonStrokeDashOffset: undefined,
                             polygonStrokeWidth: 1
                         }
                     }