@masterportal/masterportalapi 2.16.0 → 2.18.0

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 
  The [Semantic Versioning](https://semver.org/spec/v2.0.0.html) is used.
 
+## 2.18.0 - 2023-05-10
+### Changed
+- The following packages have been updated:
+    - dependencies:
+        - core-js: 3.29.1 to 3.30.2
+        - olcs: 2.13.1 to 2.14.0
+    - devDependencies:
+        - @babel/core: 7.21.3 to 7.21.8
+        - @babel/plugin-transform-modules-commonjs: 7.21.2 to 7.21.5
+        - @parcel/transformer-sass: 2.6.0 to 2.8.3
+        - canvas: 2.11.0 to 2.11.2
+        - eslint: 8.36.0 to 8.40.0
+        - jest-canvas-mock: 2.4.0 to 2.5.0
+        - parcel: 2.6.0 to 2.8.3
+        - sass: 1.59.3 to 1.62.1
+- The devDependency `buffer` ist downgrade from 6.0.3 to 5.7.1 because parcel requires a version 5
+
+---
+
+## 2.17.0 - 2023-04-27
+### Added
+- Added functionality for mapbox style raster sources for vector tile layer.
+- Added possibility to use zoomToFeatureId in vectorStyle.
+
+### Changed
+- ol map default interactions and keyboardEventTarget can now be set by config parameters.
+- The following packages have been updated:
+    - dependencies:
+        - xml2js: 0.4.23 to 0.5.0
+
+### Fix
+- Fix vectorStyle for circlesegments.
+
+---
+
 ## 2.16.0 - 2023-03-28
 ### Added
 - Added support for `npm` version ^9.1.3.

package/example/config/portal.json

@@ -35,7 +35,8 @@
       "name": "Schulinfosystem",
       "renderer": "default",
       "styleId": "8712",
-      "typ": "WFS"
+      "typ": "WFS",
+      "altitudeMode": "clampToGround"
     },
     {
       "id": "1534",

package/example/config/services.json

@@ -2,14 +2,14 @@
   {
     "id": "1001",
     "typ": "WMS",
-    "name": "WebAtlasDe",
-    "url": "https://sg.geodatenzentrum.de/wms_webatlasde__54a30b0f-b92f-34ba-39c0-3af32cfa13d6",
+    "name" : "Geobasiskarten (HamburgDE)",
+    "url" : "https://geodienste.hamburg.de/HH_WMS_HamburgDE",
     "format": "image/png",
     "version": "1.3.0",
-    "layers": "webatlasde",
+    "layers" : "Geobasiskarten_HHde",
     "transparent": true,
     "singleTile": false,
-    "tilesize": 256,
+    "tilesize" : 512,
     "gutter": 0,
     "minScale": 1,
     "maxScale": 200

package/example/index.js

@@ -262,7 +262,7 @@ fetch(vtStyleUrl)
     .then(style => {
         const vtLayer = window.mpapi.map.addLayer("6001");
 
-        mpapi.vectorTile.setStyle(vtLayer, style);
+        mpapi.vectorTile.setStyle(vtLayer, style, vtStyleUrl);
     });
 //*/
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@masterportal/masterportalapi",
   "author": "Implementierungspartnerschaft Masterportal <info@masterportal.org> (https://www.masterportal.org)",
-  "version": "2.16.0",
+  "version": "2.18.0",
   "license": "MIT",
   "description": "Basic functions of the Masterportal as api",
   "repository": {
@@ -19,28 +19,28 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "core-js": "^3.29.1",
+    "core-js": "^3.30.2",
     "ol": "7.3.0",
-    "olcs": "^2.13.1",
+    "olcs": "^2.14.0",
     "proj4": "^2.9.0",
-    "xml2js": "^0.4.23"
+    "xml2js": "^0.5.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.21.3",
-    "@babel/plugin-transform-modules-commonjs": "^7.21.2",
-    "@parcel/transformer-sass": "^2.6.0",
-    "buffer": "^6.0.3",
-    "canvas": "^2.11.0",
-    "eslint": "^8.36.0",
+    "@babel/core": "^7.21.8",
+    "@babel/plugin-transform-modules-commonjs": "^7.21.5",
+    "@parcel/transformer-sass": "^2.8.3",
+    "buffer": "^5.7.1",
+    "canvas": "^2.11.2",
+    "eslint": "^8.40.0",
     "events": "^3.3.0",
     "husky": "^8.0.3",
     "jest": "^29.5.0",
-    "jest-canvas-mock": "^2.4.0",
+    "jest-canvas-mock": "^2.5.0",
     "jest-environment-jsdom": "^29.5.0",
     "jsdoc": "^4.0.2",
-    "parcel": "^2.6.0",
+    "parcel": "^2.8.3",
     "process": "^0.11.10",
-    "sass": "^1.59.3",
+    "sass": "^1.62.1",
     "stream-browserify": "^3.0.0",
     "timers-browserify": "^2.0.12",
     "use-resize-observer": "^9.1.0"

package/src/layer/vectorTile.js

@@ -4,7 +4,7 @@ import VectorTileSource from "ol/source/VectorTile";
 import OpenLayersTileGrid from "ol/tilegrid/TileGrid";
 import {extentFromProjection} from "ol/tilegrid";
 
-import {stylefunction} from "ol-mapbox-style";
+import {stylefunction, apply} from "ol-mapbox-style";
 
 import defaults from "../defaults";
 
@@ -161,13 +161,25 @@ export function createLayer (rawLayer = {}, {layerParams = {}, options = {}} = {
  * @param {ol.layer.VectorTile} layer - layer to style
  * @param {object} glStyle - MapBox style definition
  * @param {options} [styleParams={}] - Additional options for style specification
+ * @param {string} url - MapBox style url
  * @returns {void}
  */
-export function setStyle (layer, glStyle, {options = {}} = {}) {
-    stylefunction(layer, glStyle,
-        options.sourceId ? options.sourceId : Object.keys(glStyle.sources)[0],
-        options.resolutions,
-        options.spriteData,
-        options.spriteImageUrl,
-        options.getFonts);
+export function setStyle (layer, glStyle, {options = {}} = {}, url) {
+    Object.keys(glStyle.sources).forEach((key) => {
+        const glStyleSourceId = key;
+
+        if (glStyle.sources[key].type !== "vector" && glStyle.sources[key].type !== "geojson") {
+            const olMap = layer.get("map");
+
+            apply(olMap, url);
+        }
+        else {
+            stylefunction(layer, glStyle,
+                options.sourceId ? options.sourceId : glStyleSourceId,
+                options.resolutions,
+                options.spriteData,
+                options.spriteImageUrl,
+                options.getFonts);
+        }
+    });
 }

package/src/maps/ol/olMap.js

@@ -150,18 +150,23 @@ export function createMap (config = defaults, {mapParams, callback, errorCallbac
     crs.registerProjections(config.namedProjections);
     setBackgroundImage(config);
     setGazetteerUrl(config.gazetteerUrl);
-    const map = new Map(Object.assign({
-        target: config.target || defaults.target,
-        interactions: olDefaultInteractions({dragPan: false, altShiftDragRotate: false, pinchRotate: false}).extend([
-            new DragPan({
-                condition: function (event) {
-                    return (!event.originalEvent.pointerType || event.originalEvent.pointerType === "mouse") || (config.twoFingerPan && this.getPointerCount() === 2) || !config.twoFingerPan;
-                }
-            })
-        ]),
-        controls: [],
-        view: createMapView(config)
-    }, mapParams));
+    const selectedInteractions = config.mapInteractions?.interactionModes ? config.mapInteractions?.interactionModes : {dragPan: false, altShiftDragRotate: false, pinchRotate: false},
+        map = new Map(Object.assign({
+            target: config.target || defaults.target,
+            interactions: olDefaultInteractions(selectedInteractions).extend([
+                new DragPan({
+                    condition: function (event) {
+                        if (event.originalEvent.shiftKey) {
+                            return false;
+                        }
+                        return (!event.originalEvent.pointerType || event.originalEvent.pointerType === "mouse") || (config.twoFingerPan && this.getPointerCount() === 2) || !config.twoFingerPan;
+                    }
+                })
+            ]),
+            controls: [],
+            view: createMapView(config),
+            keyboardEventTarget: config.mapInteractions?.keyboardEventTarget ? config.mapInteractions?.keyboardEventTarget : false
+        }, mapParams));
 
     map.set("mapMode", "2D");
     map.set("id", `map2D_${mapIdCounter++}`);

package/src/maps/olcs/3dUtils/wmsRasterSynchronizer.js

@@ -7,7 +7,7 @@ import TileWMS from "ol/source/TileWMS.js";
 import ImageWMS from "ol/source/ImageWMS.js";
 import WMTS from "ol/source/WMTS.js";
 import olcsAbstractSynchronizer from "olcs/AbstractSynchronizer.js";
-import olcsCore from "olcs/core.js";
+import {extentToRectangle, tileLayerToImageryLayer, updateCesiumLayerProperties} from "olcs/core.js";
 import {Tile, Image as ImageLayer} from "ol/layer.js";
 import {stableSort} from "ol/array.js";
 import {getBottomLeft, getBottomRight, getTopRight, getTopLeft} from "ol/extent.js";
@@ -162,7 +162,7 @@ class WMSRasterSynchronizer extends olcsAbstractSynchronizer {
             const ext = olLayer.getExtent();
 
             if (ext && viewProj) {
-                options.rectangle = olcsCore.extentToRectangle(ext, viewProj);
+                options.rectangle = extentToRectangle(ext, viewProj);
                 const minMax = this.getMinMaxLevelFromTileGrid(tileGrid, ext, viewProj);
 
                 options.tileWidth = tileGrid.getTileSize(0)[0];
@@ -182,7 +182,7 @@ class WMSRasterSynchronizer extends olcsAbstractSynchronizer {
      * @returns {Cesium.ImageryLayer} The imagery layer.
      */
     createImageryLayerForImageWMS (olLayer, viewProj) {
-        return olcsCore.tileLayerToImageryLayer(this.map, olLayer, viewProj);
+        return tileLayerToImageryLayer(this.map, olLayer, viewProj);
     }
 
     /**
@@ -298,13 +298,13 @@ class WMSRasterSynchronizer extends olcsAbstractSynchronizer {
                     console.assert(cesiumObjects);
                     /* eslint-enable no-console */
                     for (let i = 0; i < cesiumObjects.length; ++i) {
-                        olcsCore.updateCesiumLayerProperties(olLayerWithParents, cesiumObjects[i]);
+                        updateCesiumLayerProperties(olLayerWithParents, cesiumObjects[i]);
                     }
                 }));
             });
 
             for (let i = 0; i < cesiumObjects.length; ++i) {
-                olcsCore.updateCesiumLayerProperties(olLayerWithParents, cesiumObjects[i]);
+                updateCesiumLayerProperties(olLayerWithParents, cesiumObjects[i]);
             }
 
             // there is no way to modify Cesium layer extent,

package/src/vectorStyle/styleList.js

@@ -18,7 +18,8 @@ let styleList,
     highlightFeaturesPolygonStyleId,
     highlightFeaturesLineStyleId,
     styleConf,
-    featureViaUrlLayers;
+    featureViaUrlLayers,
+    zoomToFeatureId;
 
 /**
  * Gathers the styleIds of the layers.
@@ -196,9 +197,10 @@ function parseStyles (data) {
         getStyleIdForHighlightFeaturesPolygon(),
         getStyleIdForHighlightFeaturesLine(),
         getStyleIdsFromTools(),
-        getFeatureViaURLStyles());
+        getFeatureViaURLStyles(),
+        zoomToFeatureId);
 
-    styleIds = styleIds.reduce((acc, val) => acc.concat(val), []);
+    styleIds = styleIds.reduce((acc, val) => acc.concat(val), []).filter(item => item);
     filteredData = dataWithDefaultValue.filter(styleObject => styleIds.includes(styleObject.styleId));
 
     return filteredData;
@@ -223,6 +225,7 @@ function initializeStyleList (styleGetters, Config, layers, tools, callback) {
     highlightFeaturesPointStyleId = styleGetters.highlightFeaturesPointStyleId;
     highlightFeaturesPolygonStyleId = styleGetters.highlightFeaturesPolygonStyleId;
     highlightFeaturesLineStyleId = styleGetters.highlightFeaturesLineStyleId;
+    zoomToFeatureId = styleGetters.zoomToFeatureId;
 
     styleConf = Config.styleConf;
     featureViaUrlLayers = Config.featureViaURL?.layers;

package/src/vectorStyle/styles/point/stylePointNominal.js

@@ -220,11 +220,14 @@ export function createNominalPointStyle (attributes, feature, defaultImageName)
     if (styleScalingShape === "CIRCLESEGMENTS") {
         svgPath = createNominalCircleSegments(workingFeature, attributes);
         style = createSVGStyle(svgPath, 5);
+        style.type = "CIRCLESEGMENTS";
+        style.scalingAttribute = workingFeature.get(attributes.scalingAttribute);
     }
 
     // create style from svg and image
     if (imageName !== defaultImageName) {
         imageStyle = createIconStyle(attributes, feature);
+        imageStyle.type = "imageStyle";
         style = [style, imageStyle];
     }