@geospatial-sdk/openlayers 0.0.5-dev.53 → 0.0.5-dev.54

package/dist/map/feature-hover.d.ts

@@ -1,5 +1,5 @@
-import type OlMap from "ol/Map.js";
 import VectorLayer from "ol/layer/Vector.js";
+import type OlMap from "ol/Map.js";
 import VectorSource from "ol/source/Vector.js";
 export declare function initHoverLayer(map: OlMap): void;
 export declare function getHoverLayer(map: OlMap): VectorLayer<VectorSource>;

package/dist/map/feature-hover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feature-hover.d.ts","sourceRoot":"","sources":["../../lib/map/feature-hover.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,WAAW,CAAC;AACnC,OAAO,WAAW,MAAM,oBAAoB,CAAC;AAC7C,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAe/C,wBAAgB,cAAc,CAAC,GAAG,EAAE,KAAK,QAoGxC;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,KAAK,GAAG,WAAW,CAAC,YAAY,CAAC,CAEnE;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,KAAK,QAMzC"}
+{"version":3,"file":"feature-hover.d.ts","sourceRoot":"","sources":["../../lib/map/feature-hover.ts"],"names":[],"mappings":"AAQA,OAAO,WAAW,MAAM,oBAAoB,CAAC;AAC7C,OAAO,KAAK,KAAK,MAAM,WAAW,CAAC;AAEnC,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAO/C,wBAAgB,cAAc,CAAC,GAAG,EAAE,KAAK,QAoGxC;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,KAAK,GAAG,WAAW,CAAC,YAAY,CAAC,CAEnE;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,KAAK,QAMzC"}

package/dist/map/feature-hover.js

@@ -1,9 +1,9 @@
-import { GEOSPATIAL_SDK_PREFIX } from "./constants.js";
-import VectorLayer from "ol/layer/Vector.js";
-import VectorSource from "ol/source/Vector.js";
 import { defaultHighlightStyle, FeaturesHoverEventType, } from "@geospatial-sdk/core";
 import OlFeature from "ol/Feature.js";
+import VectorLayer from "ol/layer/Vector.js";
 import { unByKey } from "ol/Observable.js";
+import VectorSource from "ol/source/Vector.js";
+import { GEOSPATIAL_SDK_PREFIX } from "./constants.js";
 import { readFeaturesAtPixel } from "./get-features.js";
 const hoverLayerKey = `${GEOSPATIAL_SDK_PREFIX}hover-layer`;
 const unsubscribeKey = `${GEOSPATIAL_SDK_PREFIX}hover-unsub`;
@@ -19,15 +19,15 @@ export function initHoverLayer(map) {
         }),
         style: defaultHighlightStyle,
         properties: {
-            [`${GEOSPATIAL_SDK_PREFIX}enable-hover`]: false,
-            [`${GEOSPATIAL_SDK_PREFIX}disable-click`]: true,
+            [`${GEOSPATIAL_SDK_PREFIX}hoverable`]: false,
+            [`${GEOSPATIAL_SDK_PREFIX}clickable`]: false,
         },
     });
     map.set(hoverLayerKey, hoverLayer);
     hoverLayer.setMap(map);
     // store original cursor style in order to change it later
     const originalCursorStyle = map.getTargetElement()?.style.cursor ?? "";
