@geospatial-sdk/openlayers 0.0.5-dev.55 → 0.0.5-dev.57

package/dist/map/apply-context-diff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apply-context-diff.d.ts","sourceRoot":"","sources":["../../lib/map/apply-context-diff.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,WAAW,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAQtD;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,cAAc,GAC1B,OAAO,CAAC,GAAG,CAAC,CA6Fd"}
+{"version":3,"file":"apply-context-diff.d.ts","sourceRoot":"","sources":["../../lib/map/apply-context-diff.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,WAAW,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAStD;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,cAAc,GAC1B,OAAO,CAAC,GAAG,CAAC,CAuGd"}

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

@@ -1,6 +1,7 @@
 import { createLayer, createView, updateLayerInMap } from "./create-map.js";
 import { fromLonLat, transformExtent } from "ol/proj.js";
 import GeoJSON from "ol/format/GeoJSON.js";
+import { propagateLayerStateChangeEventToMap } from "./register-events.js";
 const GEOJSON = new GeoJSON();
 /**
  * Apply a context diff to an OpenLayers map
@@ -20,6 +21,9 @@ export async function applyContextDiffToMap(map, contextDiff) {
     // insert added layers
     const newLayers = await Promise.all(contextDiff.layersAdded.map((layerAdded) => createLayer(layerAdded.layer)));
     newLayers.forEach((layer, index) => {
+        if (!layer) {
+            return;
+        }
         const position = contextDiff.layersAdded[index].position;
         if (position >= layers.getLength()) {
             layers.push(layer);
@@ -27,6 +31,7 @@ export async function applyContextDiffToMap(map, contextDiff) {
         else {
             layers.insertAt(position, layer);
         }
+        propagateLayerStateChangeEventToMap(map, layer);
     });
     // move reordered layers (sorted by ascending new position)
     if (contextDiff.layersReordered.length > 0) {
@@ -39,8 +44,9 @@ export async function applyContextDiffToMap(map, contextDiff) {
         map.setLayers([...layersArray]);
     }
     // update or recreate changed layers
+    const updatePromises = [];
     for (const layerChanged of contextDiff.layersChanged) {
-        updateLayerInMap(map, layerChanged.layer, layerChanged.position, layerChanged.previousLayer);
+        updatePromises.push(updateLayerInMap(map, layerChanged.layer, layerChanged.position, layerChanged.previousLayer));
     }
     if (typeof contextDiff.viewChanges !== "undefined") {
         const { viewChanges } = contextDiff;
@@ -82,5 +88,7 @@ export async function applyContextDiffToMap(map, contextDiff) {
             // }
         }
     }
+    // wait for all layers to have been updated
+    await Promise.all(updatePromises);
     return map;
 }

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

@@ -3,7 +3,7 @@ import Map from "ol/Map.js";
 import View from "ol/View.js";
 import Layer from "ol/layer/Layer.js";
 export declare function createLayer(layerModel: MapContextLayer): Promise<Layer>;
-export declare function updateLayerInMap(map: Map, layerModel: MapContextLayer, layerPosition: number, previousLayerModel: MapContextLayer): void;
+export declare function updateLayerInMap(map: Map, layerModel: MapContextLayer, layerPosition: number, previousLayerModel: MapContextLayer): Promise<void>;
 export declare function createView(viewModel: MapContextView | null, map: Map): View;
 /**
  * Create an OpenLayers 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,EAEL,UAAU,EACV,eAAe,EACf,cAAc,EAEf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,GAAG,MAAM,WAAW,CAAC;AAC5B,OAAO,IAAI,MAAM,YAAY,CAAC;AAC9B,OAAO,KAAK,MAAM,mBAAmB,CAAC;AA8CtC,wBAAsB,WAAW,CAAC,UAAU,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAmO7E;AAED,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,eAAe,EAC3B,aAAa,EAAE,MAAM,EACrB,kBAAkB,EAAE,eAAe,QAgBpC;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CAkC3E;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,CASd"}
+{"version":3,"file":"create-map.d.ts","sourceRoot":"","sources":["../../lib/map/create-map.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,eAAe,EACf,cAAc,EAEf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,GAAG,MAAM,WAAW,CAAC;AAC5B,OAAO,IAAI,MAAM,YAAY,CAAC;AAC9B,OAAO,KAAK,MAAM,mBAAmB,CAAC;AA0DtC,wBAAsB,WAAW,CAAC,UAAU,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAgR7E;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,eAAe,EAC3B,aAAa,EAAE,MAAM,EACrB,kBAAkB,EAAE,eAAe,GAClC,OAAO,CAAC,IAAI,CAAC,CAgBf;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,IAAI,CAkC3E;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,CAUd"}

package/dist/map/create-map.js

@@ -14,9 +14,9 @@ import OGCMapTile from "ol/source/OGCMapTile.js";
 import OGCVectorTile from "ol/source/OGCVectorTile.js";
 import WMTS from "ol/source/WMTS.js";
 import MVT from "ol/format/MVT.js";
-import { OgcApiEndpoint, WfsEndpoint, WmtsEndpoint, } from "@camptocamp/ogc-client";
+import { EndpointError, OgcApiEndpoint, WfsEndpoint, WmtsEndpoint, } from "@camptocamp/ogc-client";
 import { MapboxVectorLayer } from "ol-mapbox-style";
-import { handleEndpointError, tileLoadErrorCatchFunction, } from "./handle-errors.js";
+import { tileLoadErrorCatchFunction } from "./handle-errors.js";
 import VectorTile from "ol/source/VectorTile.js";
 import GeoTIFF from "ol/source/GeoTIFF.js";
 import WebGLTileLayer from "ol/layer/WebGLTile.js";
@@ -24,11 +24,19 @@ import proj4 from "proj4";
 import { register } from "ol/proj/proj4.js";
 import { canDoIncrementalUpdate, updateLayerProperties, } from "./layer-update.js";
 import { initHoverLayer } from "./feature-hover.js";
+import { emitLayerCreationError, emitLayerLoadingError, emitLayerLoadingStatusSuccess, propagateLayerStateChangeEventToMap, } from "./register-events.js";
+import { GEOSPATIAL_SDK_PREFIX } from "./constants.js";
+import ImageLayer from "ol/layer/Image.js";
+import ImageWMS from "ol/source/ImageWMS.js";
 // Register proj4 with OpenLayers so that arbitrary EPSG codes
 // (e.g., UTM zones from GeoTIFF metadata) can be reprojected to the map projection
 register(proj4);
 const GEOJSON = new GeoJSON();
 const WFS_MAX_FEATURES = 10000;
+// We need to defer some events being dispatched to make sure they are caught by the map
+// where the layers sit
+// FIXME: this should be better handled in a separate module!
+const defer = () => new Promise((resolve) => setTimeout(resolve, 0));
 export async function createLayer(layerModel) {
     const { type } = layerModel;
     let layer;
@@ -55,24 +63,39 @@ export async function createLayer(layerModel) {
                     });
                     layer.setSource(source);
                 }
+                defer().then(() => emitLayerLoadingStatusSuccess(layer));
             }
             break;
         case "wms":
             {
-                layer = new TileLayer({});
-                const source = new TileWMS({
-                    url: removeSearchParams(layerModel.url, ["request", "service"]),
-                    params: {
-                        LAYERS: layerModel.name,
-                        ...(layerModel.style && { STYLES: layerModel.style }),
-                    },
-                    gutter: 20,
-                    attributions: layerModel.attributions,
-                });
-                source.setTileLoadFunction(function (tile, src) {
-                    return tileLoadErrorCatchFunction(layer, tile, src);
-                });
-                layer.setSource(source);
+                const url = removeSearchParams(layerModel.url, ["request", "service"]);
+                const params = {
+                    LAYERS: layerModel.name,
+                    ...(layerModel.style && { STYLES: layerModel.style }),
+                };
+                if (layerModel.useTiles === false) {
+                    layer = new ImageLayer({
+                        source: new ImageWMS({
+                            url,
+                            params,
+                            attributions: layerModel.attributions,
+                        }),
+                    });
+                }
+                else {
+                    layer = new TileLayer({
+                        source: new TileWMS({
+                            url,
+                            params: { ...params, TILED: true },
+                            gutter: 20,
+                            attributions: layerModel.attributions,
+                            tileLoadFunction: function (tile, src) {
+                                return tileLoadErrorCatchFunction(layer, tile, src);
+                            },
+                        }),
+                    });
+                }
+                defer().then(() => emitLayerLoadingStatusSuccess(layer));
             }
             break;
         case "wmts": {
@@ -104,10 +127,13 @@ export async function createLayer(layerModel) {
                     attributions: layerModel.attributions,
                 }));
             })
+                .then(() => emitLayerLoadingStatusSuccess(olLayer))
                 .catch((e) => {
-                handleEndpointError(olLayer, e);
+                const httpStatus = e instanceof EndpointError ? e.httpStatus : undefined;
+                emitLayerLoadingError(olLayer, e, httpStatus);
             });
-            return olLayer;
+            layer = olLayer;
+            break;
         }
         case "wfs": {
             const olLayer = new VectorLayer({
@@ -132,8 +158,10 @@ export async function createLayer(layerModel) {
                     attributions: layerModel.attributions,
                 }));
             })
+                .then(() => emitLayerLoadingStatusSuccess(olLayer))
                 .catch((e) => {
-                handleEndpointError(olLayer, e);
+                const httpStatus = e instanceof EndpointError ? e.httpStatus : undefined;
+                emitLayerLoadingError(olLayer, e, httpStatus);
             });
             layer = olLayer;
             break;
@@ -143,17 +171,19 @@ export async function createLayer(layerModel) {
                 styleUrl: layerModel.styleUrl,
                 accessToken: layerModel.accessToken,
             });
+            defer().then(() => emitLayerLoadingStatusSuccess(layer));
             break;
         }
         case "geojson": {
+            layer = new VectorLayer({
+                style: layerModel.style ?? defaultStyle,
+            });
+            let source;
             if (layerModel.url !== undefined) {
-                layer = new VectorLayer({
-                    source: new VectorSource({
-                        format: new GeoJSON(),
-                        url: layerModel.url,
-                        attributions: layerModel.attributions,
-                    }),
-                    style: layerModel.style ?? defaultStyle,
+                source = new VectorSource({
+                    format: new GeoJSON(),
+                    url: layerModel.url,
+                    attributions: layerModel.attributions,
                 });
             }
             else {
@@ -171,14 +201,14 @@ export async function createLayer(layerModel) {
                     featureProjection: "EPSG:3857",
                     dataProjection: "EPSG:4326",
                 });
-                layer = new VectorLayer({
-                    source: new VectorSource({
-                        features,
-                        attributions: layerModel.attributions,
-                    }),
-                    style: layerModel.style ?? defaultStyle,
+                source = new VectorSource({
+                    features,
+                    attributions: layerModel.attributions,
                 });
             }
+            layer.setSource(source);
+            // FIXME: actually track layer loading and data info
+            defer().then(() => emitLayerLoadingStatusSuccess(layer));
             break;
         }
         case "ogcapi": {
@@ -207,15 +237,18 @@ export async function createLayer(layerModel) {
             }
             else {
                 layerUrl = await ogcEndpoint.getCollectionItemsUrl(layerModel.collection, layerModel.options);
+                const source = new VectorSource({
+                    format: new GeoJSON(),
+                    url: layerUrl,
+                    attributions: layerModel.attributions,
+                });
                 layer = new VectorLayer({
-                    source: new VectorSource({
-                        format: new GeoJSON(),
-                        url: layerUrl,
-                        attributions: layerModel.attributions,
-                    }),
+                    source,
                     style: layerModel.style ?? defaultStyle,
                 });
             }
+            // FIXME: actually track layer loading
+            defer().then(() => emitLayerLoadingStatusSuccess(layer));
             break;
         }
         case "geotiff": {
@@ -226,18 +259,24 @@ export async function createLayer(layerModel) {
             layer = new WebGLTileLayer({
                 source: geoTiffSource,
             });
+            // FIXME: actually track tile loading
+            defer().then(() => emitLayerLoadingStatusSuccess(layer));
             break;
         }
-        default:
-            throw new Error(`Unrecognized layer type: ${JSON.stringify(layerModel)}`);
-    }
-    if (!layer) {
-        throw new Error(`Layer could not be created for type: ${layerModel.type}`);
+        default: {
+            // we create an empty placeholder layer so that we still have a corresponding layer in OL
+            layer = new VectorLayer({
+                properties: {
+                    [`${GEOSPATIAL_SDK_PREFIX}layer-with-error`]: true,
+                },
+            });
+            defer().then(() => emitLayerCreationError(layer, new Error(`Unrecognized layer type: ${JSON.stringify(layerModel)}`)));
+        }
     }
     updateLayerProperties(layerModel, layer);
     return layer;
 }
-export function updateLayerInMap(map, layerModel, layerPosition, previousLayerModel) {
+export async function updateLayerInMap(map, layerModel, layerPosition, previousLayerModel) {
     const layers = map.getLayers();
     const updatedLayer = layers.item(layerPosition);
     // if an incremental update is possible, do it to avoid costly layer recreation
@@ -247,8 +286,9 @@ export function updateLayerInMap(map, layerModel, layerPosition, previousLayerMo
     }
     // dispose and recreate layer
     updatedLayer.dispose();
-    createLayer(layerModel).then((layer) => {
+    await createLayer(layerModel).then((layer) => {
         layers.setAt(layerPosition, layer);
+        propagateLayerStateChangeEventToMap(map, layer);
     });
 }
 export function createView(viewModel, map) {
@@ -307,6 +347,7 @@ export async function resetMapFromContext(map, context) {
     for (const layerModel of context.layers) {
         const layer = await createLayer(layerModel);
         map.addLayer(layer);
+        propagateLayerStateChangeEventToMap(map, layer);
     }
     initHoverLayer(map);
     return map;

package/dist/map/feature-hover.js

@@ -72,7 +72,7 @@ export function initHoverLayer(map) {
             const featuresByLayer = await readFeaturesAtPixel(map, event, layerFilter);
             const features = Array.from(featuresByLayer.values()).flat();
             map.dispatchEvent({
-                type: FeaturesHoverEventType,
+                type: `${GEOSPATIAL_SDK_PREFIX}${FeaturesHoverEventType}`,
                 features,
                 featuresByLayer,
             });

package/dist/map/handle-errors.d.ts

@@ -1,11 +1,4 @@
-import { EndpointError } from "@camptocamp/ogc-client";
 import { Tile } from "ol";
 import { Layer } from "ol/layer.js";
-import TileLayer from "ol/layer/Tile.js";
-import VectorLayer from "ol/layer/Vector.js";
-import TileSource from "ol/source/Tile.js";
-import VectorSource from "ol/source/Vector.js";
-export declare function handleEndpointError(layer: TileLayer<TileSource> | VectorLayer<VectorSource>, error: EndpointError): void;
-export declare function handleTileError(response: Response | Error, tile: Tile, layer: Layer): void;
 export declare function tileLoadErrorCatchFunction(layer: Layer, tile: Tile, src: string): void;
 //# sourceMappingURL=handle-errors.d.ts.map

package/dist/map/handle-errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handle-errors.d.ts","sourceRoot":"","sources":["../../lib/map/handle-errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,EAAa,IAAI,EAAE,MAAM,IAAI,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,WAAW,MAAM,oBAAoB,CAAC;AAC7C,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAG/C,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,SAAS,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,EACxD,KAAK,EAAE,aAAa,QAIrB;AAED,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,QAAQ,GAAG,KAAK,EAC1B,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,QAKb;AAED,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,MAAM,QAqBZ"}
+{"version":3,"file":"handle-errors.d.ts","sourceRoot":"","sources":["../../lib/map/handle-errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,IAAI,EAAE,MAAM,IAAI,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAIpC,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,MAAM,QA0BZ"}

package/dist/map/handle-errors.js

@@ -1,14 +1,5 @@
-import { SourceLoadErrorEvent } from "@geospatial-sdk/core";
 import TileState from "ol/TileState.js";
-export function handleEndpointError(layer, error) {
-    console.error("Error loading Endpoint", error);
-    layer.dispatchEvent(new SourceLoadErrorEvent(error));
-}
-export function handleTileError(response, tile, layer) {
-    console.error("Error loading tile", response);
-    tile.setState(TileState.ERROR);
-    layer.dispatchEvent(new SourceLoadErrorEvent(response));
-}
+import { emitLayerLoadingError } from "./register-events.js";
 export function tileLoadErrorCatchFunction(layer, tile, src) {
     fetch(src)
         .then((response) => {
@@ -19,15 +10,20 @@ export function tileLoadErrorCatchFunction(layer, tile, src) {
                 const image = tile.getImage();
                 image.src = URL.createObjectURL(blob);
             })
-                .catch(() => {
-                handleTileError(response, tile, layer);
+                .catch((error) => {
+                tile.setState(TileState.ERROR);
+                emitLayerLoadingError(layer, error);
             });
         }
         else {
-            handleTileError(response, tile, layer);
+            tile.setState(TileState.ERROR);
+            response.text().then((text) => {
+                emitLayerLoadingError(layer, new Error(text), response.status);
+            });
         }
     })
         .catch((error) => {
-        handleTileError(error, tile, layer);
+        tile.setState(TileState.ERROR);
+        emitLayerLoadingError(layer, error);
     });
 }

package/dist/map/index.d.ts

@@ -4,5 +4,6 @@
  */
 export { createMapFromContext, resetMapFromContext } from "./create-map.js";
 export { applyContextDiffToMap } from "./apply-context-diff.js";
-export { listen } from "./register-events.js";
+export { listen } from "./listen.js";
+export { readMapViewState } from "./resolved-map-state.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;;;GAGG;AAEH,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/map/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC"}

