@masterportal/masterportalapi 2.30.0 → 2.31.0

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 
  The [Semantic Versioning](https://semver.org/spec/v2.0.0.html) is used.
 
+### 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.
+
+## Fixed
+- OAF-Layer: fix oaf layer in examples
+
+---
+
 ### 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.
@@ -11,6 +23,7 @@
 - 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
+
 ---
 
 ### 2.29.0 - 2023-10-27

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.30.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/wms.js

@@ -158,7 +158,8 @@ export function createLayer (rawLayer, layerParams = {}, options) {
         source,
         minResolution: typeof rawLayer.minResolution === "string" ? parseFloat(rawLayer.minResolution) : rawLayer.minResolution,
         maxResolution: typeof rawLayer.maxResolution === "string" ? parseFloat(rawLayer.maxResolution) : rawLayer.maxResolution,
-        id: rawLayer.id
+        id: rawLayer.id,
+        extent: rawLayer.extent
     }, layerParams));
 }
 

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);