@masterportal/masterportalapi 2.31.0 → 2.33.0

package/CHANGELOG.md

@@ -3,31 +3,64 @@
 
  The [Semantic Versioning](https://semver.org/spec/v2.0.0.html) is used.
 
-### 2.31.0 - 2023-12-13
-## Added
+## Unreleased - in development
+
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+
+---
+
+## 2.33.0 - 2024-02-07
+
+### Changed
+- createStyle: setting style to feature is limited to Point and MultiPoint geometries.
+
+### Fixed
+- 3D: the options are set correctly again for terrain.
+
+---
+
+
+## 2.32.0 - 2024-01-17
+### Added
+
+### Changed
+- The following package has been updated:
+    - dependencies:
+        - ol: 8.1.0 to 8.2.0
+    - peerDependencies:
+        - @cesium/engine 2.4.1 to 6.2.0
+
+---
+
+## 2.31.0 - 2023-12-13
+### Added
 - Added support for Node LTS version ^20.9.0 and npm Version ^10.1.0.
 
-## Changed
+### Changed
 - WMS-Layer: the attribute extent of rawlayer is set at ol-layer.
 
-## Fixed
+### Fixed
 - OAF-Layer: fix oaf layer in examples
 
 ---
 
-### 2.30.0 - 2023-11-28
-## Changed
+## 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
+### 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
 
 ---
 
-### 2.29.0 - 2023-10-27
-## Added
+## 2.29.0 - 2023-10-27
+### Added
 - The following packages from parcel automatic were installed for node builtin:
     - dependencies:
         - assert": 2.1.0,
@@ -40,7 +73,7 @@
     - dependencies:
         - ol-mapbox-style: 12.0.0
 
-## Changed
+### Changed
 - The following packages have been updated:
     - dependencies:
         - core-js: 3.32.0 to 3.33.1
@@ -60,35 +93,35 @@
         - 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
+### 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.
 
 ---
 
-### 2.28.0 - 2023-09-27
-## Added
+## 2.28.0 - 2023-09-27
+### Added
 - GfiAttributes: GFI Attributes can now be configured as HTML tags, e.g <a>, <img> or <iframe>
 
-## Changed
+### Changed
 - The following packages have been updated:
     - dependencies:
         - ol: 7.5.1 to 7.5.2 (This version fix a bug for vectorTiles with declutter: true)
-## Fixed
+### Fixed
 - Issue Masterportal #1067 VectorStyle: if there is a ? in the services URL, no further one is added
 - Cesium tileset: set visibility and set opacity was fixed.
 - Webgl: set default style for feature and fix the opacity problem
 
 ---
 
-### 2.27.0 - 2023-08-31
-## Changed
+## 2.27.0 - 2023-08-31
+### Changed
 - VectorStyle: 'initializeStyleList' is asynchron, waits for loading finished and returns the loaded styles.
 
 ---
 
-### 2.26.0 - 2023-08-23
-## Changed
+## 2.26.0 - 2023-08-23
+### Changed
 - The following packages have been updated:
     - dependencies:
         - ol: 7.4.0 to 7.5.1

package/jest.config.js

@@ -6,7 +6,7 @@ module.exports = {
     /** ol prints errors without HTMLCanvasElement being available in test environment */
     "setupFiles": ["jest-canvas-mock"],
     /** node_modules are usually ignored by babel-jest, but ol is published in ES6 */
-    "transformIgnorePatterns": ["/node_modules/(?!(ol|olcs|ol-mapbox-style|geotiff|quick-lru)/).*/"],
+    "transformIgnorePatterns": ["/node_modules/(?!(ol|olcs|ol-mapbox-style|geotiff|quick-lru|color-space|color-rgba|color-parse)/).*/"],
     /** only consider files in src/ for coverage */
     "collectCoverageFrom": ["src/**/*.js"],
     /** coverage reporters */

package/package.json

@@ -1,73 +1,73 @@
-{
-  "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"
-  }
-}
+{
+  "name": "@masterportal/masterportalapi",
+  "author": "Implementierungspartnerschaft Masterportal <info@masterportal.org> (https://www.masterportal.org)",
+  "version": "2.33.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.2.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": "^6.2.0"
+  },
+  "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/terrain.js

@@ -6,12 +6,13 @@
  * @returns {void}
  */
 async function createTerrainProvider (rawLayer) {
-    const options = {},
-        terrainProvider = await Cesium.CesiumTerrainProvider.fromUrl(rawLayer.url, options);
+    const options = {};
+    let terrainProvider = "";
 
     if (rawLayer.cesiumTerrainProviderOptions) {
         Object.assign(options, rawLayer.cesiumTerrainProviderOptions);
     }
+    terrainProvider = await Cesium.CesiumTerrainProvider.fromUrl(rawLayer.url, options);
 
     return terrainProvider;
 }

package/src/vectorStyle/createStyle.js

@@ -261,7 +261,9 @@ function createStyle (styleObject, feature, isClustered, wfsImgPathFromConfig) {
             styleObjectGeometry.setText(getLabelStyle(feature, style, isClustered));
         }
     }
-    feature.setStyle(styleObjectGeometry);
+    if (feature?.getGeometry().getType() === "Point" || feature?.getGeometry().getType() === "MultiPoint") {
+        feature.setStyle(styleObjectGeometry);
+    }
     return styleObjectGeometry;
 }
 

package/test/vectorStyle/createStyle.test.js

@@ -263,7 +263,6 @@ 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 ", () => {
@@ -297,7 +296,6 @@ 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 ", () => {
@@ -331,7 +329,6 @@ 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 ", () => {