@masterportal/masterportalapi 2.15.0 → 2.15.1

package/CHANGELOG.md

@@ -3,6 +3,13 @@
 
  The [Semantic Versioning](https://semver.org/spec/v2.0.0.html) is used.
 
+## 2.15.1 - 2023-03-09
+### Fixed
+- The `labelField` attribute is now evaluated correctly for a text style.
+- The styling for clustered features works now.
+
+---
+
 ## 2.15.0 - 2023-02-28
 ### Added
 - WebGL Render-Pipeline for all VectorLayer types can be called using {"renderer": "webgl"} in config.json

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@masterportal/masterportalapi",
   "author": "Implementierungspartnerschaft Masterportal <info@masterportal.org> (https://www.masterportal.org)",
-  "version": "2.15.0",
+  "version": "2.15.1",
   "license": "MIT",
   "description": "Basic functions of the Masterportal as api",
   "repository": {

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

@@ -46,8 +46,12 @@ class PointStyle extends StyleClass {
      * @returns {ol/style} - The created style.
      */
     getStyle () {
-        const type = this.attributes.type.toLowerCase(),
-            isClustered = this.isClustered;
+        const isClustered = this.isClustered;
+        let type = this.attributes.type.toLowerCase();
+
+        if (isClustered && this.feature.get("features")?.length > 1) {
+            type = this.attributes.clusterType.toLowerCase();
+        }
 
         if (type === "icon") {
             return createIconStyle(this.attributes, this.feature, isClustered);

package/src/vectorStyle/styles/styleText.js

@@ -38,7 +38,7 @@ class TextStyle extends StyleClass {
     getStyle () {
         const isClustered = this.isClustered,
             feature = this.feature,
-            labelField = this.labelField;
+            labelField = this.attributes.labelField;
 
         if (isClustered && feature.get("features")?.length > 1 && this.attributes.clusterTextType !== "none") {
             return this.createClusteredTextStyle();

package/test/vectorStyle/styles/point/stylePoint.test.js

@@ -1,19 +1,26 @@
 import PointStyle from "../../../../src/vectorStyle/styles/point/stylePoint";
-import {Style} from "ol/style.js";
+import {Circle as CircleStyle, Style} from "ol/style.js";
 
 describe("stylePoint", () => {
-    const feature = {
+    let feature,
+        isClustered,
+        style,
+        stylePointClass;
+
+    beforeEach(() => {
+        feature = {
             geometryName: "geom",
             id: "DE.HH.UP_GESUNDHEIT_KRANKENHAEUSER_2"
-        },
+        };
         style = {
             type: "icon",
             clusterType: "icon",
             legendValue: "Krankenhaus",
             imageName: "krankenhaus.png"
-        },
-        isClustered = false,
+        };
+        isClustered = false;
         stylePointClass = new PointStyle(feature, style, isClustered);
+    });
 
     describe("setSize", function () {
         it("defines setSize()", () => {
@@ -24,5 +31,18 @@ describe("stylePoint", () => {
         it("returns an instance of openlayers style", () => {
             expect(stylePointClass.getStyle()).toBeInstanceOf(Style);
         });
+        it("returns an instance of openlayers circleStyle", () => {
+            isClustered = true;
+            style = {
+                type: "icon",
+                clusterType: "circle",
+                legendValue: "Krankenhaus",
+                imageName: "krankenhaus.png"
+            };
+
+            expect(stylePointClass.getStyle()).toBeInstanceOf(Style);
+            expect(stylePointClass.getStyle().getImage()).toBeInstanceOf(CircleStyle);
+        });
     });
+
 });

package/test/vectorStyle/styles/styleText.test.js

@@ -16,7 +16,8 @@ describe("styleText", () => {
             type: "icon",
             clusterType: "icon",
             legendValue: "Krankenhaus",
-            imageName: "krankenhaus.png"
+            imageName: "krankenhaus.png",
+            labelField: ""
         },
         isClustered = false,
         styleTextClass = new TextStyle(feature, style, isClustered);