@masterportal/masterportalapi 2.19.0 → 2.19.2

package/CHANGELOG.md

@@ -3,12 +3,14 @@
 
  The [Semantic Versioning](https://semver.org/spec/v2.0.0.html) is used.
 
-## Unreleased - in development
-### Added
-### Changed
-### Deprecated
-### Removed
+## 2.19.2 - 2023-06-12
 ### Fixed
+- VectorStyle of multiple geometries with styling rules does not fail on not existing style.
+
+---
+## 2.19.1 - 2023-06-02
+### Changed
+- Exports in src/layer/wmts.js changed to export default {} to provide  ES-Syntax.
 
 ---
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@masterportal/masterportalapi",
   "author": "Implementierungspartnerschaft Masterportal <info@masterportal.org> (https://www.masterportal.org)",
-  "version": "2.19.0",
+  "version": "2.19.2",
   "license": "MIT",
   "description": "Basic functions of the Masterportal as api",
   "repository": {
@@ -11,7 +11,7 @@
   "main": "src/index.js",
   "scripts": {
     "test": "jest .test.js --config ./jest.config.js --collectCoverage",
-    "test:trace": "node --trace-warnings node_modules/jest/bin/jest.js ./test/layer/wfs.test.js --config ./jest.config.js",
+    "test:trace": "node --trace-warnings node_modules/jest/bin/jest.js .test.js --config ./jest.config.js",
     "test:watch": "jest .test.js --config ./jest.config.js --watch",
     "example": "parcel example/index.html",
     "generate-jsdoc": "jsdoc ./src -r -d ./docs/ -R ./README.md -c jsdoc.json",

package/src/index.js

@@ -2,7 +2,7 @@ import {createMapView} from "./maps/mapView";
 import crs from "./crs";
 import rawLayerList from "./rawLayerList";
 import * as wms from "./layer/wms";
-import * as wmts from "./layer/wmts";
+import wmts from "./layer/wmts";
 import * as wfs from "./layer/wfs";
 import * as geojson from "./layer/geojson";
 import * as vectorBase from "./layer/vectorBase";

package/src/layer/wmts.js

@@ -12,7 +12,7 @@ import {get as getProjection} from "ol/proj";
  * @param {String} layerName layerName
  * @returns {void}
  */
-export function showErrorMessage (errorMessage, layerName) {
+function showErrorMessage (errorMessage, layerName) {
     console.error("content: Layer " + layerName + ": " + errorMessage);
 }
 
@@ -24,7 +24,7 @@ export function showErrorMessage (errorMessage, layerName) {
  * @param {Number} size The tileSize depending on the extent.
  * @returns {void}
  */
-export function generateArrays (resolutions, matrixIds, length, size) {
+function generateArrays (resolutions, matrixIds, length, size) {
     for (let i = 0; i < length; ++i) {
         resolutions[i] = size / Math.pow(2, i);
         matrixIds[i] = i;
@@ -37,7 +37,7 @@ export function generateArrays (resolutions, matrixIds, length, size) {
  * @throws {Error} on unexpected return
  * @returns {promise} promise resolves to parsed WMTS-GetCapabilities object
  */
-export function getWMTSCapabilities (url) {
+function getWMTSCapabilities (url) {
     return fetch(url)
         .then(response => {
             if (response && response.status === 200) {
@@ -55,7 +55,7 @@ export function getWMTSCapabilities (url) {
 * @param {WMTS} tileLayer layer object
 * @returns {void}
 */
-export function createLayerSourceByDefinitions (attrs, tileLayer) {
+function createLayerSourceByDefinitions (attrs, tileLayer) {
     const projection = getProjection(attrs.coordinateSystem),
         extent = projection.getExtent(),
         style = attrs.style,
@@ -108,7 +108,7 @@ export function createLayerSourceByDefinitions (attrs, tileLayer) {
 * @param {WMTS} tileLayer layer object
 * @returns {void}
 */
-export function createLayerSourceByCapabilities (attrs, tileLayer) {
+function createLayerSourceByCapabilities (attrs, tileLayer) {
     const layerIdentifier = attrs.layers,
         url = attrs.capabilitiesUrl,
         matrixSet = attrs.tileMatrixSet,
@@ -169,7 +169,7 @@ export function createLayerSourceByCapabilities (attrs, tileLayer) {
  * @param {object} layerParams - additional layer params
  * @returns {void}
  */
-export function createLayer (rawLayer, layerParams = {}) {
+function createLayer (rawLayer, layerParams = {}) {
     const tileLayer = new TileLayer(Object.assign({
         id: rawLayer.id,
         source: new WMTS({}),
@@ -193,3 +193,12 @@ export function createLayer (rawLayer, layerParams = {}) {
 
     return tileLayer;
 }
+
+export default {
+    createLayer,
+    createLayerSourceByCapabilities,
+    createLayerSourceByDefinitions,
+    getWMTSCapabilities,
+    generateArrays,
+    showErrorMessage
+};

package/src/vectorStyle/createStyle.js

@@ -227,10 +227,22 @@ function createStyle (styleObject, feature, isClustered, wfsImgPathFromConfig) {
         style = Array.isArray(rules) && rules.length > 0 ? rules[0].style : null,
         hasLabelField = style?.labelField,
         geometryStyle = getGeometryStyle(feature, rules, isClustered, wfsImgPathFromConfig),
-        legendInformation = Array.isArray(geometryStyle) ? geometryStyle[0].legendInfos : geometryStyle.legendInfos,
-        styleObjectGeometry = Array.isArray(geometryStyle) ? geometryStyle.map(styleItem => styleItem.getStyle()) : geometryStyle.getStyle();
+        legendInformation = Array.isArray(geometryStyle) ? geometryStyle[0].legendInfos : geometryStyle.legendInfos;
+    let styleObjectGeometry = null;
 
-    if (geometryStyle.length > 1) {
+    if (Array.isArray(geometryStyle)) {
+        styleObjectGeometry = [];
+        geometryStyle.forEach(styleItem => {
+            if (styleItem.getStyle() !== null) {
+                styleObjectGeometry.push(styleItem.getStyle());
+            }
+        });
+    }
+    else {
+        styleObjectGeometry = geometryStyle.getStyle();
+    }
+
+    if (Array.isArray(geometryStyle) && geometryStyle.length > 1) {
         for (const i in geometryStyle) {
             captureLegendFromFeature(styleObject.styleId, geometryStyle[i].legendInfos);
         }
@@ -238,7 +250,6 @@ function createStyle (styleObject, feature, isClustered, wfsImgPathFromConfig) {
     else {
         captureLegendFromFeature(styleObject.styleId, legendInformation);
     }
-
     // label style is optional and depends on some fields
     if (isClustered || hasLabelField) {
         if (Array.isArray(styleObjectGeometry)) {

package/test/layer/wmts.test.js

@@ -1,7 +1,7 @@
 import {get as getProjection} from "ol/proj";
 import {getWidth} from "ol/extent";
 
-import * as wmts from "../../src/layer/wmts";
+import wmts from "../../src/layer/wmts";
 
 describe("wmts.js", function () {
     describe("generateArrays", function () {

package/test/vectorStyle/createStyle.test.js

@@ -239,6 +239,129 @@ describe("createStyle", () => {
 
         expect(style).toBeInstanceOf(Style);
     });
+
+    it("should return the correct style for a feature with geometry of type MultiLineString ", () => {
+        const stylingRules = [{
+                "conditions": {
+                    "sequence": [0, 0]
+                },
+                "style": {
+                    "lineStrokeColor": [0, 41, 255, 1],
+                    "lineStrokeDash": [10, 2000],
+                    "lineStrokeDashOffset": 0,
+                    "lineStrokeWidth": 4
+                }
+            }],
+            styleObject = {styleId: "styleId", styleMultiGeomOnlyWithRule: true, rules: stylingRules},
+            isClustered = false,
+            multiLineStringFeature = jsonObjects[4],
+            style = createStyle.createStyle(styleObject, multiLineStringFeature, isClustered, wfsImgPathFromConfig);
+
+        expect(style === null).toBe(false);
+        expect(style).toBeInstanceOf(Array);
+        style.forEach(aStyle => {
+            expect(aStyle).toBeInstanceOf(Style);
+        });
+    });
+
+    it("should return the correct style for a feature with geometry of type MultiPolygon ", () => {
+        const stylingRules = [{
+                "conditions": {
+                    "sequence": [0, 0]
+                },
+                "style": {
+                    "polygonStrokeColor": [
+                        161,
+                        113,
+                        14,
+                        1
+                    ],
+                    "polygonStrokeWidth": 0.2,
+                    "polygonFillColor": [
+                        161,
+                        113,
+                        14,
+                        1
+                    ]
+                }
+            }],
+            styleObject = {styleId: "styleId", styleMultiGeomOnlyWithRule: true, rules: stylingRules},
+            isClustered = false,
+            multiPolygonFeature = jsonObjects[5],
+            style = createStyle.createStyle(styleObject, multiPolygonFeature, isClustered, wfsImgPathFromConfig);
+
+        expect(style === null).toBe(false);
+        expect(style).toBeInstanceOf(Array);
+        style.forEach(aStyle => {
+            expect(aStyle).toBeInstanceOf(Style);
+        });
+    });
+
+    it("should return the correct style for a feature with geometry of type GeometryCollection ", () => {
+        const stylingRules = [{
+                "conditions": {
+                    "sequence": [0, 0]
+                },
+                "style": {
+                    "polygonStrokeColor": [
+                        161,
+                        113,
+                        14,
+                        1
+                    ],
+                    "polygonStrokeWidth": 0.2,
+                    "polygonFillColor": [
+                        161,
+                        113,
+                        14,
+                        1
+                    ]
+                }
+            }],
+            styleObject = {styleId: "styleId", styleMultiGeomOnlyWithRule: true, rules: stylingRules},
+            isClustered = false,
+            geometryCollectionFeature = jsonObjects[6],
+            style = createStyle.createStyle(styleObject, geometryCollectionFeature, isClustered, wfsImgPathFromConfig);
+
+        expect(style === null).toBe(false);
+        expect(style).toBeInstanceOf(Array);
+        style.forEach(aStyle => {
+            expect(aStyle).toBeInstanceOf(Style);
+        });
+    });
+
+    it("should return the correct style for a feature with geometry of type MultiPoint ", () => {
+        const stylingRules = [{
+                "conditions": {
+                    "sequence": [0, 0]
+                },
+                "style": {
+                    "circleRadius": 6,
+                    "circleStrokeColor": [
+                        24,
+                        116,
+                        205,
+                        1
+                    ],
+                    "circleFillColor": [
+                        135,
+                        206,
+                        250,
+                        1
+                    ]
+                }
+            }],
+            styleObject = {styleId: "styleId", styleMultiGeomOnlyWithRule: true, rules: stylingRules},
+            isClustered = false,
+            multiPointFeature = jsonObjects[3],
+            style = createStyle.createStyle(styleObject, multiPointFeature, isClustered, wfsImgPathFromConfig);
+
+        expect(style === null).toBe(false);
+        expect(style).toBeInstanceOf(Array);
+        style.forEach(aStyle => {
+            expect(aStyle).toBeInstanceOf(Style);
+        });
+    });
 });
 
 describe("getSimpleGeometryStyle", function () {