@masterportal/masterportalapi 2.4.0 → 2.6.0

package/.eslintrc

@@ -9,7 +9,7 @@
         "Cesium": true
     },
     "parserOptions": {
-        "ecmaVersion": 2020,
+        "ecmaVersion": 2022,
         "sourceType": "module"
     },
     "extends": [

package/CHANGELOG.md

@@ -3,6 +3,49 @@
 
  The [Semantic Versioning](https://semver.org/spec/v2.0.0.html) is used.
 
+## 2.6.0 - 2022-09-06
+### Added
+- Added possibility to set initial features for layer vectorBase.
+
+### Changed
+- OAF: Fixed oaf recursion and a possibility to disable the CRS parameter is added.
+
+---
+
+## 2.5.1 - 2022-08-05
+### Fixed
+- Remove import of `defaultResolutions` for the vectorStyle layer
+
+---
+
+## 2.5.0 - 2022-08-05
+### Added
+- The following packages have been installed:
+    - jest-environment-jsdom: 28.1.3
+
+### Changed
+- The following packages have been updated:
+    - dependencies:
+        - core-js: 3.16.1 to 3.24.0
+        - ol: 6.14.1 to 6.15.1 (This also raised ol-mapbox-style from 7 to version 8)
+        - proj4: 2.7.5 to 2.8.0
+    - devDependencies:
+        - @babel/core: 7.16.7 to 7.18.9
+        - @babel/plugin-transform-modules-commonjs: 7.16.8 to 7.18.6
+        - @parcel/transformer-sass: 2.2.0 to 2.6.2
+        - canvas: 2.8.0 to 2.9.3
+        - eslint: 7.32.0 to 8.20.0
+        - husky: 7.0.1 to 8.0.1
+        - jest: 27.4.0 to 28.1.3
+        - jest-canvas-mock: 2.3.1 to 2.4.0
+        - jsdoc: 3.6.7 to 3.6.11
+        - parcel: 2.2.0 to 2.6.2
+        - sass: 1.37.5 to 1.54.0
+    - peerDependencies:
+        - cesium: 1.88.0 to 1.95.0
+
+---
+
 ## 2.4.0 - 2022-07-06
 ### Added
 - Issue 776: Add 3D mode for WMTS layers.

package/example/config/portal.json

@@ -31,5 +31,5 @@
       "id": "1001"
     }
   ],
-  "cesiumLib":"https://geoportal-hamburg.de/mastercode/cesium/1_93/Cesium.js"
+  "cesiumLib":"https://geoportal-hamburg.de/mastercode/cesium/1_95/Cesium.js"
 }

package/example/config/services.json

@@ -62,6 +62,43 @@
       "maximumScreenSpaceError": 6
     }
   },
