@masterportal/masterportalapi 2.28.0 → 2.30.0

package/CHANGELOG.md

@@ -3,16 +3,53 @@
 
  The [Semantic Versioning](https://semver.org/spec/v2.0.0.html) is used.
 
-### Unreleased - in development
-## Added
-
+### 2.30.0 - 2023-11-28
 ## Changed
+- WMS-Layer and WMTS-Layer: create Layer no longer evaluates the minScale and maxScale attributes, but instead minResolution and maxResolution can be transferred.
+
+## Fixed
+- Issue Masterportal #1052 VectorStyle: fixed blinking of initial loaded features on great amount of features with a lot of conditional styles.
+- Issue Masterportal #1088: gfiAttibutes with type=html are not displayed if there is no value in the data.
+- Issue Masterportal #1091: VectorStyle: read geometry type from geoserver featureTypeRequest
+---
 
-## Deprecated
+### 2.29.0 - 2023-10-27
+## Added
+- The following packages from parcel automatic were installed for node builtin:
+    - dependencies:
+        - assert": 2.1.0,
+        - browserify-zlib: 0.2.0,
+        - https-browserify: 1.0.0
+        - stream-http: 3.2.0
+        - url: 0.11.3
+        - util: 0.12.5
+- The following packages have been added:
+    - dependencies:
+        - ol-mapbox-style: 12.0.0
 
-## Removed
+## Changed
+- The following packages have been updated:
+    - dependencies:
+        - core-js: 3.32.0 to 3.33.1
+        - dayjs: 1.11.9 to 1.11.10
+        - ol: 7.5.2 to 8.1.0 (includes the change of the symbol style format in ol/layer/WebGLPointsLayer)
+        - olcs: 2.15.0 to 2.16.0
+        - proj4: 2.9.0 to 2.9.1
+    - devDependencies:
+        - @babel/core: 7.22.9 to 7.23.2
+        - @babel/plugin-transform-modules-commonjs: 7.22.5 to 7.23.2
+        - @parcel/transformer-sass: 2.9.3 to 2.10.0
+        - @swc/jest: 0.2.27 to 0.2.29
+        - eslint: 8.46.0 to 8.52.0
+        - jest: 29.6.2 to 29.7.0
+        - jest-environment-jsdom: 29.6.2 to 29.7.0
+        - parcel: 2.9.3 to 2.10.0
+        - sass: 1.64.2 to 1.69.4
+- Revert Cesium.Cesium3DTileset.fromUrl(url, options) adaptions in tileset.js for Cesium v1.107 deprecated warnings
 
 ## Fixed
+- styleList: styles of type oaf are now also added to the stylelist
+- Issue Masterportal #1052 VectorStyle: path to an icon in the map or in the legend in style.json may be an icon name, a relative path to icon, a complete url or an svg.
 
 ---
 

package/example/config/portal.json

@@ -56,30 +56,11 @@
       "renderer": "webgl",
       "hitTolerance": 20,
       "isPointLayer": true,
-      "style": {
-          "symbol": {
-              "symbolType": "circle",
-              "size": [
-                  "interpolate",
-                  ["linear"],
-                  ["get", "Total_votes"],
-                  0,
-                  6,
-                  18,
-                  24
-              ],
-              "color": [
-                  "interpolate",
-                  ["linear"],
-                  ["get", "compound"],
-                  -1,
-                  [240, 40, 30],
-                  1,
-                  [0, 200, 60]
-              ],
-              "opacity": 0.8,
-              "rotateWithView": true
-          }
+      "style":{
+          "circle-radius": [ "interpolate", ["linear"], ["get", "Total_votes"],  0, 3, 18, 12 ],
+          "circle-fill-color": [ "interpolate", ["linear"], ["get", "compound"], -1, [240, 40, 30], 1, [0, 200, 60] ],
+          "circle-rotate-with-view": true,
+          "circle-opacity": 0.8
       }
     }
   ],

package/example/config/services.json

@@ -32,7 +32,7 @@
     "id": "2001",
     "typ": "GeoJSON",
     "name": "Landesgrenze Hamburg",
-    "url": "https://geoportal-hamburg.de/lgv-config/landesgrenze_hh.json"
+    "url": "https://geodienste.hamburg.de/lgv-config/landesgrenze_hh.json"
   },
   {
     "id": "3001",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@masterportal/masterportalapi",
   "author": "Implementierungspartnerschaft Masterportal <info@masterportal.org> (https://www.masterportal.org)",
-  "version": "2.28.0",
+  "version": "2.30.0",
   "license": "MIT",
   "description": "Basic functions of the Masterportal as api",
   "repository": {
@@ -19,34 +19,41 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "core-js": "^3.32.0",
-    "dayjs": "^1.11.9",
-    "ol": "7.5.2",
-    "olcs": "2.15.0",
-    "proj4": "^2.9.0",
+    "core-js": "^3.33.1",
+    "dayjs": "^1.11.10",
+    "ol": "8.1.0",
+    "ol-mapbox-style": "12.0.0",
+    "olcs": "2.16.0",
+    "proj4": "^2.9.1",
     "xml2js": "^0.6.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.9",
-    "@babel/plugin-transform-modules-commonjs": "^7.22.5",
-    "@parcel/transformer-sass": "^2.9.3",
-    "@swc/jest": "^0.2.27",
+    "@babel/core": "^7.23.2",
+    "@babel/plugin-transform-modules-commonjs": "^7.23.0",
+    "@parcel/transformer-sass": "^2.10.0",
+    "@swc/jest": "^0.2.29",
+    "assert": "^2.1.0",
+    "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "canvas": "^2.11.2",
-    "eslint": "^8.46.0",
+    "eslint": "^8.52.0",
     "events": "^3.3.0",
+    "https-browserify": "^1.0.0",
     "husky": "^8.0.3",
-    "jest": "^29.6.2",
+    "jest": "^29.7.0",
     "jest-canvas-mock": "^2.5.2",
-    "jest-environment-jsdom": "^29.6.2",
+    "jest-environment-jsdom": "^29.7.0",
     "jest-fetch-mock": "^3.0.3",
     "jsdoc": "^4.0.2",
-    "parcel": "^2.9.3",
+    "parcel": "^2.10.0",
     "process": "^0.11.10",
-    "sass": "^1.64.2",
+    "sass": "^1.69.4",
     "stream-browserify": "^3.0.0",
+    "stream-http": "^3.2.0",
     "timers-browserify": "^2.0.12",
-    "use-resize-observer": "^9.1.0"
+    "url": "^0.11.3",
+    "use-resize-observer": "^9.1.0",
+    "util": "^0.12.5"
   },
   "peerDependencies": {
     "@cesium/engine": "^2.4.1"

package/src/layer/tileset.js

@@ -39,7 +39,6 @@ export default function Tileset (rawLayer) {
                 tileset.layerReferenceId = rawLayer.id;
             }
         });
