@masterportal/masterportalapi 2.29.0 → 2.31.0

package/CHANGELOG.md

@@ -3,16 +3,26 @@
 
  The [Semantic Versioning](https://semver.org/spec/v2.0.0.html) is used.
 
-### Unreleased - in development
+### 2.31.0 - 2023-12-13
 ## Added
+- Added support for Node LTS version ^20.9.0 and npm Version ^10.1.0.
 
 ## Changed
+- WMS-Layer: the attribute extent of rawlayer is set at ol-layer.
 
-## Deprecated
+## Fixed
+- OAF-Layer: fix oaf layer in examples
+
+---
 
-## Removed
+### 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
 
 ---
 

package/example/config/services.json

@@ -105,13 +105,7 @@
     "url": "https://api.hamburg.de/datasets/v1/schulen",
     "collection": "staatliche_schulen",
     "typ": "OAF",
-    "bbox": "",
-    "bboxCrs": "",
-    "datetime": "",
-    "crs": "EPSG:25832",
-    "params": {
-      "anzahl_schueler": ">1000"
-    }
+    "crs": "http://www.opengis.net/def/crs/EPSG/0/25832"
   },
   {
     "id": "8712",

package/package.json

@@ -1,73 +1,73 @@
-{
-  "name": "@masterportal/masterportalapi",
-  "author": "Implementierungspartnerschaft Masterportal <info@masterportal.org> (https://www.masterportal.org)",
-  "version": "2.29.0",
-  "license": "MIT",
-  "description": "Basic functions of the Masterportal as api",
-  "repository": {
-    "type": "git",
-    "url": "git+https://bitbucket.org/geowerkstatt-hamburg/masterportalapi.git"
-  },
-  "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.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",
-    "prePushHook": "eslint --max-warnings 0 \"./**/*.js\" && npm run test",
-    "prepare": "husky install"
-  },
-  "dependencies": {
-    "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.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.52.0",
-    "events": "^3.3.0",
-    "https-browserify": "^1.0.0",
-    "husky": "^8.0.3",
-    "jest": "^29.7.0",
-    "jest-canvas-mock": "^2.5.2",
-    "jest-environment-jsdom": "^29.7.0",
-    "jest-fetch-mock": "^3.0.3",
-    "jsdoc": "^4.0.2",
-    "parcel": "^2.10.0",
-    "process": "^0.11.10",
-    "sass": "^1.69.4",
-    "stream-browserify": "^3.0.0",
-    "stream-http": "^3.2.0",
-    "timers-browserify": "^2.0.12",
-    "url": "^0.11.3",
-    "use-resize-observer": "^9.1.0",
-    "util": "^0.12.5"
-  },
-  "peerDependencies": {
-    "@cesium/engine": "^2.4.1"
-  },
-  "engines": {
-    "node": "^16.13.2 || ^18.12.0",
-    "npm": "^8.1.2 || ^9.3.1"
-  },
-  "homepage": "https://bitbucket.org/geowerkstatt-hamburg/masterportalapi#readme",
-  "directories": {
-    "example": "example",
-    "test": "test"
-  },
-  "bugs": {
-    "url": "https://bitbucket.org/geowerkstatt-hamburg/masterportalapi/issues"
-  }
-}
+{
+  "name": "@masterportal/masterportalapi",
+  "author": "Implementierungspartnerschaft Masterportal <info@masterportal.org> (https://www.masterportal.org)",
+  "version": "2.31.0",
+  "license": "MIT",
+  "description": "Basic functions of the Masterportal as api",
+  "repository": {
+    "type": "git",
+    "url": "git+https://bitbucket.org/geowerkstatt-hamburg/masterportalapi.git"
+  },
+  "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.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",
+    "prePushHook": "eslint --max-warnings 0 \"./**/*.js\" && npm run test",
+    "prepare": "husky install"
+  },
+  "dependencies": {
+    "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.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.52.0",
+    "events": "^3.3.0",
+    "https-browserify": "^1.0.0",
+    "husky": "^8.0.3",
+    "jest": "^29.7.0",
+    "jest-canvas-mock": "^2.5.2",
+    "jest-environment-jsdom": "^29.7.0",
+    "jest-fetch-mock": "^3.0.3",
+    "jsdoc": "^4.0.2",
+    "parcel": "^2.10.0",
+    "process": "^0.11.10",
+    "sass": "^1.69.4",
+    "stream-browserify": "^3.0.0",
+    "stream-http": "^3.2.0",
+    "timers-browserify": "^2.0.12",
+    "url": "^0.11.3",
+    "use-resize-observer": "^9.1.0",
+    "util": "^0.12.5"
+  },
+  "peerDependencies": {
+    "@cesium/engine": "^2.4.1"
+  },
+  "engines": {
+    "node": "^16.13.2 || ^18.12.0 || ^20.9.0",
+    "npm": "^8.1.2 || ^9.3.1 || ^10.1.0"
+  },
+  "homepage": "https://bitbucket.org/geowerkstatt-hamburg/masterportalapi#readme",
+  "directories": {
+    "example": "example",
+    "test": "test"
+  },
+  "bugs": {
+    "url": "https://bitbucket.org/geowerkstatt-hamburg/masterportalapi/issues"
+  }
+}

