@geospatial-sdk/maplibre 0.0.5-dev.41 → 0.0.5-dev.42

package/dist/helpers/map.helpers.d.ts

@@ -1,5 +1,5 @@
 import { Map } from "maplibre-gl";
-import { Dataset, LayerContextWithStyle, LayerSpecificationWithSource } from "../maplibre.models";
+import { Dataset, LayerContextWithStyle, LayerSpecificationWithSource } from "../maplibre.models.js";
 import { FeatureCollection, Geometry } from "geojson";
 import { MapContextLayer } from "@geospatial-sdk/core";
 /**

package/dist/helpers/map.helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map.helpers.d.ts","sourceRoot":"","sources":["../../lib/helpers/map.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAsB,MAAM,aAAa,CAAC;AACtD,OAAO,EACL,OAAO,EACP,qBAAqB,EAErB,4BAA4B,EAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,QAWhE;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,qBAAqB,EACjC,OAAO,EAAE,iBAAiB,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,MAAM,EACpD,cAAc,EAAE,MAAM,GACrB,OAAO,CAuBT;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,MAAM,GACf,4BAA4B,EAAE,CAUhC;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAS1E;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,eAAe,UAS1D"}
+{"version":3,"file":"map.helpers.d.ts","sourceRoot":"","sources":["../../lib/helpers/map.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAsB,MAAM,aAAa,CAAC;AACtD,OAAO,EACL,OAAO,EACP,qBAAqB,EAErB,4BAA4B,EAC7B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,QAWhE;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,UAAU,EAAE,qBAAqB,EACjC,OAAO,EAAE,iBAAiB,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,MAAM,EACpD,cAAc,EAAE,MAAM,GACrB,OAAO,CAuBT;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,MAAM,GACf,4BAA4B,EAAE,CAUhC;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAS1E;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,eAAe,UAS1D"}

package/dist/helpers/map.helpers.js

@@ -1,5 +1,5 @@
-import { contextStyleToMaplibreLayers } from "./style.helpers";
-import { getHash } from "@geospatial-sdk/core/dist/utils/hash";
+import { contextStyleToMaplibreLayers } from "./style.helpers.js";
+import { getHash } from "@geospatial-sdk/core/dist/utils/hash.js";
 /**
  * Remove all layers from a given source in the map.
  * @param map
@@ -22,11 +22,17 @@ export function removeLayersFromSource(map, sourceId) {
 export function createDatasetFromGeoJsonLayer(layerModel, geojson, sourcePosition) {
     const sourceId = generateLayerId(layerModel);
     const partialLayers = contextStyleToMaplibreLayers(layerModel.style);
-    const layers = partialLayers.map((layer) => (Object.assign(Object.assign({}, layer), { id: `${sourceId}-${layer.type}`, source: sourceId, layout: {
+    const layers = partialLayers.map((layer) => ({
+        ...layer,
+        id: `${sourceId}-${layer.type}`,
+        source: sourceId,
+        layout: {
             visibility: layerModel.visibility === false ? "none" : "visible",
-        }, metadata: {
+        },
+        metadata: {
             sourcePosition,
-        } })));
+        },
+    }));
     return {
         sources: {
             [sourceId]: {
@@ -40,11 +46,8 @@ export function createDatasetFromGeoJsonLayer(layerModel, geojson, sourcePositio
 export function getLayersAtPosition(map, position) {
     const layers = map.getStyle().layers;
     const layersWithSource = layers.filter((layer) => layer.type !== "background");
-    return layersWithSource.filter((layer) => {
-        var _a;
-        return ((_a = layer.metadata) === null || _a === void 0 ? void 0 : _a.sourcePosition) ===
-            position;
-    });
+    return layersWithSource.filter((layer) => layer.metadata?.sourcePosition ===
+        position);
 }
 export function getBeforeId(map, position) {
     const beforeLayer = map

package/dist/helpers/style.helpers.d.ts

@@ -1,4 +1,4 @@
-import { VectorStyle } from "@geospatial-sdk/core/dist/model/style";
+import { VectorStyle } from "@geospatial-sdk/core/dist/model/style.js";
 import { LayerSpecification } from "maplibre-gl";
 export declare function contextStyleToMaplibreLayers(style?: VectorStyle): Partial<LayerSpecification>[];
 //# sourceMappingURL=style.helpers.d.ts.map

package/dist/helpers/style.helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"style.helpers.d.ts","sourceRoot":"","sources":["../../lib/helpers/style.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAajD,wBAAgB,4BAA4B,CAC1C,KAAK,GAAE,WAAgB,GACtB,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAmD/B"}
+{"version":3,"file":"style.helpers.d.ts","sourceRoot":"","sources":["../../lib/helpers/style.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0CAA0C,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAajD,wBAAgB,4BAA4B,CAC1C,KAAK,GAAE,WAAgB,GACtB,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAmD/B"}

package/dist/helpers/style.helpers.js

@@ -18,7 +18,7 @@ export function contextStyleToMaplibreLayers(style = {}) {
             return contextStyleToMaplibreLayers(style_);
         });
     }
-    style = Object.assign(Object.assign({}, defaultOltStyle), style);
+    style = { ...defaultOltStyle, ...style };
     if (style["fill-color"]) {
         layers.push({
             type: "fill",
@@ -31,11 +31,15 @@ export function contextStyleToMaplibreLayers(style = {}) {
     if (style["stroke-color"] || style["stroke-width"]) {
         layers.push({
             type: "line",
-            paint: Object.assign(Object.assign({ "line-color": style["stroke-color"] }, (style["stroke-width"] !== undefined && {
-                "line-width": style["stroke-width"],
-            })), (style["stroke-line-dash"] !== undefined && {
-                "line-dasharray": style["stroke-line-dash"],
-            })),
+            paint: {
+                "line-color": style["stroke-color"],
+                ...(style["stroke-width"] !== undefined && {
+                    "line-width": style["stroke-width"],
+                }),
+                ...(style["stroke-line-dash"] !== undefined && {
+                    "line-dasharray": style["stroke-line-dash"],
+                }),
+            },
         });
     }
     if (style["circle-radius"]) {

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export * from "./map";
-export * from "./maplibre.models";
+export * from "./map/index.js";
+export * from "./maplibre.models.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC"}

package/dist/index.js

@@ -1,2 +1,2 @@
-export * from "./map";
-export * from "./maplibre.models";
+export * from "./map/index.js";
+export * from "./maplibre.models.js";

package/dist/map/apply-context-diff.js

@@ -1,71 +1,60 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { createLayer } from "./create-map";
-import { generateLayerId, getBeforeId, getLayersAtPosition, removeLayersFromSource, } from "../helpers/map.helpers";
+import { createLayer } from "./create-map.js";
+import { generateLayerId, getBeforeId, getLayersAtPosition, removeLayersFromSource, } from "../helpers/map.helpers.js";
 /**
  * Apply a context diff to an MapLibre map
  * @param map
  * @param contextDiff
  */