package/dist/map/index.js

@@ -4,4 +4,5 @@
  */
 export { createMapFromContext, resetMapFromContext } from "./create-map.js";
 export { applyContextDiffToMap } from "./apply-context-diff.js";
-export { listen } from "./register-events.js";
+export { listen } from "./listen.js";
+export { readMapViewState } from "./resolved-map-state.js";

package/dist/map/layer-update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layer-update.d.ts","sourceRoot":"","sources":["../../lib/map/layer-update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAKhE,OAAO,KAAK,MAAM,mBAAmB,CAAC;AAsBtC;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE,eAAe,GACxB,OAAO,CAIT;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,eAAe,EAC3B,OAAO,EAAE,KAAK,EACd,kBAAkB,CAAC,EAAE,eAAe,QAiDrC"}
+{"version":3,"file":"layer-update.d.ts","sourceRoot":"","sources":["../../lib/map/layer-update.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EAEhB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,MAAM,mBAAmB,CAAC;AAsBtC;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,eAAe,EACzB,QAAQ,EAAE,eAAe,GACxB,OAAO,CAIT;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,eAAe,EAC3B,OAAO,EAAE,KAAK,EACd,kBAAkB,CAAC,EAAE,eAAe,QAiDrC"}

package/dist/map/layer-update.js

@@ -1,4 +1,4 @@
-import { getHash } from "@geospatial-sdk/core";
+import { getHash, } from "@geospatial-sdk/core";
 import { GEOSPATIAL_SDK_PREFIX } from "./constants.js";
 const UPDATABLE_PROPERTIES = [
     "opacity",

package/dist/map/listen.d.ts

@@ -0,0 +1,4 @@
+import Map from "ol/Map.js";
+import { MapEventsByType } from "@geospatial-sdk/core";
+export declare function listen<T extends keyof MapEventsByType>(map: Map, eventType: T, callback: (event: MapEventsByType[T]) => void): void;
+//# sourceMappingURL=listen.d.ts.map

package/dist/map/listen.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"listen.d.ts","sourceRoot":"","sources":["../../lib/map/listen.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,WAAW,CAAC;AAG5B,OAAO,EAOL,eAAe,EAShB,MAAM,sBAAsB,CAAC;AAgC9B,wBAAgB,MAAM,CAAC,CAAC,SAAS,MAAM,eAAe,EACpD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,CAAC,EACZ,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,KAAK,IAAI,QAoE9C"}

package/dist/map/listen.js

@@ -0,0 +1,70 @@
+import { toLonLat } from "ol/proj.js";
+import { FeaturesClickEventType, FeaturesHoverEventType, LayerCreationErrorEventType, LayerLoadingErrorEventType, MapClickEventType, MapExtentChangeEventType, MapLayerStateChangeEventType, MapStateChangeEventType, MapViewStateChangeEventType, SourceLoadErrorType, } from "@geospatial-sdk/core";
+import { GEOSPATIAL_SDK_PREFIX } from "./constants.js";
+import { registerFeatureClickEvent, registerFeatureHoverEvent, registerLayerCreationErrorEvent, registerLayerLoadingErrorEvent, registerMapLayerStateChangeEvent, registerMapStateChangeEvent, registerMapViewStateChangeEvent, registerSourceLoadErrorEvent, } from "./register-events.js";
+function addEventListener(map, eventType, callback) {
+    map.on(`${GEOSPATIAL_SDK_PREFIX}${eventType}`, ({ target: _target, ...event }) => 
+    // we're excluding the `target` property and renaming the `type` here
+    callback({
+        ...event,
+        type: eventType,
+    }));
+}
+export function listen(map, eventType, callback) {
+    switch (eventType) {
+        case FeaturesClickEventType:
+            registerFeatureClickEvent(map);
+            addEventListener(map, eventType, callback);
+            break;
+        case FeaturesHoverEventType:
+            registerFeatureHoverEvent(map);
+            addEventListener(map, eventType, callback);
+            break;
+        case MapClickEventType:
+            map.on("click", (event) => {
+                const coordinate = toLonLat(event.coordinate, map.getView().getProjection());
+                callback({
+                    type: MapClickEventType,
+                    coordinate,
+                });
+            });
+            break;
+        case MapViewStateChangeEventType:
+            registerMapViewStateChangeEvent(map);
+            addEventListener(map, eventType, callback);
+            break;
+        case MapLayerStateChangeEventType:
+            registerMapLayerStateChangeEvent(map);
+            addEventListener(map, eventType, callback);
+            break;
+        case MapStateChangeEventType:
+            registerMapStateChangeEvent(map);
+            addEventListener(map, eventType, callback);
+            break;
+        case LayerCreationErrorEventType:
+            registerLayerCreationErrorEvent(map);
+            addEventListener(map, eventType, callback);
+            break;
+        case LayerLoadingErrorEventType:
+            registerLayerLoadingErrorEvent(map);
+            addEventListener(map, eventType, callback);
+            break;
+        /**
+         * DEPRECATED
+         */
+        case MapExtentChangeEventType:
+            registerMapViewStateChangeEvent(map);
+            map.on(`${GEOSPATIAL_SDK_PREFIX}${MapViewStateChangeEventType}`, (event) => callback({
+                type: MapExtentChangeEventType,
+                extent: event.viewState.extent,
+            }));
+            break;
+        case SourceLoadErrorType: {
+            registerSourceLoadErrorEvent(map);
+            map.on(SourceLoadErrorType, (event) => callback(event));
+            break;
+        }
+        default:
+            throw new Error(`Unrecognized event type: ${eventType}`);
+    }
+}

package/dist/map/register-events.d.ts

@@ -1,4 +1,18 @@
-import { MapEventsByType } from "@geospatial-sdk/core";
 import Map from "ol/Map.js";
-export declare function listen<T extends keyof MapEventsByType>(map: Map, eventType: T, callback: (event: MapEventsByType[T]) => void): void;
+import { MapLayerDataInfo } from "@geospatial-sdk/core";
+import type BaseLayer from "ol/layer/Base.js";
+export declare function registerFeatureClickEvent(map: Map): void;
+export declare function registerFeatureHoverEvent(map: Map): void;
+export declare function registerMapLayerStateChangeEvent(map: Map): void;
+export declare function emitLayerCreationError(layer: BaseLayer, error: Error): void;
+export declare function emitLayerLoadingStatusLoading(layer: BaseLayer): void;
+export declare function emitLayerLoadingStatusSuccess(layer: BaseLayer): void;
+export declare function emitLayerLoadingError(layer: BaseLayer, error: Error, httpStatus?: number): void;
+export declare function emitLayerDataInfo(layer: BaseLayer, dataInfo: MapLayerDataInfo): void;
+export declare function propagateLayerStateChangeEventToMap(map: Map, layer: BaseLayer): void;
+export declare function registerMapStateChangeEvent(map: Map): void;
+export declare function registerLayerCreationErrorEvent(map: Map): void;
+export declare function registerLayerLoadingErrorEvent(map: Map): void;
+export declare function registerMapViewStateChangeEvent(map: Map): void;
+export declare function registerSourceLoadErrorEvent(map: Map): void;
 //# sourceMappingURL=register-events.d.ts.map

package/dist/map/register-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-events.d.ts","sourceRoot":"","sources":["../../lib/map/register-events.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,eAAe,EAGhB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,GAA4B,MAAM,WAAW,CAAC;AA+DrD,wBAAgB,MAAM,CAAC,CAAC,SAAS,MAAM,eAAe,EACpD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,CAAC,EACZ,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,KAAK,IAAI,QA0E9C"}
+{"version":3,"file":"register-events.d.ts","sourceRoot":"","sources":["../../lib/map/register-events.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,WAAW,CAAC;AAC5B,OAAO,EAKL,gBAAgB,EAWjB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAC;AAO9C,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,GAAG,QAkBjD;AAED,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,GAAG,QAGjD;AAED,wBAAgB,gCAAgC,CAAC,GAAG,EAAE,GAAG,QAGxD;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,QAKpE;AACD,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,SAAS,QAK7D;AACD,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,SAAS,QAK7D;AACD,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,KAAK,EACZ,UAAU,CAAC,EAAE,MAAM,QAOpB;AACD,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,gBAAgB,QAM3B;AAED,wBAAgB,mCAAmC,CACjD,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,SAAS,QAsFjB;AAED,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,GAAG,QA6CnD;AAED,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,GAAG,QAGvD;AAED,wBAAgB,8BAA8B,CAAC,GAAG,EAAE,GAAG,QAGtD;AAID,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,GAAG,QAwBvD;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,GAAG,QAGpD"}