+  {
+    "id": "4003",
+    "name": "EntitiesLayer",
+    "typ": "Entities3D",
+    "entities": [
+      {
+        "url": "https://daten-hamburg.de/gdi3d/datasource-data/Simple_Building.glb",
+        "attributes": {
+          "name": "einfaches Haus in Planten und Blomen"
+        },
+        "latitude": 53.5631,
+        "longitude": 9.9800,
+        "height": 16,
+        "heading": 0,
+        "pitch": 0,
+        "roll": 0,
+        "scale": 5,
+        "allowPicking": true,
+        "show": true
+      },
+      {
+        "url": "https://daten-hamburg.de/gdi3d/datasource-data/Simple_Building.glb",
+        "attributes": {
+          "name": "einfaches Haus im See"
+        },
+        "latitude": 53.5622,
+        "longitude": 9.9808,
+        "height": 16,
+        "heading": 0,
+        "pitch": 0,
+        "roll": 0,
+        "scale": 2,
+        "allowPicking": true,
+        "show": true
+      }
+    ]
+  },
   {
     "id": "5001",
     "name": "Schulen",
@@ -106,12 +143,12 @@
     "zDirection": -1
   },
   {
-    "id":"7001",
-    "name":"TopPlusOpen",
-    "capabilitiesUrl":"https://sgx.geodatenzentrum.de/wmts_topplus_open/1.0.0/WMTSCapabilities.xml",
-    "optionsFromCapabilities":true,
-    "typ":"WMTS",
-    "layers":"web"
+    "id": "7001",
+    "name": "TopPlusOpen",
+    "capabilitiesUrl": "https://sgx.geodatenzentrum.de/wmts_topplus_open/1.0.0/WMTSCapabilities.xml",
+    "optionsFromCapabilities": true,
+    "typ": "WMTS",
+    "layers": "web"
   },
   {
     "id": "7002",
@@ -142,16 +179,86 @@
     "maxScale": "2500000",
     "tileMatrixSet": "google3857",
     "matrixSizes": [
-      [1, 1], [2, 2],
-      [4, 4], [8, 8],
-      [16, 16], [32, 32],
-      [64, 64], [128, 128],
-      [256, 256], [512, 512],
-      [1024, 1024], [2048, 2048],
-      [4096, 4096], [8192, 8192],
-      [16384, 16384], [32768, 32768],
-      [65536, 65536], [131072, 131072],
-      [262144, 262144], [524288, 524288]
+      [
+        1,
+        1
+      ],
+      [
+        2,
+        2
+      ],
+      [
+        4,
+        4
+      ],
+      [
+        8,
+        8
+      ],
+      [
+        16,
+        16
+      ],
+      [
+        32,
+        32
+      ],
+      [
+        64,
+        64
+      ],
+      [
+        128,
+        128
+      ],
+      [
+        256,
+        256
+      ],
+      [
+        512,
+        512
+      ],
+      [
+        1024,
+        1024
+      ],
+      [
+        2048,
+        2048
+      ],
+      [
+        4096,
+        4096
+      ],
+      [
+        8192,
+        8192
+      ],
+      [
+        16384,
+        16384
+      ],
+      [
+        32768,
+        32768
+      ],
+      [
+        65536,
+        65536
+      ],
+      [
+        131072,
+        131072
+      ],
+      [
+        262144,
+        262144
+      ],
+      [
+        524288,
+        524288
+      ]
     ],
     "coordinateSystem": "EPSG:3857",
     "layerAttribution": "nicht vorhanden",
@@ -163,53 +270,28 @@
       20037508.3428
     ],
     "scales": [
-      559082264.029, 279541132.015, 139770566.007, 69885283.0036,
-      34942641.5018, 17471320.7509, 8735660.37545, 4367830.18773,
-      2183915.09386, 1091957.54693, 45978.773466, 272989.386733,
-      136494.693366, 68247.3466832, 34123.6733416, 17061.8366708,
-      8530.91833540, 4265.45916770, 2132.72958385, 1066.36479193
+      559082264.029,
+      279541132.015,
+      139770566.007,
+      69885283.0036,
+      34942641.5018,
+      17471320.7509,
+      8735660.37545,
+      4367830.18773,
+      2183915.09386,
+      1091957.54693,
+      45978.773466,
+      272989.386733,
+      136494.693366,
+      68247.3466832,
+      34123.6733416,
+      17061.8366708,
+      8530.91833540,
+      4265.45916770,
+      2132.72958385,
+      1066.36479193
     ],
     "resLength": "20",
     "requestEncoding": "REST"
-  },
-  {
-    "id": "4003",
-    "name": "EntitiesLayer",
-    "typ": "Entities3D",
-    "entities": [
-      {
-          "url": "https://daten-hamburg.de/gdi3d/datasource-data/Simple_Building.glb",
-        "attributes": {
-          "name": "einfaches Haus in Planten und Blomen"
-        },
-        "latitude": 53.5631,
-        "longitude": 9.9800,
-        "height": 16,
-        "heading": 0,
-        "pitch": 0,
-        "roll": 0,
-        "scale": 5,
-        "allowPicking": true,
-        "show": true
-      },
-      {
-        "url": "https://daten-hamburg.de/gdi3d/datasource-data/Simple_Building.glb",
-        "attributes": {
-          "name": "einfaches Haus im See"
-        },
-        "latitude": 53.5622,
-        "longitude": 9.9808,
-        "height": 16,
-        "heading": 0,
-        "pitch": 0,
-        "roll": 0,
-        "scale": 2,
-        "allowPicking": true,
-        "show": true
-      }
-    ],
-    "gfiAttributes" : {
-      "name": "Name"
-    }
   }
 ]

package/example/index.js