-export function applyContextDiffToMap(map, contextDiff) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // removed layers (sorted by descending position)
-        if (contextDiff.layersRemoved.length > 0) {
-            const removed = contextDiff.layersRemoved.sort((a, b) => b.position - a.position);
-            for (const layerRemoved of removed) {
-                const mlLayers = getLayersAtPosition(map, layerRemoved.position);
-                if (mlLayers.length === 0) {
-                    console.warn(`[Warning] applyContextDiffToMap: no layer found at position ${layerRemoved.position} to remove.`);
-                    continue;
-                }
-                const sourceId = mlLayers[0].source;
-                mlLayers.forEach((layer) => {
-                    map.removeLayer(layer.id);
-                });
-                map.removeSource(sourceId);
+export async function applyContextDiffToMap(map, contextDiff) {
+    // removed layers (sorted by descending position)
+    if (contextDiff.layersRemoved.length > 0) {
+        const removed = contextDiff.layersRemoved.sort((a, b) => b.position - a.position);
+        for (const layerRemoved of removed) {
+            const mlLayers = getLayersAtPosition(map, layerRemoved.position);
+            if (mlLayers.length === 0) {
+                console.warn(`[Warning] applyContextDiffToMap: no layer found at position ${layerRemoved.position} to remove.`);
+                continue;
             }
+            const sourceId = mlLayers[0].source;
+            mlLayers.forEach((layer) => {
+                map.removeLayer(layer.id);
+            });
+            map.removeSource(sourceId);
         }
-        // insert added layers
-        const newLayers = yield Promise.all(contextDiff.layersAdded.map((layerAdded) => createLayer(layerAdded.layer, layerAdded.position)));
-        newLayers.forEach((style, index) => {
-            const position = contextDiff.layersAdded[index].position;
-            const beforeId = getBeforeId(map, position);
-            Object.keys(style.sources).forEach((sourceId) => map.addSource(sourceId, style.sources[sourceId]));
-            style.layers.map((layer) => {
+    }
+    // insert added layers
+    const newLayers = await Promise.all(contextDiff.layersAdded.map((layerAdded) => createLayer(layerAdded.layer, layerAdded.position)));
+    newLayers.forEach((style, index) => {
+        const position = contextDiff.layersAdded[index].position;
+        const beforeId = getBeforeId(map, position);
+        Object.keys(style.sources).forEach((sourceId) => map.addSource(sourceId, style.sources[sourceId]));
+        style.layers.map((layer) => {
+            map.addLayer(layer, beforeId);
+        });
+    });
+    // recreate changed layers
+    for (const layerChanged of contextDiff.layersChanged) {
+        const { layer, position } = layerChanged;
+        const sourceId = generateLayerId(layer);
+        removeLayersFromSource(map, sourceId);
+        const beforeId = getBeforeId(map, position);
+        createLayer(layer, position).then((styleDiff) => {
+            styleDiff.layers.map((layer) => {
                 map.addLayer(layer, beforeId);
             });
         });
-        // recreate changed layers
-        for (const layerChanged of contextDiff.layersChanged) {
-            const { layer, position } = layerChanged;
-            const sourceId = generateLayerId(layer);
-            removeLayersFromSource(map, sourceId);
-            const beforeId = getBeforeId(map, position);
-            createLayer(layer, position).then((styleDiff) => {
-                styleDiff.layers.map((layer) => {
-                    map.addLayer(layer, beforeId);
-                });
+    }
+    if (typeof contextDiff.viewChanges !== "undefined") {
+        const { viewChanges } = contextDiff;
+        if (viewChanges && "extent" in viewChanges) {
+            const { extent } = viewChanges;
+            map.fitBounds([
+                [extent[0], extent[1]],
+                [extent[2], extent[3]],
+            ], {
+                padding: 20,
+                duration: 1000,
             });
         }
-        if (typeof contextDiff.viewChanges !== "undefined") {
-            const { viewChanges } = contextDiff;
-            if (viewChanges && "extent" in viewChanges) {
-                const { extent } = viewChanges;
-                map.fitBounds([
-                    [extent[0], extent[1]],
-                    [extent[2], extent[3]],
-                ], {
-                    padding: 20,
-                    duration: 1000,
-                });
-            }
-        }
-    });
+    }
 }

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

@@ -1,6 +1,6 @@
 import { MapContext, MapContextLayer } from "@geospatial-sdk/core";
 import { Map, MapOptions } from "maplibre-gl";
-import { PartialStyleSpecification } from "../maplibre.models";
+import { PartialStyleSpecification } from "../maplibre.models.js";
 export declare function createLayer(layerModel: MapContextLayer, sourcePosition: number): Promise<PartialStyleSpecification>;
 /**
  * Create an Maplibre map from a context; optionally specify a target (root element) for the map

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,EAGhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,GAAG,EACH,UAAU,EAEX,MAAM,aAAa,CAAC;AAWrB,OAAO,EAAW,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAOxE,wBAAsB,WAAW,CAC/B,UAAU,EAAE,eAAe,EAC3B,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,yBAAyB,CAAC,CAgGpC;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,GAAG,CAAC,CAGd;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,GAAG,CAAC,CAoBd"}
+{"version":3,"file":"create-map.d.ts","sourceRoot":"","sources":["../../lib/map/create-map.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,eAAe,EAGhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAEL,GAAG,EACH,UAAU,EAEX,MAAM,aAAa,CAAC;AAWrB,OAAO,EAAW,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAO3E,wBAAsB,WAAW,CAC/B,UAAU,EAAE,eAAe,EAC3B,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,yBAAyB,CAAC,CAgGpC;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,UAAU,EACnB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,GAAG,CAAC,CAGd;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,GAAG,CAAC,CAoBd"}

package/dist/map/create-map.js

@@ -1,144 +1,128 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { removeSearchParams, } from "@geospatial-sdk/core";
 import { Map, } from "maplibre-gl";
 import { OgcApiEndpoint, WfsEndpoint, WmsEndpoint, } from "@camptocamp/ogc-client";
-import { createDatasetFromGeoJsonLayer, generateLayerId, } from "../helpers/map.helpers";
+import { createDatasetFromGeoJsonLayer, generateLayerId, } from "../helpers/map.helpers.js";
 const featureCollection = {
     type: "FeatureCollection",
     features: [],
 };
-export function createLayer(layerModel, sourcePosition) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const { type } = layerModel;
-        switch (type) {
-            case "wms": {
-                const layerId = generateLayerId(layerModel);
-                const sourceId = layerId;
-                const endpoint = yield new WmsEndpoint(layerModel.url).isReady();
-                let url = endpoint.getMapUrl([layerModel.name], {
-                    widthPx: 256,
-                    heightPx: 256,
-                    extent: [0, 0, 0, 0], // will be replaced by maplibre-gl
-                    outputFormat: "image/png",
-                    crs: "EPSG:3857",
-                });
-                url = removeSearchParams(url, ["bbox"]);
-                url = `${url.toString()}&BBOX={bbox-epsg-3857}`;
-                const dataset = {
-                    sources: {
-                        [sourceId]: {
-                            type: "raster",
-                            tiles: [url],
-                            tileSize: 256,
-                        },
+export async function createLayer(layerModel, sourcePosition) {
+    const { type } = layerModel;
+    switch (type) {
+        case "wms": {
+            const layerId = generateLayerId(layerModel);
+            const sourceId = layerId;
+            const endpoint = await new WmsEndpoint(layerModel.url).isReady();
+            let url = endpoint.getMapUrl([layerModel.name], {
+                widthPx: 256,
+                heightPx: 256,
+                extent: [0, 0, 0, 0], // will be replaced by maplibre-gl
+                outputFormat: "image/png",
+                crs: "EPSG:3857",
+            });
+            url = removeSearchParams(url, ["bbox"]);
+            url = `${url.toString()}&BBOX={bbox-epsg-3857}`;
+            const dataset = {
+                sources: {
+                    [sourceId]: {
+                        type: "raster",
+                        tiles: [url],
+                        tileSize: 256,
                     },
-                    layers: [
-                        {
-                            id: layerId,
-                            type: "raster",
-                            source: sourceId,
-                            paint: {},
-                            metadata: {
-                                sourcePosition,
-                            },
+                },
+                layers: [
+                    {
+                        id: layerId,
+                        type: "raster",
+                        source: sourceId,
+                        paint: {},
+                        metadata: {
+                            sourcePosition,
                         },
-                    ],
-                };
-                return dataset;
-            }
-            case "wfs": {
-                const entryPoint = yield new WfsEndpoint(layerModel.url).isReady();
-                const url = entryPoint.getFeatureUrl(layerModel.featureType, {
-                    asJson: true,
-                    outputCrs: "EPSG:4326",
-                });
-                return createDatasetFromGeoJsonLayer(layerModel, url, sourcePosition);
+                    },
+                ],
+            };
+            return dataset;
+        }
+        case "wfs": {
+            const entryPoint = await new WfsEndpoint(layerModel.url).isReady();
+            const url = entryPoint.getFeatureUrl(layerModel.featureType, {
+                asJson: true,
+                outputCrs: "EPSG:4326",
+            });
+            return createDatasetFromGeoJsonLayer(layerModel, url, sourcePosition);
+        }
+        case "geojson": {
+            let geojson;
+            if (layerModel.url !== undefined) {
+                geojson = layerModel.url;
             }
-            case "geojson": {
-                let geojson;
-                if (layerModel.url !== undefined) {
-                    geojson = layerModel.url;
-                }
-                else {
-                    const data = layerModel.data;
-                    if (typeof data === "string") {
-                        try {
-                            geojson = JSON.parse(data);
-                        }
-                        catch (e) {
-                            console.warn("A layer could not be created", layerModel, e);
-                            geojson = featureCollection;
-                        }
+            else {
+                const data = layerModel.data;
+                if (typeof data === "string") {
+                    try {
+                        geojson = JSON.parse(data);
                     }
-                    else {
-                        geojson = data;
+                    catch (e) {
+                        console.warn("A layer could not be created", layerModel, e);
+                        geojson = featureCollection;
                     }
                 }
-                return createDatasetFromGeoJsonLayer(layerModel, geojson, sourcePosition);
-            }
-            case "ogcapi": {
-                const ogcEndpoint = new OgcApiEndpoint(layerModel.url);
-                let layerUrl;
-                if (layerModel.useTiles) {
-                    console.warn("[Warning] OGC API - Tiles not yet implemented.");
-                }
                 else {
-                    layerUrl = yield ogcEndpoint.getCollectionItemsUrl(layerModel.collection, Object.assign(Object.assign({}, layerModel.options), { asJson: true }));
-                    return createDatasetFromGeoJsonLayer(layerModel, layerUrl, sourcePosition);
+                    geojson = data;
                 }
-                break;
             }
-            case "maplibre-style": {
-                console.warn("[Warning] Maplibre style - Not yet fully implemented.");
-                const style = yield fetch(layerModel.styleUrl).then((res) => res.json());
-                (_a = style.layers) === null || _a === void 0 ? void 0 : _a.forEach((layer) => (layer.metadata = { sourcePosition }));
-                return style;
+            return createDatasetFromGeoJsonLayer(layerModel, geojson, sourcePosition);
+        }
+        case "ogcapi": {
+            const ogcEndpoint = new OgcApiEndpoint(layerModel.url);
+            let layerUrl;
+            if (layerModel.useTiles) {
+                console.warn("[Warning] OGC API - Tiles not yet implemented.");
+            }
+            else {
+                layerUrl = await ogcEndpoint.getCollectionItemsUrl(layerModel.collection, { ...layerModel.options, asJson: true });
+                return createDatasetFromGeoJsonLayer(layerModel, layerUrl, sourcePosition);
             }
+            break;
         }
-        return {};
-    });
+        case "maplibre-style": {
+            console.warn("[Warning] Maplibre style - Not yet fully implemented.");
+            const style = await fetch(layerModel.styleUrl).then((res) => res.json());
+            style.layers?.forEach((layer) => (layer.metadata = { sourcePosition }));
+            return style;
+        }
+    }
+    return {};
 }
 /**
  * Create an Maplibre map from a context; optionally specify a target (root element) for the map
  * @param context
  * @param target
  */
-export function createMapFromContext(context, mapOptions) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const map = new Map(mapOptions);
-        return yield resetMapFromContext(map, context);
-    });
+export async function createMapFromContext(context, mapOptions) {
+    const map = new Map(mapOptions);
+    return await resetMapFromContext(map, context);
 }
 /**
  * Resets a Maplibre map from a context; existing content will be cleared
  * @param map
  * @param context
  */
-export function resetMapFromContext(map, context) {
-    return __awaiter(this, void 0, void 0, function* () {
-        map.setZoom(context.view.zoom);
-        map.setCenter(context.view.center);
-        for (let i = 0; i < context.layers.length; i++) {
-            const layerModel = context.layers[i];
-            const partialMLStyle = yield createLayer(layerModel, i);
-            if (partialMLStyle.glyphs) {
-                map.setGlyphs(partialMLStyle.glyphs);
-            }
-            if (partialMLStyle.sprite) {
-                map.setSprite(partialMLStyle.sprite);
-            }
-            Object.keys(partialMLStyle.sources).forEach((sourceId) => map.addSource(sourceId, partialMLStyle.sources[sourceId]));
-            partialMLStyle.layers.map((layer) => map.addLayer(layer));
+export async function resetMapFromContext(map, context) {
+    map.setZoom(context.view.zoom);
+    map.setCenter(context.view.center);
+    for (let i = 0; i < context.layers.length; i++) {
+        const layerModel = context.layers[i];
+        const partialMLStyle = await createLayer(layerModel, i);
+        if (partialMLStyle.glyphs) {
+            map.setGlyphs(partialMLStyle.glyphs);
+        }
+        if (partialMLStyle.sprite) {
+            map.setSprite(partialMLStyle.sprite);
         }
-        return map;
-    });
+        Object.keys(partialMLStyle.sources).forEach((sourceId) => map.addSource(sourceId, partialMLStyle.sources[sourceId]));
+        partialMLStyle.layers.map((layer) => map.addLayer(layer));
+    }
+    return map;
 }

package/dist/map/index.d.ts

@@ -1,3 +1,3 @@
-export { createMapFromContext, resetMapFromContext } from "./create-map";
-export { applyContextDiffToMap } from "./apply-context-diff";
+export { createMapFromContext, resetMapFromContext } from "./create-map.js";
+export { applyContextDiffToMap } from "./apply-context-diff.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/map/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/map/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/map/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC"}

package/dist/map/index.js

@@ -1,2 +1,2 @@
-export { createMapFromContext, resetMapFromContext } from "./create-map";
-export { applyContextDiffToMap } from "./apply-context-diff";
+export { createMapFromContext, resetMapFromContext } from "./create-map.js";
+export { applyContextDiffToMap } from "./apply-context-diff.js";

package/lib/helpers/map.helpers.ts

@@ -4,10 +4,10 @@ import {
   LayerContextWithStyle,
   LayerMetadataSpecification,
   LayerSpecificationWithSource,
-} from "../maplibre.models";
+} from "../maplibre.models.js";
 import { FeatureCollection, Geometry } from "geojson";
-import { contextStyleToMaplibreLayers } from "./style.helpers";
-import { getHash } from "@geospatial-sdk/core/dist/utils/hash";
+import { contextStyleToMaplibreLayers } from "./style.helpers.js";
+import { getHash } from "@geospatial-sdk/core/dist/utils/hash.js";
 import { MapContextLayer } from "@geospatial-sdk/core";
 
 /**

package/lib/helpers/style.helpers.ts

@@ -1,6 +1,6 @@
-import { VectorStyle } from "@geospatial-sdk/core/dist/model/style";
+import { VectorStyle } from "@geospatial-sdk/core/dist/model/style.js";
 import { LayerSpecification } from "maplibre-gl";
-import { FlatFill, FlatStyle, Rule } from "ol/style/flat";
+import { FlatFill, FlatStyle, Rule } from "ol/style/flat.js";
 
 const defaultOltStyle: FlatStyle = {
   "fill-color": "rgba(255,255,255,0.4)",

package/lib/index.ts

@@ -1,2 +1,2 @@
-export * from "./map";
-export * from "./maplibre.models";
+export * from "./map/index.js";
+export * from "./maplibre.models.js";

package/lib/map/apply-context-diff.ts

@@ -1,12 +1,12 @@
 import { MapContextDiff } from "@geospatial-sdk/core";
 import { Map } from "maplibre-gl";
-import { createLayer } from "./create-map";
+import { createLayer } from "./create-map.js";
 import {
   generateLayerId,
   getBeforeId,
   getLayersAtPosition,
   removeLayersFromSource,
-} from "../helpers/map.helpers";
+} from "../helpers/map.helpers.js";
 
 /**
  * Apply a context diff to an MapLibre map
@@ -44,13 +44,13 @@ export async function applyContextDiffToMap(
       createLayer(layerAdded.layer, layerAdded.position),
     ),
   );
-  newLayers.forEach((style, index) => {
+  newLayers.forEach((style: any, index: any) => {
     const position = contextDiff.layersAdded[index].position;
     const beforeId = getBeforeId(map, position);
     Object.keys(style.sources).forEach((sourceId) =>
       map.addSource(sourceId, style.sources[sourceId]),
     );
-    style.layers.map((layer) => {
+    style.layers.map((layer: any) => {
       map.addLayer(layer, beforeId);
     });
   });
@@ -62,7 +62,7 @@ export async function applyContextDiffToMap(
     removeLayersFromSource(map, sourceId);
     const beforeId = getBeforeId(map, position);
     createLayer(layer, position).then((styleDiff) => {
-      styleDiff.layers.map((layer) => {
+      styleDiff.layers.map((layer: any) => {
         map.addLayer(layer, beforeId);
       });
     });

package/lib/map/create-map.ts

@@ -20,8 +20,8 @@ import {
 import {
   createDatasetFromGeoJsonLayer,
   generateLayerId,
-} from "../helpers/map.helpers";
-import { Dataset, PartialStyleSpecification } from "../maplibre.models";
+} from "../helpers/map.helpers.js";
+import { Dataset, PartialStyleSpecification } from "../maplibre.models.js";
 
 const featureCollection: FeatureCollection<Geometry | null> = {
   type: "FeatureCollection",

package/lib/map/index.ts

@@ -1,2 +1,2 @@
-export { createMapFromContext, resetMapFromContext } from "./create-map";
-export { applyContextDiffToMap } from "./apply-context-diff";
+export { createMapFromContext, resetMapFromContext } from "./create-map.js";
+export { applyContextDiffToMap } from "./apply-context-diff.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geospatial-sdk/maplibre",
-  "version": "0.0.5-dev.41+dba0603",
+  "version": "0.0.5-dev.42+baa75c1",
   "description": "Maplibre-related utilities",
   "keywords": [
     "maplibre",
@@ -33,7 +33,7 @@
     "maplibre-gl": "^5.7.3"
   },
   "dependencies": {
-    "@geospatial-sdk/core": "^0.0.5-dev.41+dba0603"
+    "@geospatial-sdk/core": "^0.0.5-dev.42+baa75c1"
   },
-  "gitHead": "dba060374167251ca486946c95e8a885c121ccd5"
+  "gitHead": "baa75c1fed77ed160f6a2d94bfeb5358cc91d63a"
 }