@geospatial-sdk/openlayers 0.0.5-dev.14 → 0.0.5-dev.16

package/dist/map/create-map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-map.d.ts","sourceRoot":"","sources":["../../lib/map/create-map.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EACf,cAAc,EAEf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,GAAG,MAAM,QAAQ,CAAC;AACzB,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,KAAK,MAAM,gBAAgB,CAAC;AAyBnC,wBAAsB,WAAW,CAAC,UAAU,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CA8K7E;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CAyBpE;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,UAAU,EACnB,MAAM,CAAC,EAAE,MAAM,GAAG,WAAW,GAC5B,OAAO,CAAC,GAAG,CAAC,CAKd;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,GAAG,CAAC,CAQd"}
+{"version":3,"file":"create-map.d.ts","sourceRoot":"","sources":["../../lib/map/create-map.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EACf,cAAc,EAEf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,GAAG,MAAM,QAAQ,CAAC;AACzB,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,KAAK,MAAM,gBAAgB,CAAC;AA0BnC,wBAAsB,WAAW,CAAC,UAAU,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAqL7E;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CAyBpE;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,UAAU,EACnB,MAAM,CAAC,EAAE,MAAM,GAAG,WAAW,GAC5B,OAAO,CAAC,GAAG,CAAC,CAKd;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,GAAG,CAAC,CAQd"}

package/dist/map/create-map.js

@@ -23,6 +23,7 @@ import VectorTileLayer from "ol/layer/VectorTile";
 import { OGCMapTile, OGCVectorTile, WMTS } from "ol/source";
 import { MVT } from "ol/format";
 import { OgcApiEndpoint, WfsEndpoint, WmtsEndpoint, } from "@camptocamp/ogc-client";
+import { MapboxVectorLayer } from "ol-mapbox-style";
 const GEOJSON = new GeoJSON();
 const WFS_MAX_FEATURES = 10000;
 export function createLayer(layerModel) {
@@ -105,6 +106,13 @@ export function createLayer(layerModel) {
                 layer = olLayer;
                 break;
             }
+            case "maplibre-style": {
+                layer = new MapboxVectorLayer({
+                    styleUrl: layerModel.styleUrl,
+                    accessToken: layerModel.accessToken,
+                });
+                break;
+            }
             case "geojson": {
                 if (layerModel.url !== undefined) {
                     layer = new VectorLayer({
@@ -142,7 +150,7 @@ export function createLayer(layerModel) {
                 break;
             }
             case "ogcapi": {
-                const ogcEndpoint = yield new OgcApiEndpoint(layerModel.url);
+                const ogcEndpoint = new OgcApiEndpoint(layerModel.url);
                 let layerUrl;
                 if (layerModel.useTiles) {
                     if (layerModel.useTiles === "vector") {

package/lib/map/create-map.test.ts

@@ -12,6 +12,7 @@ import {
   MAP_CTX_FIXTURE,
   MAP_CTX_LAYER_GEOJSON_FIXTURE,
   MAP_CTX_LAYER_GEOJSON_REMOTE_FIXTURE,
+  MAP_CTX_LAYER_MAPBLIBRE_STYLE_FIXTURE,
   MAP_CTX_LAYER_OGCAPI_FIXTURE,
   MAP_CTX_LAYER_WFS_FIXTURE,
   MAP_CTX_LAYER_WMS_FIXTURE,
@@ -32,6 +33,8 @@ import {
   resetMapFromContext,
 } from "./create-map";
 import WMTS from "ol/source/WMTS";
+import { VectorTile } from "ol/source";
+import { MapboxVectorLayer } from "ol-mapbox-style";
 
 describe("MapContextService", () => {
   describe("#createLayer", () => {
@@ -291,6 +294,26 @@ describe("MapContextService", () => {
         ]);
       });
     });
+
+    describe("Maplibre Style", () => {
+      beforeEach(async () => {
+        (layerModel = MAP_CTX_LAYER_MAPBLIBRE_STYLE_FIXTURE),
+          (layer = await createLayer(layerModel));
+      });
+      it("create a tile layer", () => {
+        expect(layer).toBeTruthy();
+        expect(layer).toBeInstanceOf(MapboxVectorLayer);
+      });
+      it("set correct layer properties", () => {
+        expect(layer.getVisible()).toBe(true);
+        expect(layer.getOpacity()).toBe(1);
+        expect(layer.get("label")).toBeUndefined();
+      });
+      it("create a Vector Tile source", () => {
+        const source = layer.getSource();
+        expect(source).toBeInstanceOf(VectorTile);
+      });
+    });
   });
 
   describe("#createView", () => {

package/lib/map/create-map.ts

@@ -27,6 +27,7 @@ import {
   WfsEndpoint,
   WmtsEndpoint,
 } from "@camptocamp/ogc-client";
+import { MapboxVectorLayer } from "ol-mapbox-style";
 
 const GEOJSON = new GeoJSON();
 const WFS_MAX_FEATURES = 10000;
@@ -112,6 +113,13 @@ export async function createLayer(layerModel: MapContextLayer): Promise<Layer> {
       layer = olLayer;
       break;
     }
+    case "maplibre-style": {
+      layer = new MapboxVectorLayer({
+        styleUrl: layerModel.styleUrl,
+        accessToken: layerModel.accessToken,
+      }) as unknown as Layer;
+      break;
+    }
     case "geojson": {
       if (layerModel.url !== undefined) {
         layer = new VectorLayer({
@@ -147,7 +155,7 @@ export async function createLayer(layerModel: MapContextLayer): Promise<Layer> {
       break;
     }
     case "ogcapi": {
-      const ogcEndpoint = await new OgcApiEndpoint(layerModel.url);
+      const ogcEndpoint = new OgcApiEndpoint(layerModel.url);
       let layerUrl: string;
       if (layerModel.useTiles) {
         if (layerModel.useTiles === "vector") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geospatial-sdk/openlayers",
-  "version": "0.0.5-dev.14+cde890f",
+  "version": "0.0.5-dev.16+4001375",
   "description": "OpenLayers-related utilities",
   "keywords": [
     "ol",
@@ -29,14 +29,15 @@
   },
   "devDependencies": {
     "@types/chroma-js": "^2.4.3",
-    "ol": "^8.2.0"
+    "ol": "^8.2.0",
+    "ol-mapbox-style": "^12.3.5"
   },
   "peerDependencies": {
     "ol": ">6.x"
   },
   "dependencies": {
-    "@geospatial-sdk/core": "^0.0.5-dev.14+cde890f",
+    "@geospatial-sdk/core": "^0.0.5-dev.16+4001375",
     "chroma-js": "^2.4.2"
   },
-  "gitHead": "cde890ff1c4f9dc9bb07b1c33bcbed68e06550c9"
+  "gitHead": "400137529b7bf0df095702ce7b899e0d51634c91"
 }