@@ -47,7 +47,7 @@ document.getElementById("enable").addEventListener("click", function () {
         document.getElementById("layer-visibility").style.display = "none";
     }
     else {
-        const lib = portalConfig.cesiumLib ? portalConfig.cesiumLib : "https://geoportal-hamburg.de/mastercode/cesium/1_93/Cesium.js";
+        const lib = portalConfig.cesiumLib ? portalConfig.cesiumLib : "https://geoportal-hamburg.de/mastercode/cesium/1_95/index.js";
 
         document.getElementById("layer-visibility").style.display = "block";
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@masterportal/masterportalapi",
   "author": "Implementierungspartnerschaft Masterportal <info@masterportal.org> (https://www.masterportal.org)",
-  "version": "2.4.0",
+  "version": "2.6.0",
   "license": "MIT",
   "description": "Basic functions of the Masterportal as api",
   "repository": {
@@ -19,33 +19,33 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "core-js": "^3.16.1",
-    "ol": "6.14.1",
+    "core-js": "^3.24.0",
+    "ol": "6.15.1",
     "olcs": "^2.13.0",
-    "proj4": "^2.7.5",
+    "proj4": "^2.8.0",
     "xml2js": "^0.4.23"
   },
   "devDependencies": {
-    "@babel/core": "^7.16.7",
-    "@babel/plugin-transform-modules-commonjs": "^7.16.8",
-    "@parcel/transformer-sass": "^2.2.0",
+    "@babel/core": "^7.18.9",
+    "@babel/plugin-transform-modules-commonjs": "^7.18.6",
+    "@parcel/transformer-sass": "^2.6.2",
     "buffer": "^6.0.3",
-    "canvas": "^2.8.0",
-    "eslint": "^7.32.0",
+    "canvas": "^2.9.3",
+    "eslint": "^8.20.0",
     "events": "^3.3.0",
-    "husky": "^7.0.1",
-    "jest": "^27.4.0",
-    "jest-canvas-mock": "^2.3.1",
-    "jsdoc": "^3.6.7",
-    "parcel": "^2.2.0",
+    "husky": "^8.0.1",
+    "jest": "^28.1.3",
+    "jest-canvas-mock": "^2.4.0",
+    "jest-environment-jsdom": "^28.1.3",
+    "jsdoc": "^3.6.11",
+    "parcel": "^2.6.2",
     "process": "^0.11.10",
-    "regenerator-runtime": "0.13.9",
-    "sass": "^1.37.5",
+    "sass": "^1.54.0",
     "stream-browserify": "^3.0.0",
     "timers-browserify": "^2.0.12"
   },
   "peerDependencies": {
-    "cesium": "^1.88.0"
+    "cesium": "^1.95.0"
   },
   "engines": {
     "node": "^16.13.2",

package/src/defaults.js

@@ -19,7 +19,7 @@ export default {
         {resolution: 1.3229159522920524, scale: 5000, zoomLevel: 6},
         {resolution: 0.6614579761460262, scale: 2500, zoomLevel: 7},
         {resolution: 0.2645831904584105, scale: 1000, zoomLevel: 8},
-        {resolution: 0.13229159522920521, scale: 500, zoomLevel: 9}
+        {resolution: 0.1322915952292052, scale: 500, zoomLevel: 9}
     ],
     namedProjections: [
         ["EPSG:25832", "+proj=utm +zone=32 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs"]

package/src/layer/oaf.js

@@ -57,7 +57,8 @@ function getNextLinkFromFeatureCollection (featureCollection) {
         if (
             typeof featureCollection.links[i] === "object" && featureCollection.links[i] !== null
             && typeof featureCollection.links[i].href === "string"
-            && featureCollection.links[i].title === "next page"
+            && featureCollection.links[i].rel === "next"
+            && featureCollection.links[i].type === "application/geo+json"
         ) {
             return featureCollection.links[i].href;
         }
@@ -157,7 +158,9 @@ function createUrl (rawLayer) {
         url += "bbox=" + appendingString + "&";
     }
     url += typeof rawLayer.bboxCrs === "string" && rawLayer.bboxCrs !== "" ? "bbox-crs=" + encodeURIComponent(rawLayer.bboxCrs) + "&" : "";
-    url += "crs=" + encodeURIComponent(typeof rawLayer.crs === "string" && rawLayer.crs !== "" ? rawLayer.crs : crsDefault) + "&";
+    if (rawLayer.crs !== false) {
+        url += "crs=" + encodeURIComponent(typeof rawLayer.crs === "string" && rawLayer.crs !== "" ? rawLayer.crs : crsDefault) + "&";
+    }
     url += typeof rawLayer.datetime === "string" && rawLayer.datetime !== "" ? "datetime=" + rawLayer.datetime + "&" : "";
     url += getParamsUrl(rawLayer.params);
 

package/src/layer/tileset.js

@@ -29,8 +29,10 @@ export default function Tileset (rawLayer) {
         id: rawLayer.id,
         typ: rawLayer.typ
     };
-    this.tileset = createTileSet(rawLayer);
-    this.tileset.layerReferenceId = rawLayer.id;
+    if (Cesium) {
+        this.tileset = createTileSet(rawLayer);
+        this.tileset.layerReferenceId = rawLayer.id;
+    }
 }
 /**
  *

package/src/layer/vectorBase.js

@@ -4,10 +4,13 @@ import VectorSource from "ol/source/Vector.js";
 
 /**
  * Triggered by Layer to create a layerSource
+ * @param {Object} attrs  attributes of the layer
  * @returns {void}
  */
-export function createLayerSource () {
-    return new VectorSource();
+export function createLayerSource (attrs) {
+    return new VectorSource({
+        features: attrs.features
+    });
 }
 
 /**
@@ -27,7 +30,7 @@ export function updateSource (layer, features) {
  * @returns {Object} layer
  */
 export function createLayer (attrs) {
-    const source = this.createLayerSource();
+    const source = this.createLayerSource(attrs);
 
     return new VectorLayer({
         source: source,

package/src/layer/vectorTile.js

@@ -4,8 +4,7 @@ import VectorTileSource from "ol/source/VectorTile";
 import OpenLayersTileGrid from "ol/tilegrid/TileGrid";
 import {extentFromProjection} from "ol/tilegrid";
 
-import stylefunction from "ol-mapbox-style/dist/stylefunction";
-import {defaultResolutions} from "ol-mapbox-style/dist/util";
+import {stylefunction} from "ol-mapbox-style";
 
 import defaults from "../defaults";
 
@@ -167,8 +166,8 @@ export function createLayer (rawLayer = {}, {layerParams = {}, options = {}} = {
 export function setStyle (layer, glStyle, {options = {}} = {}) {
     stylefunction(layer, glStyle,
         options.sourceId ? options.sourceId : Object.keys(glStyle.sources)[0],
-        options.resolutions ? options.resolutions : defaultResolutions,
+        options.resolutions,
         options.spriteData,
         options.spriteImageUrl,
         options.getFonts);
-}
+}

package/test/layer/vectorBase.test.js

@@ -1,3 +1,6 @@
+import Feature from "ol/Feature";
+import Point from "ol/geom/Point";
+import Polygon from "ol/geom/Polygon";
 import VectorLayer from "ol/layer/Vector";
 import VectorSource from "ol/source/Vector.js";
 import * as vectorBase from "../../src/layer/vectorBase";
@@ -5,8 +8,20 @@ import * as vectorBase from "../../src/layer/vectorBase";
 describe("vectorBase.js", function () {
 
     describe("createLayerSource", function () {
-        it("creates a layerSource", function () {
-            const source = vectorBase.createLayerSource();
+        it("creates a layerSource with features", function () {
+            const attr = {
+                    features: [
+                        new Feature({geometry: new Polygon([[[565086.1948534324, 5934664.461947621], [565657.6945448224, 5934738.54524095], [565625.9445619675, 5934357.545446689], [565234.3614400891, 5934346.962119071], [565086.1948534324, 5934664.461947621]]])}),
+                        new Feature({geometry: new Point([565826.38, 5934174.40])})
+                    ]
+                },
+                source = vectorBase.createLayerSource(attr);
+
+            expect(source).toBeInstanceOf(VectorSource);
+        });
+
+        it("creates a layerSource without features", function () {
+            const source = vectorBase.createLayerSource({});
 
             expect(source).toBeInstanceOf(VectorSource);
         });

package/test/layer/vectorTile.test.js

@@ -135,7 +135,7 @@ describe("vectorTile.js", function () {
                         1.3229159522920524,
                         0.6614579761460262,
                         0.2645831904584105,
-                        0.13229159522920522
+                        0.1322915952292052
                     ],
                     tileSize: 512
                 },
@@ -169,4 +169,4 @@ describe("vectorTile.js", function () {
             expect(featureStyle[0].getFill().getColor()).toBe("rgba(255,253,238,1)");
         });
     });
-});
+});