-    const layerFilter = (layer) => layer.get(`${GEOSPATIAL_SDK_PREFIX}enable-hover`);
+    const layerFilter = (layer) => layer.get(`${GEOSPATIAL_SDK_PREFIX}hoverable`);
     const unKey = map.on("pointermove", async (event) => {
         // skip hit detection if the view is moving as it can have an impact on performance
         if (map.getView().getInteracting() || map.getView().getAnimating()) {

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,QAuDrC"}
+{"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"}

package/dist/map/layer-update.js

@@ -7,8 +7,8 @@ const UPDATABLE_PROPERTIES = [
     "attributions",
     "extras",
     "version",
-    "enableHover",
-    "disableClick",
+    "hoverable",
+    "clickable",
     "style",
     "hoverStyle",
     // TODO (when available) "zIndex"
@@ -60,14 +60,14 @@ export function updateLayerProperties(layerModel, olLayer, previousLayerModel) {
     if (shouldApplyProperty("label")) {
         olLayer.set("label", layerModel.label);
     }
-    if (shouldApplyProperty("enableHover")) {
-        olLayer.set(`${GEOSPATIAL_SDK_PREFIX}enable-hover`, layerModel.enableHover);
+    if (shouldApplyProperty("hoverable")) {
+        olLayer.set(`${GEOSPATIAL_SDK_PREFIX}hoverable`, layerModel.hoverable);
     }
     if (shouldApplyProperty("hoverStyle")) {
         olLayer.set(`${GEOSPATIAL_SDK_PREFIX}hover-style`, layerModel.hoverStyle);
     }
-    if (shouldApplyProperty("disableClick")) {
-        olLayer.set(`${GEOSPATIAL_SDK_PREFIX}disable-click`, layerModel.disableClick);
+    if (shouldApplyProperty("clickable")) {
+        olLayer.set(`${GEOSPATIAL_SDK_PREFIX}clickable`, layerModel.clickable);
     }
     if (shouldApplyProperty("style") &&
         "setStyle" in olLayer) {

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

@@ -1 +1 @@
-{"version":3,"file":"listen.d.ts","sourceRoot":"","sources":["../../lib/map/listen.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,WAAW,CAAC;AAG5B,OAAO,EAKL,eAAe,EAShB,MAAM,sBAAsB,CAAC;AA6B9B,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,QA+E9C"}
+{"version":3,"file":"listen.d.ts","sourceRoot":"","sources":["../../lib/map/listen.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,WAAW,CAAC;AAG5B,OAAO,EAKL,eAAe,EAShB,MAAM,sBAAsB,CAAC;AA8B9B,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,QA+E9C"}

package/dist/map/listen.js

@@ -1,7 +1,7 @@
 import { toLonLat } from "ol/proj.js";
 import { FeaturesClickEventType, FeaturesHoverEventType, MapClickEventType, MapExtentChangeEventType, MapLayerStateChangeEventType, MapStateChangeEventType, MapViewStateChangeEventType, SourceLoadErrorType, } from "@geospatial-sdk/core";
 import { GEOSPATIAL_SDK_PREFIX } from "./constants.js";
-import { registerFeatureClickEvent, registerFeatureHoverEvent, registerMapViewStateChangeEvent, } from "./register-events.js";
+import { registerFeatureClickEvent, registerFeatureHoverEvent, registerMapLayerStateChangeEvent, registerMapViewStateChangeEvent, } 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
@@ -34,7 +34,7 @@ export function listen(map, eventType, callback) {
             addEventListener(map, eventType, callback);
             break;
         case MapLayerStateChangeEventType:
-            // TODO: registerMapLayerStateChangeEvent(map);
+            registerMapLayerStateChangeEvent(map);
             addEventListener(map, eventType, callback);
             break;
         case MapStateChangeEventType:

package/dist/map/register-events.js

@@ -6,8 +6,8 @@ import { readFeaturesAtPixel } from "./get-features.js";
 function registerFeatureClickEvent(map) {
     if (map.get(FeaturesClickEventType))
         return;
-    // Filter to only query layers with enableSelection
-    const layerFilter = (layer) => !layer.get(`${GEOSPATIAL_SDK_PREFIX}disable-click`);
+    // Filter to only query clickable layers
+    const layerFilter = (layer) => layer.get(`${GEOSPATIAL_SDK_PREFIX}clickable`) !== false;
     map.on("click", async (event) => {
         const featuresByLayer = await readFeaturesAtPixel(map, event, layerFilter);
         const features = Array.from(featuresByLayer.values()).flat();

package/dist/map/resolved-map-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolved-map-state.d.ts","sourceRoot":"","sources":["../../lib/map/resolved-map-state.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,WAAW,CAAC;AAE5B,OAAO,EAAU,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAIpE;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG,oBAAoB,CAgB/D"}
+{"version":3,"file":"resolved-map-state.d.ts","sourceRoot":"","sources":["../../lib/map/resolved-map-state.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,WAAW,CAAC;AAE5B,OAAO,EAAsB,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAOhF;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG,oBAAoB,CAwB/D"}

package/dist/map/resolved-map-state.js

@@ -10,7 +10,7 @@ const PIXEL_SIZE_MM = 0.28;
 export function readMapViewState(map) {
     const view = map.getView();
     const projection = view.getProjection();
-    const extent = transformExtent(view.calculateExtent(), projection, "EPSG:4326");
+    const extent = transformExtent(view.calculateExtent(map.getSize()), projection, "EPSG:4326");
     const center = transformCoordinate(view.getCenter() ?? [0, 0], projection, "EPSG:4326");
     const resolution = view.getResolution() ?? 1;
     const metersPerUnit = projection.getMetersPerUnit() ?? 1;
@@ -24,4 +24,3 @@ export function readMapViewState(map) {
         bearing,
     };
 }
-export function processLayerEvent(map, layer) { }

package/lib/map/feature-hover.ts

@@ -1,16 +1,16 @@
-import { GEOSPATIAL_SDK_PREFIX } from "./constants.js";
-import type OlMap from "ol/Map.js";
-import VectorLayer from "ol/layer/Vector.js";
-import VectorSource from "ol/source/Vector.js";
 import {
   defaultHighlightStyle,
   FeaturesHoverEventType,
 } from "@geospatial-sdk/core";
-import type BaseEvent from "ol/events/Event.js";
 import { MapBrowserEvent } from "ol";
+import type BaseEvent from "ol/events/Event.js";
 import OlFeature from "ol/Feature.js";
 import type BaseLayer from "ol/layer/Base.js";
+import VectorLayer from "ol/layer/Vector.js";
+import type OlMap from "ol/Map.js";
 import { unByKey } from "ol/Observable.js";
+import VectorSource from "ol/source/Vector.js";
+import { GEOSPATIAL_SDK_PREFIX } from "./constants.js";
 import { readFeaturesAtPixel } from "./get-features.js";
 
 const hoverLayerKey = `${GEOSPATIAL_SDK_PREFIX}hover-layer`;
@@ -29,8 +29,8 @@ export function initHoverLayer(map: OlMap) {
     }),
     style: defaultHighlightStyle,
     properties: {
-      [`${GEOSPATIAL_SDK_PREFIX}enable-hover`]: false,
-      [`${GEOSPATIAL_SDK_PREFIX}disable-click`]: true,
+      [`${GEOSPATIAL_SDK_PREFIX}hoverable`]: false,
+      [`${GEOSPATIAL_SDK_PREFIX}clickable`]: false,
     },
   });
   map.set(hoverLayerKey, hoverLayer);
@@ -40,7 +40,7 @@ export function initHoverLayer(map: OlMap) {
   const originalCursorStyle = map.getTargetElement()?.style.cursor ?? "";
 
   const layerFilter = (layer: BaseLayer) =>
-    layer.get(`${GEOSPATIAL_SDK_PREFIX}enable-hover`);
+    layer.get(`${GEOSPATIAL_SDK_PREFIX}hoverable`);
 
   const unKey = map.on(
     "pointermove",

package/lib/map/layer-update.test.ts

@@ -125,8 +125,8 @@ describe("Layer update utils", () => {
         style: {
           "circle-fill-color": "blue",
         },
-        enableHover: true,
-        disableClick: true,
+        hoverable: true,
+        clickable: false,
       };
       const prevLayerModel = SAMPLE_LAYER3;
       updateLayerProperties(layerModel, olLayer, prevLayerModel);
@@ -134,12 +134,12 @@ describe("Layer update utils", () => {
         layerModel.style,
       );
       expect(olLayer.set).toHaveBeenCalledWith(
-        "--geospatial-sdk-enable-hover",
+        "--geospatial-sdk-hoverable",
         true,
       );
       expect(olLayer.set).toHaveBeenCalledWith(
-        "--geospatial-sdk-disable-click",
-        true,
+        "--geospatial-sdk-clickable",
+        false,
       );
     });
   });

package/lib/map/layer-update.ts

@@ -4,9 +4,9 @@ import {
   MapContextLayerVector,
 } from "@geospatial-sdk/core/lib/model/map-context.js";
 import Layer from "ol/layer/Layer.js";
-import { GEOSPATIAL_SDK_PREFIX } from "./constants.js";
 import VectorLayer from "ol/layer/Vector.js";
 import type VectorSource from "ol/source/Vector.js";
+import { GEOSPATIAL_SDK_PREFIX } from "./constants.js";
 
 const UPDATABLE_PROPERTIES: (
   | keyof MapContextBaseLayer
@@ -18,8 +18,8 @@ const UPDATABLE_PROPERTIES: (
   "attributions",
   "extras",
   "version",
-  "enableHover",
-  "disableClick",
+  "hoverable",
+  "clickable",
   "style",
   "hoverStyle",
   // TODO (when available) "zIndex"
@@ -82,11 +82,8 @@ export function updateLayerProperties(
   if (shouldApplyProperty("label")) {
     olLayer.set("label", layerModel.label);
   }
-  if (shouldApplyProperty("enableHover" as keyof MapContextLayer)) {
-    olLayer.set(
-      `${GEOSPATIAL_SDK_PREFIX}enable-hover`,
-      (layerModel as MapContextLayerVector).enableHover,
-    );
+  if (shouldApplyProperty("hoverable")) {
+    olLayer.set(`${GEOSPATIAL_SDK_PREFIX}hoverable`, layerModel.hoverable);
   }
   if (shouldApplyProperty("hoverStyle" as keyof MapContextLayer)) {
     olLayer.set(
@@ -94,11 +91,8 @@ export function updateLayerProperties(
       (layerModel as MapContextLayerVector).hoverStyle,
     );
   }
-  if (shouldApplyProperty("disableClick" as keyof MapContextLayer)) {
-    olLayer.set(
-      `${GEOSPATIAL_SDK_PREFIX}disable-click`,
-      layerModel.disableClick,
-    );
+  if (shouldApplyProperty("clickable" as keyof MapContextLayer)) {
+    olLayer.set(`${GEOSPATIAL_SDK_PREFIX}clickable`, layerModel.clickable);
   }
   if (
     shouldApplyProperty("style" as keyof MapContextLayer) &&

package/lib/map/register-events.ts

@@ -19,9 +19,9 @@ import { readFeaturesAtPixel } from "./get-features.js";
 function registerFeatureClickEvent(map: Map) {
   if (map.get(FeaturesClickEventType)) return;
 
-  // Filter to only query layers with enableSelection
+  // Filter to only query clickable layers
   const layerFilter = (layer: BaseLayer) =>
-    !layer.get(`${GEOSPATIAL_SDK_PREFIX}disable-click`);
+    layer.get(`${GEOSPATIAL_SDK_PREFIX}clickable`) !== false;
 
   map.on("click", async (event: any) => {
     const featuresByLayer = await readFeaturesAtPixel(map, event, layerFilter);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geospatial-sdk/openlayers",
-  "version": "0.0.5-dev.53+85f2d77",
+  "version": "0.0.5-dev.54+352b554",
   "description": "OpenLayers-related utilities",
   "keywords": [
     "ol",
@@ -37,10 +37,9 @@
     "ol": ">9.x"
   },
   "dependencies": {
-    "@geospatial-sdk/core": "^0.0.5-dev.53+85f2d77",
-    "chroma-js": "^2.4.2",
+    "@geospatial-sdk/core": "^0.0.5-dev.54+352b554",
     "lodash.throttle": "^4.1.1",
     "ol-mapbox-style": "12.4.0"
   },
-  "gitHead": "85f2d770cbe0bf97a4c2c5e0650fe7712f3396c8"
+  "gitHead": "352b554ec0ca6a27dee923a28b4b1bb4e3f12973"
 }