@masterportal/masterportalapi 2.5.1 → 2.6.0

package/CHANGELOG.md

@@ -3,6 +3,15 @@
 
  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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@masterportal/masterportalapi",
   "author": "Implementierungspartnerschaft Masterportal <info@masterportal.org> (https://www.masterportal.org)",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "license": "MIT",
   "description": "Basic functions of the Masterportal as api",
   "repository": {
@@ -53,7 +53,6 @@
   },
   "homepage": "https://bitbucket.org/geowerkstatt-hamburg/masterportalapi#readme",
   "directories": {
-    "doc": "docs",
     "example": "example",
     "test": "test"
   },

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