package/src/layer/tileset.js

@@ -13,8 +13,8 @@ function createTileSet (rawLayer) {
     if (rawLayer.cesium3DTilesetOptions) {
         Object.assign(options, rawLayer.cesium3DTilesetOptions);
     }
-    options.url = url;
-    return new Cesium.Cesium3DTileset(options);
+
+    return Promise.resolve(Cesium.Cesium3DTileset.fromUrl(url, options));
 }
 
 /**
@@ -33,8 +33,12 @@ export default function Tileset (rawLayer) {
         typ: rawLayer.typ
     };
     if (Cesium) {
-        this.tileset = createTileSet(rawLayer);
-        this.tileset.layerReferenceId = rawLayer.id;
+        this.tileset = Promise.resolve(createTileSet(rawLayer));
+        this.tileset.then(function (tileset) {
+            if (tileset) {
+                tileset.layerReferenceId = rawLayer.id;
+            }
+        });
     }
 }
 
@@ -58,7 +62,11 @@ Tileset.prototype.setOpacity = function (opacity) {
         color = splitValues.toString();
     }
 
-    this.tileset.style = new Cesium.Cesium3DTileStyle({color});
+    this.tileset.then(function (tileset) {
+        if (tileset) {
+            tileset.style = new Cesium.Cesium3DTileStyle({color});
+        }
+    });
 };
 
 /**
@@ -71,10 +79,16 @@ Tileset.prototype.setVisible = function (value, map) {
     if (map && typeof map.getCesiumScene === "function") {
         if (value) {
             if (!map.getCesiumScene().primitives.contains(this.tileset)) {
-                map.getCesiumScene().primitives.add(this.tileset);
+                this.tileset.then(function (tileset) {
+                    map.getCesiumScene().primitives.add(tileset);
+                });
             }
         }
-        this.tileset.show = value;
+        this.tileset.then(function (tileset) {
+            if (tileset) {
+                tileset.show = value;
+            }
+        });
     }
 };
 

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,9 +156,10 @@ export function createLayer (rawLayer, layerParams = {}, options) {
 
     return new Layer(Object.assign({
         source,
-        minResolution: rawLayer.minScale,
-        maxResolution: rawLayer.maxScale,
-        id: rawLayer.id
+        minResolution: typeof rawLayer.minResolution === "string" ? parseFloat(rawLayer.minResolution) : rawLayer.minResolution,
+        maxResolution: typeof rawLayer.maxResolution === "string" ? parseFloat(rawLayer.maxResolution) : rawLayer.maxResolution,
+        id: rawLayer.id,
+        extent: rawLayer.extent
     }, 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/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/test/layer/tileset.test.js

@@ -6,11 +6,12 @@ describe("tileset.js", function () {
 
     beforeEach(() => {
         global.Cesium = {};
-        global.Cesium.Cesium3DTileset = jest.fn();
+        global.Cesium.Cesium3DTileset = {};
+        global.Cesium.Cesium3DTileset.fromUrl = jest.fn();
         global.Cesium.Cesium3DTileStyle = jest.fn(color => color);
         attr = {
             id: "4002",
-            name: "Gebäude LoD2",
+            name: "Gebäude LoD2",
             url: "https://geoportal-hamburg.de/gdi3d/datasource-data/LoD2",
             typ: "TileSet3D",
             cesium3DTilesetOptions: {
@@ -28,7 +29,9 @@ describe("tileset.js", function () {
                 };
             }
         };
-        cesium3DTilesetSpy = jest.spyOn(global.Cesium, "Cesium3DTileset");
+        cesium3DTilesetSpy = jest.spyOn(global.Cesium.Cesium3DTileset, "fromUrl").mockImplementation(() => {
+            return Promise.resolve({});
+        });
         console.warn = jest.fn();
     });
 
@@ -38,21 +41,23 @@ describe("tileset.js", function () {
         console.warn = consoleWarn;
     });
 
-    function checkAttributes (layer, attrs) {
+    async function checkAttributes (layer, attrs) {
+        const tileset = await layer.tileset;
+
         expect(layer.get("name")).toEqual(attrs.name);
         expect(layer.get("typ")).toEqual(attrs.typ);
         expect(layer.get("id")).toEqual(attrs.id);
-        expect(layer.tileset.layerReferenceId).toEqual(attrs.id);
+        expect(tileset.layerReferenceId).toEqual(attrs.id);
     }
 
     describe("createLayer", function () {
         it("creates tileset layer without map", function () {
             const layer = new Tileset(attr);
 
-            checkAttributes(layer, attr);
             expect(layer.tileSet).toEqual(undefined);
             expect(layer.tileset.show).toEqual(undefined);
             expect(cesium3DTilesetSpy).toHaveBeenCalledTimes(1);
+            checkAttributes(layer, attr);
         });
         it("creates 2 tileset layers  with map and checks attributes", function () {
             const attr2 = {
@@ -70,40 +75,62 @@ describe("tileset.js", function () {
         });
     });
     describe("setOpacity", function () {
-        it("calls setOpacity sets opacity to terrain style", function () {
+        it("calls setOpacity sets opacity to terrain style", function (done) {
             const layer = new Tileset(attr, map);
 
             layer.setOpacity(0.5);
 
-            expect(layer.tileset.style).toEqual({color: "rgba(255, 255, 255, 0.5)"});
+            layer.tileset.then(function (tileset) {
+                if (tileset) {
+                    expect(tileset.style).toEqual({color: "rgba(255, 255, 255, 0.5)"});
+                    done();
+                }
+            });
         });
     });
     describe("setVisible", function () {
-        it("calls setVisible without map shall not fail", function () {
+        it("calls setVisible without map shall not fail", function (done) {
             const layer = new Tileset(attr, map);
 
             expect(layer.tileset.show).toEqual(undefined);
             layer.setVisible(true);
 
-            checkAttributes(layer, attr);
-            expect(layer.tileset.show).toEqual(undefined);
-            expect(cesium3DTilesetSpy).toHaveBeenCalledTimes(1);
+            layer.tileset.then(function (tileset) {
+                if (tileset) {
+                    checkAttributes(layer, attr);
+                    expect(layer.tileset.show).toEqual(undefined);
+                    expect(cesium3DTilesetSpy).toHaveBeenCalledTimes(1);
+                    done();
+                }
+            });
         });
-        it("sets the tileset layer visible", function () {
+        it("sets the tileset layer visible", function (done) {
             const layer = new Tileset(attr, map);
 
             layer.setVisible(true, map);
-            checkAttributes(layer, attr);
-            expect(layer.tileset.show).toEqual(true);
-            expect(cesium3DTilesetSpy).toHaveBeenCalledTimes(1);
+
+            layer.tileset.then(function (tileset) {
+                if (tileset) {
+                    checkAttributes(layer, attr);
+                    expect(tileset.show).toEqual(true);
+                    expect(cesium3DTilesetSpy).toHaveBeenCalledTimes(1);
+                    done();
+                }
+            });
         });
-        it("sets the tileset layer not visible", function () {
+        it("sets the tileset layer not visible", function (done) {
             const layer = new Tileset(attr, map);
 
             layer.setVisible(false, map);
-            checkAttributes(layer, attr);
-            expect(layer.tileset.show).toEqual(false);
-            expect(cesium3DTilesetSpy).toHaveBeenCalledTimes(1);
+
+            layer.tileset.then(function (tileset) {
+                if (tileset) {
+                    checkAttributes(layer, attr);
+                    expect(tileset.show).toEqual(false);
+                    expect(cesium3DTilesetSpy).toHaveBeenCalledTimes(1);
+                    done();
+                }
+            });
         });
     });
     describe("get", function () {

package/test/layer/wms.test.js

@@ -213,11 +213,12 @@ describe("wms.js", function () {
                     name: "name",
                     layers: "layer1, layer2"
                 },
-                layer = wms.createLayer({singleTile: false, tilesize: "10"}, 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");
             expect(layer.get("layers")).toEqual("layer1, layer2");
+            expect(layer.get("extent")).toEqual([10, 20, 11, 22]);
             expect(layer.getSource().getTileGrid()).toBeInstanceOf(TileGrid);
             expect(layer.getSource().getTileGrid().getOrigin()).toEqual(options.origin);
             expect(layer.getSource().getTileGrid().getResolutions()).toEqual(options.resolutions);

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>