@geospatial-sdk/openlayers 0.0.5-dev.51 → 0.0.5-dev.52

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

@@ -1,7 +1,7 @@
-import type Map from "ol/Map.js";
+import type OlMap from "ol/Map.js";
 import VectorLayer from "ol/layer/Vector.js";
 import VectorSource from "ol/source/Vector.js";
-export declare function initHoverLayer(map: Map): void;
-export declare function getHoverLayer(map: Map): VectorLayer<VectorSource>;
-export declare function clearHoverLayer(map: Map): void;
+export declare function initHoverLayer(map: OlMap): void;
+export declare function getHoverLayer(map: OlMap): VectorLayer<VectorSource>;
+export declare function clearHoverLayer(map: OlMap): void;
 //# sourceMappingURL=feature-hover.d.ts.map

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,GAAG,MAAM,WAAW,CAAC;AACjC,OAAO,WAAW,MAAM,oBAAoB,CAAC;AAC7C,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAiB/C,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,QA+DtC;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,WAAW,CAAC,YAAY,CAAC,CAEjE;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,QAMvC"}
+{"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,QAkFxC;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

@@ -2,9 +2,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 GeoJSON from "ol/format/GeoJSON.js";
+import OlFeature from "ol/Feature.js";
 import { unByKey } from "ol/Observable.js";
-const GEOJSON = new GeoJSON();
+import { readFeaturesAtPixel } from "./get-features.js";
 const hoverLayerKey = `${GEOSPATIAL_SDK_PREFIX}hover-layer`;
 const unsubscribeKey = `${GEOSPATIAL_SDK_PREFIX}hover-unsub`;
 export function initHoverLayer(map) {
@@ -44,16 +44,27 @@ export function initHoverLayer(map) {
             return;
         }
         // add hovered feature to the layer
-        const hovered = map.getFeaturesAtPixel(event.pixel, {
+        let firstFeature = null;
+        map.forEachFeatureAtPixel(event.pixel, (feature) => {
+            if (feature instanceof OlFeature) {
+                firstFeature = feature;
+                return true;
+            }
+        }, {
             layerFilter,
         });
-        hoveredSource.addFeature(hovered[0]);
+        if (!firstFeature) {
+            return;
+        }
+        hoveredSource.addFeature(firstFeature);
         // dispatch event if subscribed to
         if (map.get(FeaturesHoverEventType)) {
-            const { features } = GEOJSON.writeFeaturesObject(hovered);
+            const featuresByLayer = await readFeaturesAtPixel(map, event, layerFilter);
+            const features = Array.from(featuresByLayer.values()).flat();
             map.dispatchEvent({
                 type: FeaturesHoverEventType,
-                features: features ?? [],
+                features,
+                featuresByLayer,
             });
         }
     });

package/dist/map/get-features.d.ts

@@ -1,12 +1,13 @@
-import Map from "ol/Map.js";
+import OlMap from "ol/Map.js";
 import { Pixel } from "ol/pixel.js";
-import type { Feature } from "geojson";
 import TileWMS from "ol/source/TileWMS.js";
 import ImageWMS from "ol/source/ImageWMS.js";
 import { Coordinate } from "ol/coordinate.js";
-import { MapBrowserEvent } from "ol";
-export declare function getFeaturesFromVectorSources(olMap: Map, pixel: Pixel): Feature[];
-export declare function getGFIUrl(source: TileWMS | ImageWMS, map: Map, coordinate: Coordinate): string | null;
-export declare function getFeaturesFromWmsSources(olMap: Map, coordinate: Coordinate): Promise<Feature[]>;
-export declare function readFeaturesAtPixel(map: Map, event: MapBrowserEvent<PointerEvent>): Promise<Feature<import("geojson").Geometry, import("geojson").GeoJsonProperties>[]>;
+import Layer from "ol/layer/Layer.js";
+import type MapBrowserEvent from "ol/MapBrowserEvent.js";
+import type { FeaturesByLayerIndex } from "@geospatial-sdk/core";
+export declare function getFeaturesFromVectorSources(olMap: OlMap, pixel: Pixel, layerFilter?: (layer: Layer) => boolean): FeaturesByLayerIndex;
+export declare function getGFIUrl(source: TileWMS | ImageWMS, map: OlMap, coordinate: Coordinate): string | null;
+export declare function getFeaturesFromWmsSources(olMap: OlMap, coordinate: Coordinate, layerFilter?: (layer: Layer) => boolean): Promise<FeaturesByLayerIndex>;
+export declare function readFeaturesAtPixel(map: OlMap, event: MapBrowserEvent<PointerEvent>, layerFilter?: (layer: Layer) => boolean): Promise<FeaturesByLayerIndex>;
 //# sourceMappingURL=get-features.d.ts.map

package/dist/map/get-features.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-features.d.ts","sourceRoot":"","sources":["../../lib/map/get-features.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,WAAW,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,KAAK,EAAE,OAAO,EAAqB,MAAM,SAAS,CAAC;AAE1D,OAAO,OAAO,MAAM,sBAAsB,CAAC;AAC3C,OAAO,QAAQ,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAIrC,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,GAAG,EACV,KAAK,EAAE,KAAK,GACX,OAAO,EAAE,CAOX;AAED,wBAAgB,SAAS,CACvB,MAAM,EAAE,OAAO,GAAG,QAAQ,EAC1B,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,UAAU,GACrB,MAAM,GAAG,IAAI,CAWf;AAED,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,GAAG,EACV,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,OAAO,EAAE,CAAC,CA2BpB;AAOD,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,eAAe,CAAC,YAAY,CAAC,uFAMrC"}
+{"version":3,"file":"get-features.d.ts","sourceRoot":"","sources":["../../lib/map/get-features.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,WAAW,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGpC,OAAO,OAAO,MAAM,sBAAsB,CAAC;AAC3C,OAAO,QAAQ,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,KAAK,MAAM,mBAAmB,CAAC;AAEtC,OAAO,KAAK,eAAe,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAIjE,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,KAAK,EACZ,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,GACtC,oBAAoB,CAqBtB;AAED,wBAAgB,SAAS,CACvB,MAAM,EAAE,OAAO,GAAG,QAAQ,EAC1B,GAAG,EAAE,KAAK,EACV,UAAU,EAAE,UAAU,GACrB,MAAM,GAAG,IAAI,CAWf;AAED,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,UAAU,EACtB,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,GACtC,OAAO,CAAC,oBAAoB,CAAC,CAsC/B;AAOD,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,KAAK,EACV,KAAK,EAAE,eAAe,CAAC,YAAY,CAAC,EACpC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,GACtC,OAAO,CAAC,oBAAoB,CAAC,CAS/B"}

package/dist/map/get-features.js

@@ -4,13 +4,23 @@ import ImageWMS from "ol/source/ImageWMS.js";
 import Layer from "ol/layer/Layer.js";
 import throttle from "lodash.throttle";
 const GEOJSON = new GeoJSON();
-export function getFeaturesFromVectorSources(olMap, pixel) {
-    const olFeatures = olMap.getFeaturesAtPixel(pixel);
-    const { features } = GEOJSON.writeFeaturesObject(olFeatures);
-    if (!features) {
-        return [];
-    }
-    return features;
+export function getFeaturesFromVectorSources(olMap, pixel, layerFilter) {
+    const result = new Map();
+    const layerArray = olMap.getLayers().getArray();
+    olMap.forEachFeatureAtPixel(pixel, (feature, layer) => {
+        // can happen for unmanaged layer (i.e. hover layer)
+        if (layer === null) {
+            return null;
+        }
+        const layerIndex = layerArray.indexOf(layer);
+        if (!result.has(layerIndex)) {
+            result.set(layerIndex, []);
+        }
+        result
+            .get(layerIndex)
+            .push(GEOJSON.writeFeatureObject(feature));
+    }, { layerFilter });
+    return result;
 }
 export function getGFIUrl(source, map, coordinate) {
     const view = map.getView();
@@ -22,29 +32,46 @@ export function getGFIUrl(source, map, coordinate) {
     };
     return (source.getFeatureInfoUrl(coordinate, resolution, projection, params) ?? null);
 }
-export function getFeaturesFromWmsSources(olMap, coordinate) {
-    const wmsSources = olMap
-        .getLayers()
-        .getArray()
-        .filter((layer) => layer instanceof Layer &&
-        (layer.getSource() instanceof TileWMS ||
-            layer.getSource() instanceof ImageWMS))
-        .map((layer) => layer.getSource());
-    if (!wmsSources.length) {
-        return Promise.resolve([]);
+export async function getFeaturesFromWmsSources(olMap, coordinate, layerFilter) {
+    const result = new Map();
+    const layerArray = olMap.getLayers().getArray();
+    const hasWms = layerArray.some((layer) => {
+        const source = layer instanceof Layer ? layer.getSource() : null;
+        return source instanceof TileWMS || source instanceof ImageWMS;
+    });
+    if (!hasWms) {
+        return result;
     }
-    const gfiUrls = wmsSources.reduce((urls, source) => {
+    const gfiPromises = layerArray.map((layer) => {
+        if (!(layer instanceof Layer)) {
+            return null;
+        }
+        if (layerFilter && !layerFilter(layer)) {
+            return null;
+        }
+        const source = layer.getSource();
+        if (!(source instanceof TileWMS) && !(source instanceof ImageWMS)) {
+            return null;
+        }
         const gfiUrl = getGFIUrl(source, olMap, coordinate);
-        return gfiUrl ? [...urls, gfiUrl] : urls;
-    }, []);
-    return Promise.all(gfiUrls.map((url) => fetch(url)
-        .then((response) => response.json())
-        .then((collection) => collection.features))).then((features) => features.flat());
+        return gfiUrl
+            ? fetch(gfiUrl)
+                .then((response) => response.json())
+                .then((collection) => collection.features)
+            : null;
+    });
+    const responses = await Promise.all(gfiPromises);
+    responses.forEach((features, index) => {
+        if (features !== null && features.length > 0) {
+            result.set(index, features);
+        }
+    });
+    return result;
 }
 const getFeaturesFromWmsSourcesThrottled = throttle(getFeaturesFromWmsSources, 250);
-export async function readFeaturesAtPixel(map, event) {
-    return [
-        ...getFeaturesFromVectorSources(map, event.pixel),
-        ...(await getFeaturesFromWmsSourcesThrottled(map, event.coordinate)),
-    ];
+export async function readFeaturesAtPixel(map, event, layerFilter) {
+    return new Map([
+        ...getFeaturesFromVectorSources(map, event.pixel, layerFilter),
+        ...(await getFeaturesFromWmsSourcesThrottled(map, event.coordinate, layerFilter)),
+    ]);
 }

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,GAA4B,MAAM,WAAW,CAAC;AACrD,OAAO,EAIL,eAAe,EAGhB,MAAM,sBAAsB,CAAC;AA4D9B,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,GAA4B,MAAM,WAAW,CAAC;AACrD,OAAO,EAIL,eAAe,EAGhB,MAAM,sBAAsB,CAAC;AA8D9B,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"}

package/dist/map/register-events.js

@@ -6,10 +6,12 @@ function registerFeatureClickEvent(map) {
     if (map.get(FeaturesClickEventType))
         return;
     map.on("click", async (event) => {
-        const features = await readFeaturesAtPixel(map, event);
+        const featuresByLayer = await readFeaturesAtPixel(map, event);
+        const features = Array.from(featuresByLayer.values()).flat();
         map.dispatchEvent({
             type: FeaturesClickEventType,
             features,
+            featuresByLayer,
         });
     });
     map.set(FeaturesClickEventType, true);

package/lib/map/feature-hover.ts

@@ -1,24 +1,22 @@
 import { GEOSPATIAL_SDK_PREFIX } from "./constants.js";
-import type Map from "ol/Map.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 BaseEvent from "ol/events/Event.js";
+import type BaseEvent from "ol/events/Event.js";
 import { MapBrowserEvent } from "ol";
-import GeoJSON from "ol/format/GeoJSON.js";
-import Feature from "ol/Feature.js";
-import BaseLayer from "ol/layer/Base.js";
+import OlFeature from "ol/Feature.js";
+import type BaseLayer from "ol/layer/Base.js";
 import { unByKey } from "ol/Observable.js";
-
-const GEOJSON = new GeoJSON();
+import { readFeaturesAtPixel } from "./get-features.js";
 
 const hoverLayerKey = `${GEOSPATIAL_SDK_PREFIX}hover-layer`;
 const unsubscribeKey = `${GEOSPATIAL_SDK_PREFIX}hover-unsub`;
 
-export function initHoverLayer(map: Map) {
+export function initHoverLayer(map: OlMap) {
   if (map.get(hoverLayerKey)) {
     clearHoverLayer(map);
   }
@@ -65,17 +63,36 @@ export function initHoverLayer(map: Map) {
       }
 
       // add hovered feature to the layer
-      const hovered = map.getFeaturesAtPixel(event.pixel, {
-        layerFilter,
-      }) as Feature[];
-      hoveredSource.addFeature(hovered[0]);
+      let firstFeature: OlFeature | null = null;
+      map.forEachFeatureAtPixel(
+        event.pixel,
+        (feature) => {
+          if (feature instanceof OlFeature) {
+            firstFeature = feature;
+            return true;
+          }
+        },
+        {
+          layerFilter,
+        },
+      );
+      if (!firstFeature) {
+        return;
+      }
+      hoveredSource.addFeature(firstFeature);
 
       // dispatch event if subscribed to
       if (map.get(FeaturesHoverEventType)) {
-        const { features } = GEOJSON.writeFeaturesObject(hovered);
+        const featuresByLayer = await readFeaturesAtPixel(
+          map,
+          event,
+          layerFilter,
+        );
+        const features = Array.from(featuresByLayer.values()).flat();
         map.dispatchEvent({
           type: FeaturesHoverEventType,
-          features: features ?? [],
+          features,
+          featuresByLayer,
         } as unknown as BaseEvent);
       }
     },
@@ -83,11 +100,11 @@ export function initHoverLayer(map: Map) {
   map.set(unsubscribeKey, unKey);
 }
 
-export function getHoverLayer(map: Map): VectorLayer<VectorSource> {
+export function getHoverLayer(map: OlMap): VectorLayer<VectorSource> {
   return map.get(hoverLayerKey) as VectorLayer<VectorSource>;
 }
 
-export function clearHoverLayer(map: Map) {
+export function clearHoverLayer(map: OlMap) {
   const hoverLayer = getHoverLayer(map);
   hoverLayer.setMap(null);
   hoverLayer.dispose();

package/lib/map/get-features.test.ts

@@ -3,7 +3,7 @@ import {
   getFeaturesFromWmsSources,
   getGFIUrl,
 } from "./get-features.js";
-import Map from "ol/Map.js";
+import OlMap from "ol/Map.js";
 import TileWMS from "ol/source/TileWMS.js";
 import TileLayer from "ol/layer/Tile.js";
 import OlFeature from "ol/Feature.js";
@@ -30,7 +30,7 @@ function createWmsSource() {
     },
   });
 }
-function createMap(): Map {
+function createMap(): OlMap {
   const wmsLayer = new TileLayer({
     source: createWmsSource(),
   });
@@ -47,23 +47,27 @@ function createMap(): Map {
     resolution: 1,
     center: [0, 0],
   });
-  const map = new BaseObject() as Map;
+  const map = new BaseObject() as OlMap;
   Object.defineProperties(map, {
     getView: { value: vi.fn(() => view) },
     getLayers: { value: vi.fn(() => new Collection([wmsLayer, vectorLayer])) },
     getEventPixel: { value: vi.fn(() => [10, 10]) },
     getCoordinateFromPixel: { value: vi.fn(() => [123, 123]) },
-    getFeaturesAtPixel: { value: vi.fn(() => [feature]) },
+    forEachFeatureAtPixel: {
+      value: vi.fn((pixel, callback) => {
+        callback(feature, vectorLayer);
+      }),
+    },
     getSize: { value: vi.fn(() => [800, 600]) },
   });
   return map;
 }
 
 describe("get features utils", () => {
-  let map: Map;
+  let map: OlMap;
   beforeEach(() => {
     map = createMap();
-    vi.spyOn(global, "fetch").mockImplementation(() =>
+    vi.spyOn(globalThis, "fetch").mockImplementation(() =>
       Promise.resolve({
         ok: true,
         json: () => Promise.resolve({ features: [gfiResult] }),
@@ -73,18 +77,25 @@ describe("get features utils", () => {
   });
 
   describe("getFeaturesFromVectorSources", () => {
-    it("returns an array of features", () => {
-      const features = getFeaturesFromVectorSources(map, [0, 0]);
-      expect(features).toEqual([
-        {
-          geometry: {
-            coordinates: [100, 200],
-            type: "Point",
-          },
-          properties: null,
-          type: "Feature",
-        },
-      ]);
+    it("returns a map of features by layer index", () => {
+      const featuresByLayerIndex = getFeaturesFromVectorSources(map, [0, 0]);
+      expect(featuresByLayerIndex).toEqual(
+        new Map([
+          [
+            1,
+            [
+              {
+                geometry: {
+                  coordinates: [100, 200],
+                  type: "Point",
+                },
+                properties: null,
+                type: "Feature",
+              },
+            ],
+          ],
+        ]),
+      );
     });
   });
   describe("getGFIUrl", () => {
@@ -102,8 +113,8 @@ describe("get features utils", () => {
   });
   describe("getFeaturesFromWmsSources", () => {
     it("queries the WMS sources", async () => {
-      const features = await getFeaturesFromWmsSources(map, [0, 0]);
-      expect(features).toEqual([gfiResult]);
+      const featuresByLayerIndex = await getFeaturesFromWmsSources(map, [0, 0]);
+      expect(featuresByLayerIndex).toEqual(new Map([[0, [gfiResult]]]));
     });
   });
 });

package/lib/map/get-features.ts

@@ -1,5 +1,5 @@
 import GeoJSON from "ol/format/GeoJSON.js";
-import Map from "ol/Map.js";
+import OlMap from "ol/Map.js";
 import { Pixel } from "ol/pixel.js";
 import type { Feature, FeatureCollection } from "geojson";
 import OlFeature from "ol/Feature.js";
@@ -8,25 +8,41 @@ import ImageWMS from "ol/source/ImageWMS.js";
 import { Coordinate } from "ol/coordinate.js";
 import Layer from "ol/layer/Layer.js";
 import throttle from "lodash.throttle";
-import { MapBrowserEvent } from "ol";
+import type MapBrowserEvent from "ol/MapBrowserEvent.js";
+import type { FeaturesByLayerIndex } from "@geospatial-sdk/core";
 
 const GEOJSON = new GeoJSON();
 
 export function getFeaturesFromVectorSources(
-  olMap: Map,
+  olMap: OlMap,
   pixel: Pixel,
-): Feature[] {
-  const olFeatures = olMap.getFeaturesAtPixel(pixel);
-  const { features } = GEOJSON.writeFeaturesObject(olFeatures as OlFeature[]);
-  if (!features) {
-    return [];
-  }
-  return features;
+  layerFilter?: (layer: Layer) => boolean,
+): FeaturesByLayerIndex {
+  const result = new Map<number, Feature[]>();
+  const layerArray = olMap.getLayers().getArray();
+  olMap.forEachFeatureAtPixel(
+    pixel,
+    (feature, layer) => {
+      // can happen for unmanaged layer (i.e. hover layer)
+      if (layer === null) {
+        return null;
+      }
+      const layerIndex = layerArray.indexOf(layer);
+      if (!result.has(layerIndex)) {
+        result.set(layerIndex, []);
+      }
+      result
+        .get(layerIndex)!
+        .push(GEOJSON.writeFeatureObject(feature as OlFeature));
+    },
+    { layerFilter },
+  );
+  return result;
 }
 
 export function getGFIUrl(
   source: TileWMS | ImageWMS,
-  map: Map,
+  map: OlMap,
   coordinate: Coordinate,
 ): string | null {
   const view = map.getView();
@@ -41,36 +57,48 @@ export function getGFIUrl(
   );
 }
 
-export function getFeaturesFromWmsSources(
-  olMap: Map,
+export async function getFeaturesFromWmsSources(
+  olMap: OlMap,
   coordinate: Coordinate,
-): Promise<Feature[]> {
-  const wmsSources: (ImageWMS | TileWMS)[] = olMap
-    .getLayers()
-    .getArray()
-    .filter(
-      (layer): layer is Layer<ImageWMS | TileWMS> =>
-        layer instanceof Layer &&
-        (layer.getSource() instanceof TileWMS ||
-          layer.getSource() instanceof ImageWMS),
-    )
-    .map((layer) => layer.getSource()!);
+  layerFilter?: (layer: Layer) => boolean,
+): Promise<FeaturesByLayerIndex> {
+  const result = new Map<number, Feature[]>();
+  const layerArray = olMap.getLayers().getArray();
 
-  if (!wmsSources.length) {
-    return Promise.resolve([]);
+  const hasWms = layerArray.some((layer) => {
+    const source = layer instanceof Layer ? layer.getSource() : null;
+    return source instanceof TileWMS || source instanceof ImageWMS;
+  });
+  if (!hasWms) {
+    return result;
   }
 
-  const gfiUrls = wmsSources.reduce((urls, source) => {
+  const gfiPromises: (Promise<Feature[]> | null)[] = layerArray.map((layer) => {
+    if (!(layer instanceof Layer)) {
+      return null;
+    }
+    if (layerFilter && !layerFilter(layer)) {
+      return null;
+    }
+    const source = layer.getSource();
+    if (!(source instanceof TileWMS) && !(source instanceof ImageWMS)) {
+      return null;
+    }
     const gfiUrl = getGFIUrl(source, olMap, coordinate);
-    return gfiUrl ? [...urls, gfiUrl] : urls;
-  }, [] as string[]);
-  return Promise.all(
-    gfiUrls.map((url) =>
-      fetch(url)
-        .then((response) => response.json())
-        .then((collection: FeatureCollection) => collection.features),
-    ),
-  ).then((features) => features.flat());
+    return gfiUrl
+      ? fetch(gfiUrl)
+          .then((response) => response.json())
+          .then((collection: FeatureCollection) => collection.features)
+      : null;
+  });
+
+  const responses = await Promise.all(gfiPromises);
+  responses.forEach((features, index) => {
+    if (features !== null && features.length > 0) {
+      result.set(index, features);
+    }
+  });
+  return result;
 }
 
 const getFeaturesFromWmsSourcesThrottled = throttle(
@@ -79,11 +107,16 @@ const getFeaturesFromWmsSourcesThrottled = throttle(
 );
 
 export async function readFeaturesAtPixel(
-  map: Map,
+  map: OlMap,
   event: MapBrowserEvent<PointerEvent>,
-) {
-  return [
-    ...getFeaturesFromVectorSources(map, event.pixel),
-    ...(await getFeaturesFromWmsSourcesThrottled(map, event.coordinate)),
-  ];
+  layerFilter?: (layer: Layer) => boolean,
+): Promise<FeaturesByLayerIndex> {
+  return new Map([
+    ...getFeaturesFromVectorSources(map, event.pixel, layerFilter),
+    ...(await getFeaturesFromWmsSourcesThrottled(
+      map,
+      event.coordinate,
+      layerFilter,
+    )),
+  ]);
 }

package/lib/map/handle-errors.test.ts

@@ -9,7 +9,7 @@ import TileLayer from "ol/layer/Tile.js";
 import VectorLayer from "ol/layer/Vector.js";
 import { EndpointError } from "@camptocamp/ogc-client";
 
-global.URL.createObjectURL = vi.fn(() => "blob:http://example.com/blob");
+globalThis.URL.createObjectURL = vi.fn(() => "blob:http://example.com/blob");
 
 const mockBlob = new Blob();
 const RESPONSE_OK = {
@@ -19,10 +19,10 @@ const RESPONSE_OK = {
 const RESPONSE_ERROR = {
   status: 404,
 };
-global.fetch = vi.fn().mockImplementation((url: string) => {
+globalThis.fetch = vi.fn().mockImplementation((url: string) => {
   return url.includes("error")
-    ? Promise.reject(RESPONSE_ERROR as Response)
-    : Promise.resolve(RESPONSE_OK as Response);
+    ? Promise.reject(RESPONSE_ERROR)
+    : Promise.resolve(RESPONSE_OK);
 });
 
 describe("handle-errors", () => {

package/lib/map/register-events.test.ts

@@ -1,89 +1,104 @@
-import Map from "ol/Map.js";
+import OlMap from "ol/Map.js";
 import { Mock } from "vitest";
 import { listen } from "./register-events.js";
 import { MapBrowserEvent, Object as BaseObject } from "ol";
 import View from "ol/View.js";
 import { toLonLat } from "ol/proj.js";
-import Point from "ol/geom/Point.js";
-import OlFeature from "ol/Feature.js";
 import { FeaturesHoverEventType } from "@geospatial-sdk/core";
 import BaseEvent from "ol/events/Event.js";
 
 vi.mock("./get-features.js", () => ({
   readFeaturesAtPixel() {
-    return [
-      {
-        geometry: {
-          coordinates: [100, 200],
-          type: "Point",
-        },
-        properties: null,
-        type: "Feature",
-      },
-      {
-        geometry: null,
-        properties: {
-          density: 123,
-        },
-        type: "Feature",
-      },
-    ];
+    return Promise.resolve(
+      new Map([
+        [
+          0,
+          [
+            {
+              geometry: {
+                coordinates: [100, 200],
+                type: "Point",
+              },
+              properties: null,
+              type: "Feature",
+            },
+          ],
+        ],
+        [
+          1,
+          [
+            {
+              geometry: null,
+              properties: {
+                density: 123,
+              },
+              type: "Feature",
+            },
+          ],
+        ],
+      ]),
+    );
   },
 }));
 
+const featureA = {
+  geometry: {
+    coordinates: [100, 200],
+    type: "Point",
+  },
+  properties: null,
+  type: "Feature",
+};
+const featureB = {
+  geometry: null,
+  properties: {
+    density: 123,
+  },
+  type: "Feature",
+};
+
 const EXPECTED_MAP_EXTENT_EPSG4326 = [
   -0.0035932611364780857, -0.0026949458513598756, 0.0035932611364780857,
   0.0026949458513740865,
 ];
 
-function createMap(): Map {
-  const feature = new OlFeature({
-    geometry: new Point([100, 200]),
-  });
+function createMap(): OlMap {
   const view = new View({
     projection: "EPSG:3857",
     resolution: 1,
     center: [0, 0],
   });
-  const map = new BaseObject() as Map;
+  const map = new BaseObject() as OlMap;
   Object.defineProperties(map, {
     getView: { value: vi.fn(() => view) },
     getEventPixel: { value: vi.fn(() => [10, 10]) },
     getCoordinateFromPixel: { value: vi.fn(() => [123, 123]) },
-    getFeaturesAtPixel: { value: vi.fn(() => [feature]) },
     getSize: { value: vi.fn(() => [800, 600]) },
   });
   // simulate hover feature initialization
   map.on("pointermove", () => {
     map.dispatchEvent({
       type: FeaturesHoverEventType,
-      features: [
-        {
-          geometry: null,
-          properties: {
-            density: 123,
-          },
-          type: "Feature",
-        },
-      ],
+      features: [featureB],
+      featuresByLayer: new Map([[0, [featureB]]]),
     } as unknown as BaseEvent);
   });
   return map;
 }
-function createMapEvent(map: Map, type: string) {
+function createMapEvent(map: OlMap, type: string) {
   return new MapBrowserEvent(
     type,
     map,
     new MouseEvent(type, {
       clientX: 10,
       clientY: 10,
-    }),
+    }) as PointerEvent,
     false,
   );
 }
 
 describe("event registration", () => {
-  let map: Map;
+  let map: OlMap;
   beforeEach(() => {
     map = createMap();
     vi.useFakeTimers();
@@ -99,15 +114,8 @@ describe("event registration", () => {
     it("registers the event on the map", () => {
       expect(callback).toHaveBeenCalledWith({
         type: "features-hover",
-        features: [
-          {
-            geometry: null,
-            properties: {
-              density: 123,
-            },
-            type: "Feature",
-          },
-        ],
+        features: [featureB],
+        featuresByLayer: new Map([[0, [featureB]]]),
         target: expect.anything(),
       });
     });
@@ -123,23 +131,11 @@ describe("event registration", () => {
     it("registers the event on the map", () => {
       expect(callback).toHaveBeenCalledWith({
         type: "features-click",
-        features: [
-          {
-            geometry: {
-              coordinates: [100, 200],
-              type: "Point",
-            },
-            properties: null,
-            type: "Feature",
-          },
-          {
-            geometry: null,
-            properties: {
-              density: 123,
-            },
-            type: "Feature",
-          },
-        ],
+        features: [featureA, featureB],
+        featuresByLayer: new Map([
+          [0, [featureA]],
+          [1, [featureB]],
+        ]),
         target: expect.anything(),
       });
     });

package/lib/map/register-events.ts

@@ -18,10 +18,12 @@ function registerFeatureClickEvent(map: Map) {
   if (map.get(FeaturesClickEventType)) return;
 
   map.on("click", async (event: any) => {
-    const features = await readFeaturesAtPixel(map, event);
+    const featuresByLayer = await readFeaturesAtPixel(map, event);
+    const features = Array.from(featuresByLayer.values()).flat();
     map.dispatchEvent({
       type: FeaturesClickEventType,
       features,
+      featuresByLayer,
     } as unknown as BaseEvent);
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geospatial-sdk/openlayers",
-  "version": "0.0.5-dev.51+33b8820",
+  "version": "0.0.5-dev.52+73ea489",
   "description": "OpenLayers-related utilities",
   "keywords": [
     "ol",
@@ -37,10 +37,10 @@
     "ol": ">9.x"
   },
   "dependencies": {
-    "@geospatial-sdk/core": "^0.0.5-dev.51+33b8820",
+    "@geospatial-sdk/core": "^0.0.5-dev.52+73ea489",
     "chroma-js": "^2.4.2",
     "lodash.throttle": "^4.1.1",
     "ol-mapbox-style": "12.4.0"
   },
-  "gitHead": "33b882078fc7b6f4f12d3eaac671d9c142ecf9f7"
+  "gitHead": "73ea4890e493aae5379e23af6b7679bab253db92"
 }