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

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

@@ -1,13 +1,6 @@
-import { ImageTile, Tile } from "ol";
-import TileState from "ol/TileState.js";
-import { SourceLoadErrorEvent } from "@geospatial-sdk/core";
-import {
-  handleTileError,
-  tileLoadErrorCatchFunction,
-} from "./handle-errors.js";
 import TileLayer from "ol/layer/Tile.js";
 import VectorLayer from "ol/layer/Vector.js";
-import { EndpointError } from "@camptocamp/ogc-client";
+import { emitLayerLoadingError } from "./register-events.js";
 
 globalThis.URL.createObjectURL = vi.fn(() => "blob:http://example.com/blob");
 
@@ -26,45 +19,29 @@ globalThis.fetch = vi.fn().mockImplementation((url: string) => {
 });
 
 describe("handle-errors", () => {
-  let tile: Tile;
-
-  beforeEach(() => {
-    tile = new ImageTile(
-      [0, 0, 0],
-      TileState.IDLE,
-      "",
-      null,
-      () => tileLoadErrorCatchFunction,
-    );
-  });
-
   describe("handleEndpointError", () => {
     it("should dispatch SourceLoadErrorEvent", () => {
-      const endpointErrorMock: EndpointError = {
-        name: "Error",
-        message: "FORBIDDEN",
-        httpStatus: 403,
-      };
       const layer = new VectorLayer({});
       const dispatchEventSpy = vi.spyOn(layer, "dispatchEvent");
-      handleTileError(endpointErrorMock, tile, layer);
-      expect(dispatchEventSpy).toHaveBeenCalledWith(
-        new SourceLoadErrorEvent(endpointErrorMock),
-      );
+      emitLayerLoadingError(layer, new Error("FORBIDDEN"), 403);
+      expect(dispatchEventSpy).toHaveBeenCalledWith({
+        type: "--geospatial-sdk-layer-loading-error",
+        error: new Error("FORBIDDEN"),
+        httpStatus: 403,
+      });
     });
   });
 
   describe("handleTileError", () => {
     it("should set tile state to ERROR and dispatch SourceLoadErrorEvent", () => {
-      const response = new Response("Forbidden", { status: 403 });
       const layer = new TileLayer({});
       const dispatchEventSpy = vi.spyOn(layer, "dispatchEvent");
-      const setStateEventSpy = vi.spyOn(tile, "setState");
-      handleTileError(response, tile, layer);
-      expect(setStateEventSpy).toHaveBeenCalledWith(TileState.ERROR);
-      expect(dispatchEventSpy).toHaveBeenCalledWith(
-        new SourceLoadErrorEvent(response),
-      );
+      emitLayerLoadingError(layer, new Error("Forbidden"), 403);
+      expect(dispatchEventSpy).toHaveBeenCalledWith({
+        type: "--geospatial-sdk-layer-loading-error",
+        error: new Error("Forbidden"),
+        httpStatus: 403,
+      });
     });
   });
 });

package/lib/map/handle-errors.ts

@@ -1,30 +1,7 @@
-import { EndpointError } from "@camptocamp/ogc-client";
-import { SourceLoadErrorEvent } from "@geospatial-sdk/core";
 import { ImageTile, 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";
 import TileState from "ol/TileState.js";
-
-export function handleEndpointError(
-  layer: TileLayer<TileSource> | VectorLayer<VectorSource>,
-  error: EndpointError,
-) {
-  console.error("Error loading Endpoint", error);
-  layer.dispatchEvent(new SourceLoadErrorEvent(error));
-}
-
-export function handleTileError(
-  response: Response | Error,
-  tile: Tile,
-  layer: 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: Layer,
@@ -40,14 +17,19 @@ export function tileLoadErrorCatchFunction(
             const image = (tile as ImageTile).getImage();
             (image as HTMLImageElement).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/lib/map/index.ts

@@ -5,4 +5,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/lib/map/layer-update.ts

@@ -1,8 +1,9 @@
-import { getHash, MapContextLayer } from "@geospatial-sdk/core";
 import {
+  getHash,
   MapContextBaseLayer,
+  MapContextLayer,
   MapContextLayerVector,
-} from "@geospatial-sdk/core/lib/model/map-context.js";
+} from "@geospatial-sdk/core";
 import Layer from "ol/layer/Layer.js";
 import VectorLayer from "ol/layer/Vector.js";
 import type VectorSource from "ol/source/Vector.js";