-
     }
 }
 

package/src/layer/wms.js

@@ -74,6 +74,13 @@ export function makeParams (rawLayer) {
     return params;
 }
 
+async function defaultTileLoadFunction (imageTile, src) {
+    const response = await fetch(src),
+        data = await response.blob();
+
+    imageTile.getImage().src = URL.createObjectURL(data);
+}
+
 /**
  * Creates an ol/source element for the rawLayer.
  * @param {object} rawLayer - layer specification as in services.json
@@ -118,7 +125,8 @@ export function createLayerSource (rawLayer, options) {
         tileGrid: tileGrid,
         projection: projection,
         attributions: rawLayer.olAttribution,
-        crossOrigin: rawLayer.crossOrigin
+        crossOrigin: rawLayer.crossOrigin,
+        tileLoadFunction: defaultTileLoadFunction
     });
 }
 
@@ -127,8 +135,8 @@ export function createLayerSource (rawLayer, options) {
  * @param {object} rawLayer - layer specification as in services.json
  * @param {string} [rawLayer.id] - optional id of the layer, passed to help identification in services.json
  * @param {string} [rawLayer.url] - WMS service URL
- * @param {string} [rawLayer.minScale] - optional the minimal resolution
- * @param {string} [rawLayer.maxScale] - optional the maximal resolution
+ * @param {string} [rawLayer.minResolution] - optional the minimal resolution
+ * @param {string} [rawLayer.maxResolution] - optional the maximal resolution
  * @param {string} [rawLayer.serverType] - optional servertype definition: "geoserver" or "mapserver" or "qgis"
  * @param {string} [rawLayer.gutter] - optional the size in pixels of the gutter around image tiles to ignore
  * @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
@@ -148,8 +156,8 @@ export function createLayer (rawLayer, layerParams = {}, options) {
 
     return new Layer(Object.assign({
         source,
-        minResolution: rawLayer.minScale,
-        maxResolution: rawLayer.maxScale,
+        minResolution: typeof rawLayer.minResolution === "string" ? parseFloat(rawLayer.minResolution) : rawLayer.minResolution,
+        maxResolution: typeof rawLayer.maxResolution === "string" ? parseFloat(rawLayer.maxResolution) : rawLayer.maxResolution,
         id: rawLayer.id
     }, layerParams));
 }

package/src/layer/wmts.js

@@ -176,8 +176,8 @@ function createLayer (rawLayer, layerParams = {}) {
         id: rawLayer.id,
         source: new WMTS({}),
         name: rawLayer.name,
-        minResolution: rawLayer.minScale,
-        maxResolution: rawLayer.maxScale,
+        minResolution: typeof rawLayer.minResolution === "string" ? parseFloat(rawLayer.minResolution) : rawLayer.minResolution,
+        maxResolution: typeof rawLayer.maxResolution === "string" ? parseFloat(rawLayer.maxResolution) : rawLayer.maxResolution,
         supported: ["2D", "3D"],
         showSettings: true,
         extent: null,

package/src/lib/attributeMapper.js

@@ -198,29 +198,27 @@ function prepareValueFromObject (key, mappingObj, properties) {
             break;
         }
         case "html": {
-            // create tag
-            if (mappingObj?.html?.tag) {
-                htmltag = document.createElement(mappingObj?.html?.tag);
-            }
-            // create innerHTML
-            if (mappingObj?.html?.innerHTML === "%value%") {
-                htmltag.innerHTML = preparedValue;
-            }
-            else if (mappingObj?.html?.innerHTML) {
-                htmltag.innerHTML = mappingObj?.html?.innerHTML;
-            }
-
-
-            if (htmltag) {
-                if (mappingObj?.html?.properties) {
-                    htmltag = addPropertiesToHtmlTag(htmltag, mappingObj?.html?.properties, preparedValue);
+            if (preparedValue !== undefined) {
+                // create tag
+                if (mappingObj?.html?.tag) {
+                    htmltag = document.createElement(mappingObj?.html?.tag);
+                }
+                // create innerHTML
+                if (mappingObj?.html?.innerHTML === "%value%") {
+                    htmltag.innerHTML = preparedValue;
+                }
+                else if (mappingObj?.html?.innerHTML) {
+                    htmltag.innerHTML = mappingObj?.html?.innerHTML;
+                }
+                if (htmltag) {
+                    if (mappingObj?.html?.properties) {
+                        htmltag = addPropertiesToHtmlTag(htmltag, mappingObj?.html?.properties, preparedValue);
+                    }
+                    preparedValue = serializer.serializeToString(htmltag);
+                    // remove xmlns
+                    preparedValue = preparedValue.replace(/ xmlns="(.*?)"/g, "");
                 }
-                preparedValue = serializer.serializeToString(htmltag);
-                // remove xmlns
-                preparedValue = preparedValue.replace(/ xmlns="(.*?)"/g, "");
-
             }
-
             break;
         }
         // default equals to mappingObj.type === "string"

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

@@ -6,8 +6,8 @@ import {getUid} from "olcs/util.js";
 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.ts";
-import {extentToRectangle, tileLayerToImageryLayer, updateCesiumLayerProperties} from "olcs/core.ts";
+import olcsAbstractSynchronizer from "olcs/AbstractSynchronizer.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";

package/src/maps/olcs/olcsMap.js

@@ -1,6 +1,6 @@
-import OLCesium from "olcs/OLCesium.ts";
+import OLCesium from "olcs/OLCesium.js";
 import {transform, get} from "ol/proj.js";
-import VectorSynchronizer from "olcs/VectorSynchronizer.ts";
+import VectorSynchronizer from "olcs/VectorSynchronizer.js";
 
 import FixedOverlaySynchronizer from "./3dUtils/fixedOverlaySynchronizer.js";
 import WMSRasterSynchronizer from "./3dUtils/wmsRasterSynchronizer.js";

package/src/renderer/webgl.js

@@ -15,14 +15,11 @@ import {packColor, parseLiteralStyle} from "ol/webgl/styleparser.js";
  * @private
  */
 const defaultPointStyle = {
-        symbol: {
-            symbolType: "circle",
-            size: 20,
-            color: "#006688",
-            rotateWithView: false,
-            offset: [0, 0],
-            opacity: 0.6
-        }
+        "circle-radius": 10,
+        "circle-fill-color": "#006688",
+        "circle-rotate-with-view": false,
+        "circle-displacement": [0, 0],
+        "circle-opacity": 0.6
     },
 
     defaultPolygonStyle = {
@@ -33,14 +30,13 @@ const defaultPointStyle = {
     },
 
     /** @type {import('ol/style/literal.js').LiteralStyle} */
-    style = {
+    style = Object.assign({
         "stroke-color": ["get", "strokeColor"],
         "stroke-width": ["get", "strokeWidth", "number"],
         "fill-color": ["get", "fillColor"],
         "opacity": ["get", "opacity", "number"],
-        "size": ["get", "circleSize", "number"],
-        symbol: defaultPointStyle.symbol
-    };
+        "size": ["get", "circleSize", "number"]
+    }, defaultPointStyle);
 
 /**
  *  Creates a vector layer with custom renderer.
@@ -194,14 +190,14 @@ export function formatFeatureStyles (feature, styleObject) {
         feature.set("strokeColor", strokeColor || defaultPolygonStyle.strokeColor);
         feature.set("strokeWidth", strokeWidth || defaultPolygonStyle.strokeWidth);
         feature.set("opacity", fillColor ? (rule.style.polygonFillColor || rule.style.circleFillColor)[3] : defaultPolygonStyle.opacity);
-        feature.set("circleSize", size || defaultPointStyle.symbol.size);
+        feature.set("circleSize", size || defaultPointStyle["circle-radius"] * 2);
     }
     else {
         feature.set("fillColor", defaultPolygonStyle.fillColor);
         feature.set("strokeColor", defaultPolygonStyle.strokeColor);
         feature.set("strokeWidth", defaultPolygonStyle.strokeWidth);
         feature.set("opacity", defaultPolygonStyle.opacity);
-        feature.set("circleSize", defaultPointStyle.symbol.size);
+        feature.set("circleSize", defaultPointStyle["circle-radius"] * 2);
     }
 }
 

package/src/vectorStyle/createStyle.js

@@ -216,7 +216,7 @@ function captureLegendFromFeature (styleId, legendInformation) {
 }
 
 /**
-     * Function is called from layer models for each feature.
+     * Creates the style for the feature regarding the styleObject and sets style at feature.
      * @param   {String}  styleObject     id of the style
      * @param   {ol/feature}  feature     the feature to style
      * @param   {Boolean} isClustered is feature clustered
@@ -261,6 +261,7 @@ function createStyle (styleObject, feature, isClustered, wfsImgPathFromConfig) {
             styleObjectGeometry.setText(getLabelStyle(feature, style, isClustered));
         }
     }
+    feature.setStyle(styleObjectGeometry);
     return styleObjectGeometry;
 }
 

package/src/vectorStyle/lib/getGeometryTypeFromService.js

@@ -1,5 +1,15 @@
 import {createLegendInfo} from "./createLegendInfo";
 
+/**
+ * Returns true, if sibling element's tag name end with 'complexType' and its name contains the featureType.
+ * @param {String} sibling XML-Element to inspect
+ * @param {String } featureType  wfs feature type from layer without namespace
+ * @returns {boolean} true, if sibling element's tag name end with 'complexType' and its name contains the featureType
+ */
+function siblingContainsFeatureType (sibling, featureType) {
+    return sibling && sibling.tagName.endsWith("complexType") && sibling.hasAttribute("name") && sibling.getAttribute("name").includes(featureType);
+}
+
 /**
  * Parses the xml with another structure to get the subelements from the layer
  * @param   {string} xml response xml
@@ -12,11 +22,18 @@ function getSubelementsFromXMLOtherStructure (xml, featureType) {
 
     elements.forEach(element => {
         if (element.getAttribute("name") === featureType) {
-            const sibling = element.nextElementSibling;
+            let sibling = element.nextElementSibling;
 
-            if (sibling && sibling.tagName.endsWith("complexType") && sibling.hasAttribute("name")) {
+            if (siblingContainsFeatureType(sibling, featureType)) {
                 subElements = Array.from(sibling.getElementsByTagNameNS("*", "element"));
             }
+            else if (element.previousElementSibling) {
+                sibling = element.previousElementSibling;
+
+                if (siblingContainsFeatureType(sibling, featureType)) {
+                    subElements = Array.from(sibling.getElementsByTagNameNS("*", "element"));
+                }
+            }
         }
     });
     return subElements;
@@ -160,5 +177,7 @@ function getGeometryTypeFromOAF (rules, oafURL, collection, wfsImgPath, callback
 
 export default {
     getGeometryTypeFromWFS,
-    getGeometryTypeFromOAF
+    getGeometryTypeFromOAF,
+    getSubelementsFromXML,
+    getTypeAttributesFromSubelements
 };

package/src/vectorStyle/styleList.js

@@ -30,7 +30,7 @@ function getStyleIdsFromLayers () {
 
     if (configuredLayers) {
         configuredLayers.forEach(layer => {
-            if (layer.typ === "WFS" || layer.typ === "GeoJSON" || layer.typ === "SensorThings" || layer.typ === "TileSet3D") {
+            if (layer.typ === "WFS" || layer.typ === "GeoJSON" || layer.typ === "SensorThings" || layer.typ === "TileSet3D" || layer.typ === "OAF") {
                 if (layer?.styleId) {
                     styleIds.push(layer.styleId);
                 }

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

@@ -1,6 +1,5 @@
 import {Style, Icon} from "ol/style.js";
 import {prepareValue, isObjectPath} from "../../../lib/attributeMapper";
-import PointStyle from "./stylePoint";
 
 /**
 * Returns the rotation value and its corresponding value according to style.json.
@@ -33,21 +32,23 @@ export function getRotationValue (rotation, featureValues) {
 */
 export function createIconStyle (attributes, feature, isClustered) {
     const showCluster = isClustered && feature.get("features")?.length > 1,
-
-        height = showCluster ? attributes.clusterImageHeight : attributes.imageHeight,
         imageName = showCluster ? attributes.clusterImageName : attributes.imageName,
         imageOffsetX = showCluster ? attributes.clusterImageOffsetY : attributes.imageOffsetX,
         imageOffsetY = showCluster ? attributes.clusterImageOffsetX : attributes.imageOffsetY,
         scale = showCluster ? attributes.clusterImageScale : attributes.imageScale,
-        src = imageName.indexOf("/") === -1 ? attributes.imagePath + imageName : imageName,
-        width = showCluster ? attributes.clusterImageWidth : attributes.imageWidth,
-        iconOptions = {
-            crossOrigin: "anonymous",
-            src: src.startsWith("<svg") ? "data:image/svg+xml;charset=utf-8," + encodeURIComponent(src) : src,
-            scale,
-            anchor: [parseFloat(imageOffsetX), parseFloat(imageOffsetY)],
-            imgSize: src.indexOf(".svg") > -1 ? [width, height] : ""
-        };
+        wfsImgPath = attributes.imagePath;
+    let iconOptions = {},
+        src = imageName;
+
+    if (!imageName.startsWith("https:") && !imageName.startsWith("<svg")) {
+        src = wfsImgPath + imageName;
+    }
+    iconOptions = {
+        crossOrigin: "anonymous",
+        src: src.startsWith("<svg") ? "data:image/svg+xml;charset=utf-8," + encodeURIComponent(src) : src,
+        scale,
+        anchor: [parseFloat(imageOffsetX), parseFloat(imageOffsetY)]
+    };
 
     if (!showCluster) {
         iconOptions.anchorXUnits = attributes.imageOffsetXUnit;
@@ -67,13 +68,10 @@ export function createIconStyle (attributes, feature, isClustered) {
  * @return {ol.Style} style
  */
 export function createSVGStyle (svgPath) {
-    const size = PointStyle.prototype.getSize();
-
     return new Style({
         image: new Icon({
             crossOrigin: "anonymous",
-            src: "data:image/svg+xml;charset=utf-8," + encodeURIComponent(svgPath),
-            imgSize: [size, size]
+            src: "data:image/svg+xml;charset=utf-8," + encodeURIComponent(svgPath)
         })
     });
 }

package/test/lib/attributeMapper.test.js

@@ -303,14 +303,13 @@ describe("src/utils/attributeMapper.js", () => {
                 url: "<a href=\"http://random.url.de\"></a>"
             });
         });
-        it("should map object with mapping object and type:html and tag a", () => {
+        it("should NOT map object with mapping object and type:html and tag a - value not defined", () => {
             const mappingObj = {
                 random_url: {
                     name: "url",
                     type: "html",
                     html: {
                         tag: "a",
-                        innerHTML: "%value%",
                         properties: {
                             href: "%value%"
                         }
@@ -319,9 +318,28 @@ describe("src/utils/attributeMapper.js", () => {
             };
 
             expect(mapAttributes(props, mappingObj)).toEqual({
-                url: "<a href=\"http://random.url.de\">http://random.url.de</a>"
+                url: "<a href=\"http://random.url.de\"></a>"
             });
         });
+        it("should map object with mapping object and type:html and tag a", () => {
+            const mappingObj = {
+                    random_url: {
+                        name: "url",
+                        type: "html",
+                        html: {
+                            tag: "a",
+                            innerHTML: "%value%",
+                            properties: {
+                                href: "%value%"
+                            }
+                        }
+                    }
+                },
+                properties = Object.assign({}, props);
+
+            properties.random_url = undefined;
+            expect(mapAttributes(properties, mappingObj)).toEqual({});
+        });
         it("should map object with mapping object and type:html and tag a without innerHTML and properties", () => {
             const mappingObj = {
                 random_url: {

package/test/vectorStyle/createStyle.test.js

@@ -238,6 +238,7 @@ describe("createStyle", () => {
             style = createStyle.createStyle(styleObject, jsonObjects[0], isClustered, wfsImgPathFromConfig);
 
         expect(style).toBeInstanceOf(Style);
+        expect(jsonObjects[0].getStyle()).toEqual(style);
     });
 
     it("should return the correct style for a feature with geometry of type MultiLineString ", () => {
@@ -262,6 +263,7 @@ describe("createStyle", () => {
         style.forEach(aStyle => {
             expect(aStyle).toBeInstanceOf(Style);
         });
+        expect(multiLineStringFeature.getStyle()).toEqual(style);
     });
 
     it("should return the correct style for a feature with geometry of type MultiPolygon ", () => {
@@ -295,6 +297,7 @@ describe("createStyle", () => {
         style.forEach(aStyle => {
             expect(aStyle).toBeInstanceOf(Style);
         });
+        expect(multiPolygonFeature.getStyle()).toEqual(style);
     });
 
     it("should return the correct style for a feature with geometry of type GeometryCollection ", () => {
@@ -328,6 +331,7 @@ describe("createStyle", () => {
         style.forEach(aStyle => {
             expect(aStyle).toBeInstanceOf(Style);
         });
+        expect(geometryCollectionFeature.getStyle()).toEqual(style);
     });
 
     it("should return the correct style for a feature with geometry of type MultiPoint ", () => {
@@ -361,6 +365,7 @@ describe("createStyle", () => {
         style.forEach(aStyle => {
             expect(aStyle).toBeInstanceOf(Style);
         });
+        expect(multiPointFeature.getStyle()).toEqual(style);
     });
 });
 

package/test/vectorStyle/lib/getGeometryTypeFromService.test.js

@@ -0,0 +1,141 @@
+import getGeometryTypeFromService from "../../../src/vectorStyle/lib/getGeometryTypeFromService";
+const fs = require("fs");
+/* eslint-disable no-sync */
+
+describe("getGeometryTypeFromService", function () {
+    describe("getSubelementsFromXML and getTypeAttributesFromSubelements", function () {
+        it("desribeFeatureType response opengis schema contains Point", function () {
+            let attributes = null;
+            const data = fs.readFileSync("test/vectorStyle/lib/resources/describeFeatureType_opengis_point.xml", "utf8"),
+                featureType = "bike_und_ride",
+                xml = new window.DOMParser().parseFromString(data, "text/xml"),
+                subElements = getGeometryTypeFromService.getSubelementsFromXML(xml, featureType);
+
+            expect(subElements.length).toEqual(11);
+
+            attributes = getGeometryTypeFromService.getTypeAttributesFromSubelements(subElements);
+            expect(attributes.length).toEqual(1);
+            expect(attributes[0]).toEqual("Point");
+        });
+
+        it("desribeFeatureType response opengis schema contains 'Geometry'", function () {
+            let attributes = null;
+            const data = fs.readFileSync("test/vectorStyle/lib/resources/describeFeatureType_opengis_geometry.xml", "utf8"),
+                featureType = "hamburgconvention",
+                xml = new window.DOMParser().parseFromString(data, "text/xml"),
+                subElements = getGeometryTypeFromService.getSubelementsFromXML(xml, featureType);
+
+            expect(subElements.length).toEqual(56);
+
+            attributes = getGeometryTypeFromService.getTypeAttributesFromSubelements(subElements);
+            expect(attributes.length).toEqual(3);
+            expect(attributes[0]).toEqual("Point");
+            expect(attributes[1]).toEqual("Polygon");
+            expect(attributes[2]).toEqual("LineString");
+        });
+
+        it("desribeFeatureType response opengis schema with namespace contains 'Geometry'", function () {
+            let attributes = null;
+            const data = fs.readFileSync("test/vectorStyle/lib/resources/describeFeatureType_xsd_opengis_geometry.xml", "utf8"),
+                featureType = "s_parkraumbewirt",
+                xml = new window.DOMParser().parseFromString(data, "text/xml"),
+                subElements = getGeometryTypeFromService.getSubelementsFromXML(xml, featureType);
+
+            expect(subElements.length).toEqual(6);
+
+            attributes = getGeometryTypeFromService.getTypeAttributesFromSubelements(subElements);
+            expect(attributes.length).toEqual(3);
+            expect(attributes[0]).toEqual("Point");
+            expect(attributes[1]).toEqual("Polygon");
+            expect(attributes[2]).toEqual("LineString");
+        });
+
+        it("desribeFeatureType response opengis schema with namespace contains 'Geometry' use styleGeometryType", function () {
+            let attributes = null;
+            const data = fs.readFileSync("test/vectorStyle/lib/resources/describeFeatureType_xsd_opengis_geometry.xml", "utf8"),
+                featureType = "s_parkraumbewirt",
+                styleGeometryType = "Point",
+                xml = new window.DOMParser().parseFromString(data, "text/xml"),
+                subElements = getGeometryTypeFromService.getSubelementsFromXML(xml, featureType);
+
+            expect(subElements.length).toEqual(6);
+
+            attributes = getGeometryTypeFromService.getTypeAttributesFromSubelements(subElements, styleGeometryType);
+            expect(attributes.length).toEqual(1);
+            expect(attributes[0]).toEqual("Point");
+        });
+
+        it("desribeFeatureType response opengis schema contains 'MultiPolygon'", function () {
+            let attributes = null;
+            const data = fs.readFileSync("test/vectorStyle/lib/resources/describeFeatureType_opengis_multi.xml", "utf8"),
+                featureType = "umring",
+                xml = new window.DOMParser().parseFromString(data, "text/xml"),
+                subElements = getGeometryTypeFromService.getSubelementsFromXML(xml, featureType);
+
+            expect(subElements.length).toEqual(1);
+
+            attributes = getGeometryTypeFromService.getTypeAttributesFromSubelements(subElements);
+            expect(attributes.length).toEqual(1);
+            expect(attributes[0]).toEqual("MultiPolygon");
+        });
+
+        it("desribeFeatureType response opengis schema contains 'MultiLineString'", function () {
+            let attributes = null;
+            const data = fs.readFileSync("test/vectorStyle/lib/resources/describeFeatureType_opengis_multi.xml", "utf8"),
+                featureType = "strecken",
+                xml = new window.DOMParser().parseFromString(data, "text/xml"),
+                subElements = getGeometryTypeFromService.getSubelementsFromXML(xml, featureType);
+
+            expect(subElements.length).toEqual(3);
+
+            attributes = getGeometryTypeFromService.getTypeAttributesFromSubelements(subElements);
+            expect(attributes.length).toEqual(1);
+            expect(attributes[0]).toEqual("MultiLineString");
+        });
+
+        it("desribeFeatureType response opengis schema contains 'Polygon'", function () {
+            let attributes = null;
+            const data = fs.readFileSync("test/vectorStyle/lib/resources/describeFeatureType_opengis_polygon.xml", "utf8"),
+                featureType = "nr_f_biosphaerenreservat",
+                xml = new window.DOMParser().parseFromString(data, "text/xml"),
+                subElements = getGeometryTypeFromService.getSubelementsFromXML(xml, featureType);
+
+            expect(subElements.length).toEqual(9);
+
+            attributes = getGeometryTypeFromService.getTypeAttributesFromSubelements(subElements);
+            expect(attributes.length).toEqual(1);
+            expect(attributes[0]).toEqual("Polygon");
+        });
+
+        it("desribeFeatureType response geoserver schema contains 'Point'", function () {
+            let attributes = null;
+            const data = fs.readFileSync("test/vectorStyle/lib/resources/describeFeatureType_geoserver.xml", "utf8"),
+                featureType = "nextbike_floating_berlin",
+                xml = new window.DOMParser().parseFromString(data, "text/xml"),
+                subElements = getGeometryTypeFromService.getSubelementsFromXML(xml, featureType);
+
+            expect(subElements.length).toEqual(4);
+
+            attributes = getGeometryTypeFromService.getTypeAttributesFromSubelements(subElements);
+            expect(attributes.length).toEqual(1);
+            expect(attributes[0]).toEqual("Point");
+        });
+
+        it("desribeFeatureType response geoserver schema contains 'Point', nextbike_stations_berlin", function () {
+            let attributes = null;
+            const data = fs.readFileSync("test/vectorStyle/lib/resources/describeFeatureType_geoserver.xml", "utf8"),
+                featureType = "nextbike_stations_berlin",
+                xml = new window.DOMParser().parseFromString(data, "text/xml"),
+                subElements = getGeometryTypeFromService.getSubelementsFromXML(xml, featureType);
+
+            expect(subElements.length).toEqual(8);
+
+            attributes = getGeometryTypeFromService.getTypeAttributesFromSubelements(subElements);
+            expect(attributes.length).toEqual(1);
+            expect(attributes[0]).toEqual("Point");
+        });
+    });
+
+});
+
+

package/test/vectorStyle/lib/resources/describeFeatureType_geoserver.xml

@@ -0,0 +1,102 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" xmlns:mdhwfs="mdhwfs" elementFormDefault="qualified" targetNamespace="mdhwfs">
+  <xsd:import namespace="http://www.opengis.net/gml" schemaLocation="http://api.viz.berlin.de/geoserver/schemas/gml/3.1.1/base/gml.xsd"/>
+  <xsd:complexType name="baustellen_sperrungenType">
+    <xsd:complexContent>
+      <xsd:extension base="gml:AbstractFeatureType">
+        <xsd:sequence>
+          <xsd:element maxOccurs="1" minOccurs="0" name="id" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="tstore" nillable="true" type="xsd:dateTime"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="objectstate" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="subtype" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="severity" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="validity" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="direction" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="icon" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="is_future" nillable="true" type="xsd:boolean"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="street" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="section" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="content" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="wkb_geometry" nillable="true" type="gml:MultiGeometryPropertyType"/>
+        </xsd:sequence>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="baustellen_sperrungen" substitutionGroup="gml:_Feature" type="mdhwfs:baustellen_sperrungenType"/>
+  <xsd:complexType name="nextbike_floating_berlinType">
+    <xsd:complexContent>
+      <xsd:extension base="gml:AbstractFeatureType">
+        <xsd:sequence>
+          <xsd:element maxOccurs="1" minOccurs="0" name="bike_id" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="lat" nillable="true" type="xsd:decimal"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="lon" nillable="true" type="xsd:decimal"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="geom" nillable="true" type="gml:PointPropertyType"/>
+        </xsd:sequence>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="nextbike_floating_berlin" substitutionGroup="gml:_Feature" type="mdhwfs:nextbike_floating_berlinType"/>
+  <xsd:complexType name="nextbike_stations_berlinType">
+    <xsd:complexContent>
+      <xsd:extension base="gml:AbstractFeatureType">
+        <xsd:sequence>
+          <xsd:element maxOccurs="1" minOccurs="0" name="station_name" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="station_id" nillable="true" type="xsd:int"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="short_name" nillable="true" type="xsd:int"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="lat" nillable="true" type="xsd:decimal"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="lon" nillable="true" type="xsd:decimal"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="capacity" nillable="true" type="xsd:int"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="bikes_avaílable" nillable="true" type="xsd:int"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="geom" nillable="true" type="gml:PointPropertyType"/>
+        </xsd:sequence>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="nextbike_stations_berlin" substitutionGroup="gml:_Feature" type="mdhwfs:nextbike_stations_berlinType"/>
+  <xsd:complexType name="parkdatenType">
+    <xsd:complexContent>
+      <xsd:extension base="gml:AbstractFeatureType">
+        <xsd:sequence>
+          <xsd:element maxOccurs="1" minOccurs="0" name="markierung_parkraum" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="beschraenkungen_variieren_ueber_wochentage" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="errechnete_anzahl_parkplaetze" nillable="true" type="xsd:int"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="polygon_id" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="ausrichtung" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="parkort" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="parkgebuehr" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="geltungszeit_der_beschraenkung" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="geltungszeit_der_hoechstparkdauer" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="strassenname" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="ladesaeule" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="hoechstparkdauer" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="carsharing" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="beschraenkung" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="grund_fuer_beschraenkung" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="nur_schwerbehinderte" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="bewirtschaftungszeit" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="zone" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="strassen_id" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="geom" nillable="true" type="gml:SurfacePropertyType"/>
+        </xsd:sequence>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="parkdaten" substitutionGroup="gml:_Feature" type="mdhwfs:parkdatenType"/>
+  <xsd:complexType name="sharenow_berlinType">
+    <xsd:complexContent>
+      <xsd:extension base="gml:AbstractFeatureType">
+        <xsd:sequence>
+          <xsd:element maxOccurs="1" minOccurs="0" name="v_id" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="address" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="buildseries" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="fueltype" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="fuellevel" nillable="true" type="xsd:int"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="plate" nillable="true" type="xsd:string"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="lat" nillable="true" type="xsd:decimal"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="lon" nillable="true" type="xsd:decimal"/>
+          <xsd:element maxOccurs="1" minOccurs="0" name="geom" nillable="true" type="gml:PointPropertyType"/>
+        </xsd:sequence>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="sharenow_berlin" substitutionGroup="gml:_Feature" type="mdhwfs:sharenow_berlinType"/>
+</xsd:schema>

package/test/vectorStyle/lib/resources/describeFeatureType_opengis_geometry.xml

@@ -0,0 +1,69 @@
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" xmlns:app="http://www.deegree.org/app" xmlns:xlink="http://www.w3.org/1999/xlink" targetNamespace="http://www.deegree.org/app" elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+  <element name="hamburgconvention" substitutionGroup="gml:_Feature">
+    <complexType>
+      <complexContent>
+        <extension base="gml:AbstractFeatureType">
+          <sequence>
+            <element name="flaechenname" minOccurs="0" type="string"/>
+            <element name="flaechenid" minOccurs="0" type="decimal"/>
+            <element name="bezirk" minOccurs="0" type="string"/>
+            <element name="stadtteil" minOccurs="0" type="string"/>
+            <element name="flaeche_gesamt_m" minOccurs="0" type="decimal"/>
+            <element name="flaeche_eventlotse_m" minOccurs="0" type="decimal"/>
+            <element name="dist_flghf_km" minOccurs="0" type="decimal"/>
+            <element name="dist_hbf_km" minOccurs="0" type="decimal"/>
+            <element name="dist_ubahn_m" minOccurs="0" type="decimal"/>
+            <element name="dist_sbahn_m" minOccurs="0" type="decimal"/>
+            <element name="dist_bus_m" minOccurs="0" type="decimal"/>
+            <element name="dist_faehre_m" minOccurs="0" type="decimal"/>
+            <element name="ubahn" minOccurs="0" type="string"/>
+            <element name="sbahn" minOccurs="0" type="string"/>
+            <element name="bus" minOccurs="0" type="string"/>
+            <element name="faehre" minOccurs="0" type="string"/>
+            <element name="plz" minOccurs="0" type="decimal"/>
+            <element name="anschluss" minOccurs="0" type="string"/>
+            <element name="anschluss_en" minOccurs="0" type="string"/>
+            <element name="hinweisstempel" minOccurs="0" type="string"/>
+            <element name="hinweisstempel_en" minOccurs="0" type="string"/>
+            <element name="bild" minOccurs="0" type="string"/>
+            <element name="video" minOccurs="0" type="string"/>
+            <element name="dokument" minOccurs="0" type="string"/>
+            <element name="flaechengeber" minOccurs="0" type="string"/>
+            <element name="flaechengeber_en" minOccurs="0" type="string"/>
+            <element name="premiumflaeche" minOccurs="0" type="boolean"/>
+            <element name="kontaktname" minOccurs="0" type="string"/>
+            <element name="kontakttel" minOccurs="0" type="string"/>
+            <element name="kontaktmail" minOccurs="0" type="string"/>
+            <element name="flaechengeber2" minOccurs="0" type="string"/>
+            <element name="flaechengeber2_en" minOccurs="0" type="string"/>
+            <element name="kontaktname2" minOccurs="0" type="string"/>
+            <element name="kontakttel2" minOccurs="0" type="string"/>
+            <element name="kontaktmail2" minOccurs="0" type="string"/>
+            <element name="beschreibung" minOccurs="0" type="string"/>
+            <element name="beschreibung_en" minOccurs="0" type="string"/>
+            <element name="nichtverfuegbarvon" minOccurs="0" type="string"/>
+            <element name="nichtverfuegbarbis" minOccurs="0" type="string"/>
+            <element name="strasse" minOccurs="0" type="string"/>
+            <element name="hausnr" minOccurs="0" type="string"/>
+            <element name="boden" minOccurs="0" type="string"/>
+            <element name="boden_en" minOccurs="0" type="string"/>
+            <element name="emission" minOccurs="0" type="string"/>
+            <element name="url" minOccurs="0" type="string"/>
+            <element name="url_en" minOccurs="0" type="string"/>
+            <element name="x_min" minOccurs="0" type="decimal"/>
+            <element name="x_max" minOccurs="0" type="decimal"/>
+            <element name="y_min" minOccurs="0" type="decimal"/>
+            <element name="y_max" minOccurs="0" type="decimal"/>
+            <element name="x_min_klein" minOccurs="0" type="decimal"/>
+            <element name="x_max_klein" minOccurs="0" type="decimal"/>
+            <element name="y_min_klein" minOccurs="0" type="decimal"/>
+            <element name="y_max_klein" minOccurs="0" type="decimal"/>
+            <element name="active" minOccurs="0" type="boolean"/>
+            <element name="the_geom" minOccurs="0" type="gml:GeometryPropertyType"/>
+          </sequence>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+</schema>

package/test/vectorStyle/lib/resources/describeFeatureType_opengis_multi.xml

@@ -0,0 +1,45 @@
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" xmlns:app="http://www.deegree.org/app" xmlns:xlink="http://www.w3.org/1999/xlink" targetNamespace="http://www.deegree.org/app" elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+  <element name="umring" substitutionGroup="gml:_Feature">
+    <complexType>
+      <complexContent>
+        <extension base="gml:AbstractFeatureType">
+          <sequence>
+            <element name="geom" minOccurs="0" type="gml:MultiPolygonPropertyType"/>
+          </sequence>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <element name="strecken" substitutionGroup="gml:_Feature">
+    <complexType>
+      <complexContent>
+        <extension base="gml:AbstractFeatureType">
+          <sequence>
+            <element name="Name" minOccurs="0" type="string"/>
+            <element name="visual" minOccurs="0" type="string"/>
+            <element name="geom" minOccurs="0" type="gml:MultiLineStringPropertyType"/>
+          </sequence>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <element name="poi" substitutionGroup="gml:_Feature">
+    <complexType>
+      <complexContent>
+        <extension base="gml:AbstractFeatureType">
+          <sequence>
+            <element name="titel" minOccurs="0" type="string"/>
+            <element name="kurztext" minOccurs="0" type="string"/>
+            <element name="internet" minOccurs="0" type="string"/>
+            <element name="bild" minOccurs="0" type="string"/>
+            <element name="copyright" minOccurs="0" type="string"/>
+            <element name="kategorie" minOccurs="0" type="string"/>
+            <element name="icon_vi" minOccurs="0" type="string"/>
+            <element name="geom" minOccurs="0" type="gml:PointPropertyType"/>
+          </sequence>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+</schema>

package/test/vectorStyle/lib/resources/describeFeatureType_opengis_point.xml

@@ -0,0 +1,24 @@
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" xmlns:de.hh.up="https://registry.gdi-de.org/id/de.hh.up" xmlns:xlink="http://www.w3.org/1999/xlink" targetNamespace="https://registry.gdi-de.org/id/de.hh.up" elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+  <element name="bike_und_ride" substitutionGroup="gml:_Feature">
+    <complexType>
+      <complexContent>
+        <extension base="gml:AbstractFeatureType">
+          <sequence>
+            <element name="haltestelle" minOccurs="0" type="string"/>
+            <element name="symbol" minOccurs="0" type="string"/>
+            <element name="adresse" minOccurs="0" type="string"/>
+            <element name="davon_nicht_ueberdachte_stellplaetze" minOccurs="0" type="integer"/>
+            <element name="davon_ueberdachte_stellplaetze" minOccurs="0" type="integer"/>
+            <element name="davon_gesicherte_mietstellplaetze" minOccurs="0" type="integer"/>
+            <element name="schliessfaecher" minOccurs="0" type="integer"/>
+            <element name="internet" minOccurs="0" type="string"/>
+            <element name="email" minOccurs="0" type="string"/>
+            <element name="stand" minOccurs="0" type="string"/>
+            <element name="geom" minOccurs="0" type="gml:PointPropertyType"/>
+          </sequence>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+</schema>

package/test/vectorStyle/lib/resources/describeFeatureType_opengis_polygon.xml

@@ -0,0 +1,22 @@
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" xmlns:de.hh.up="https://registry.gdi-de.org/id/de.hh.up" xmlns:xlink="http://www.w3.org/1999/xlink" targetNamespace="https://registry.gdi-de.org/id/de.hh.up" elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
+  <element name="nr_f_biosphaerenreservat" substitutionGroup="gml:_Feature">
+    <complexType>
+      <complexContent>
+        <extension base="gml:AbstractFeatureType">
+          <sequence>
+            <element name="gebietsname" minOccurs="0" type="string"/>
+            <element name="gebietsnummer" minOccurs="0" type="string"/>
+            <element name="rechtsgrundlage" minOccurs="0" type="string"/>
+            <element name="schutzzone" minOccurs="0" type="integer"/>
+            <element name="erfassungsgrundlage" minOccurs="0" type="string"/>
+            <element name="info_kontakt" minOccurs="0" type="string"/>
+            <element name="iucn_kategorie" minOccurs="0" type="string"/>
+            <element name="stand_bearbeitung" minOccurs="0" type="string"/>
+            <element name="geom" minOccurs="0" type="gml:PolygonPropertyType"/>
+          </sequence>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+</schema>

package/test/vectorStyle/lib/resources/describeFeatureType_xsd_opengis_geometry.xml

@@ -0,0 +1,18 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:fis="http://www.berlin.de/broker" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://www.berlin.de/broker">
+	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
+	<xsd:element name="s_parkraumbewirt" substitutionGroup="gml:AbstractFeature" type="fis:s_parkraumbewirtType"/>
+	<xsd:complexType name="s_parkraumbewirtType">
+		<xsd:complexContent>
+			<xsd:extension base="gml:AbstractFeatureType">
+				<xsd:sequence>
+					<xsd:element minOccurs="0" name="parkzone" nillable="true" type="xsd:string"/>
+					<xsd:element minOccurs="0" name="bezirk" nillable="true" type="xsd:string"/>
+					<xsd:element minOccurs="0" name="zeiten" nillable="true" type="xsd:string"/>
+					<xsd:element minOccurs="0" name="gebuehr" nillable="true" type="xsd:string"/>
+					<xsd:element minOccurs="0" name="bemerkung" nillable="true" type="xsd:string"/>
+					<xsd:element minOccurs="0" name="geom" nillable="true" type="gml:GeometryPropertyType"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+</xsd:schema>

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

@@ -34,7 +34,7 @@ describe("stylePointIcon.js", () => {
             clusterAttributes = {
                 clusterImageName: "bild.svg",
                 clusterImageWidth: 10,
-                clusterImagePath: "/imagePath",
+                imagePath: "/imagePath",
                 clusterImageHeight: 20,
                 clusterImageScale: 1
             },
@@ -61,12 +61,87 @@ describe("stylePointIcon.js", () => {
                 }
             };
 
-        it("should create icon point style", () => {
+        it("should create icon point style with imageName without path", () => {
             expect(stylePointIcon.createIconStyle(attributes, feature, false)).toBeInstanceOf(Style);
             expect(stylePointIcon.createIconStyle(clusterAttributes, clusteredFeature, true)).toBeInstanceOf(Style);
             expect(stylePointIcon.createIconStyle(attributes, feature, false).getImage()).toBeInstanceOf(Icon);
             expect(stylePointIcon.createIconStyle(attributes, feature, false).getImage().getScale()).toEqual(1);
         });
+        it("should create icon point style with pure imageName and wfsImgPath exists", () => {
+            let style = null;
+
+            attributes.imageName = "Rathaus.svg";
+            attributes.imagePath = "./geodaten/icons/";
+            style = stylePointIcon.createIconStyle(attributes, feature, false);
+
+            expect(style).toBeInstanceOf(Style);
+            expect(style.getImage()).toBeInstanceOf(Icon);
+            expect(style.getImage().getSrc()).toEqual(attributes.imagePath + attributes.imageName);
+        });
+        it("should create clustered icon point style with pure imageName and wfsImgPath exists", () => {
+            let style = null;
+
+            clusterAttributes.clusterImageName = "Rathaus.svg";
+            clusterAttributes.imagePath = "./geodaten/icons/";
+            style = stylePointIcon.createIconStyle(clusterAttributes, clusteredFeature, true);
+
+            expect(style).toBeInstanceOf(Style);
+            expect(style.getImage()).toBeInstanceOf(Icon);
+            expect(style.getImage().getSrc()).toEqual(clusterAttributes.imagePath + clusterAttributes.clusterImageName);
+        });
+        it("should create icon point style with path in imageName and wfsImgPath exists", () => {
+            let style = null;
+
+            attributes.imageName = "/svg/poi/Rathaus.svg";
+            attributes.imagePath = "https://localhost:9001/portal/basic/geodaten/icons/";
+            style = stylePointIcon.createIconStyle(attributes, feature, false);
+
+            expect(style).toBeInstanceOf(Style);
+            expect(style.getImage()).toBeInstanceOf(Icon);
+            expect(style.getImage().getSrc()).toEqual(attributes.imagePath + attributes.imageName);
+        });
+        it("should create clustered icon point style with path in imageName and wfsImgPath exists", () => {
+            let style = null;
+
+            clusterAttributes.clusterImageName = "/svg/poi/Rathaus.svg";
+            clusterAttributes.imagePath = "https://localhost:9001/portal/basic/geodaten/icons/";
+            style = stylePointIcon.createIconStyle(clusterAttributes, clusteredFeature, true);
+
+            expect(style).toBeInstanceOf(Style);
+            expect(style.getImage()).toBeInstanceOf(Icon);
+            expect(style.getImage().getSrc()).toEqual(clusterAttributes.imagePath + clusterAttributes.clusterImageName);
+        });
+        it("should create icon point style with whole path in imageName and wfsImgPath is empty", () => {
+            let style = null;
+
+            attributes.imageName = "https://localhost:9001/portal/basic/geodaten/icons/svg/poi/Rathaus.svg";
+            style = stylePointIcon.createIconStyle(attributes, feature, false);
+
+            expect(style).toBeInstanceOf(Style);
+            expect(style.getImage()).toBeInstanceOf(Icon);
+            expect(style.getImage().getSrc()).toEqual(attributes.imageName);
+        });
+        it("should create clustered icon point style with whole path in imageName and wfsImgPath is empty", () => {
+            let style = null;
+
+            clusterAttributes.clusterImageName = "https://localhost:9001/portal/basic/geodaten/icons/svg/poi/Rathaus.svg";
+            clusterAttributes.imagePath = "";
+            style = stylePointIcon.createIconStyle(clusterAttributes, clusteredFeature, true);
+
+            expect(style).toBeInstanceOf(Style);
+            expect(style.getImage()).toBeInstanceOf(Icon);
+            expect(style.getImage().getSrc()).toEqual(clusterAttributes.clusterImageName);
+        });
+        it("should create icon point style with svg", () => {
+            let style = null;
+
+            attributes.imageName = "<svg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='#E10019' class='bi bi-geo-fill' viewBox='0 0 16 16'><path fill-rule='evenodd' d='M4 4a4 4 0 1 1 4.5 3.969V13.5a.5.5 0 0 1-1 0V7.97A4 4 0 0 1 4 3.999zm2.493 8.574a.5.5 0 0 1-.411.575c-.712.118-1.28.295-1.655.493a1.319 1.319 0 0 0-.37.265.301.301 0 0 0-.057.09V14l.002.008a.147.147 0 0 0 .016.033.617.617 0 0 0 .145.15c.165.13.435.27.813.395.751.25 1.82.414 3.024.414s2.273-.163 3.024-.414c.378-.126.648-.265.813-.395a.619.619 0 0 0 .146-.15.148.148 0 0 0 .015-.033L12 14v-.004a.301.301 0 0 0-.057-.09 1.318 1.318 0 0 0-.37-.264c-.376-.198-.943-.375-1.655-.493a.5.5 0 1 1 .164-.986c.77.127 1.452.328 1.957.594C12.5 13 13 13.4 13 14c0 .426-.26.752-.544.977-.29.228-.68.413-1.116.558-.878.293-2.059.465-3.34.465-1.281 0-2.462-.172-3.34-.465-.436-.145-.826-.33-1.116-.558C3.26 14.752 3 14.426 3 14c0-.599.5-1 .961-1.243.505-.266 1.187-.467 1.957-.594a.5.5 0 0 1 .575.411z'/></svg>";
+            style = stylePointIcon.createIconStyle(attributes, feature, false);
+
+            expect(style).toBeInstanceOf(Style);
+            expect(style.getImage()).toBeInstanceOf(Icon);
+            expect(style.getImage().getSrc()).toEqual("data:image/svg+xml;charset=utf-8," + encodeURIComponent(attributes.imageName));
+        });
         it("should create cluster icon point style", () => {
             expect(stylePointIcon.createIconStyle(clusterAttributes, clusteredFeature, true)).toBeInstanceOf(Style);
             expect(stylePointIcon.createIconStyle(clusterAttributes, clusteredFeature, true).getImage()).toBeInstanceOf(Icon);