@geospatial-sdk/openlayers 0.0.5-dev.42 → 0.0.5-dev.44

package/dist/map/create-map.js

@@ -85,7 +85,7 @@ export async function createLayer(layerModel) {
                 const dimensions = endpoint.getDefaultDimensions(layer.name);
                 olLayer.setSource(new WMTS({
                     layer: layer.name,
-                    style: layer.defaultStyle,
+                    style: layer.defaultStyle || layer.styles[0].name,
                     matrixSet: matrixSet.identifier,
                     format: resourceUrl.format,
                     url: resourceUrl.url,

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

@@ -10,12 +10,12 @@ import {
   SAMPLE_LAYER3,
   SAMPLE_LAYER4,
   SAMPLE_LAYER5,
-} from "@geospatial-sdk/core/fixtures/map-context.fixtures";
-import Map from "ol/Map";
-import { createLayer, createMapFromContext } from "./create-map";
-import { applyContextDiffToMap } from "./apply-context-diff";
+} from "@geospatial-sdk/core/fixtures/map-context.fixtures.js";
+import Map from "ol/Map.js";
+import { createLayer, createMapFromContext } from "./create-map.js";
+import { applyContextDiffToMap } from "./apply-context-diff.js";
 import { beforeEach } from "vitest";
-import BaseLayer from "ol/layer/Base";
+import BaseLayer from "ol/layer/Base.js";
 
 async function assertEqualsToModel(layer: any, layerModel: MapContextLayer) {
   const reference = (await createLayer(layerModel)) as any;

package/lib/map/create-map.test.ts

@@ -1,12 +1,12 @@
 import { FeatureCollection } from "geojson";
-import TileLayer from "ol/layer/Tile";
-import VectorLayer from "ol/layer/Vector";
-import Map from "ol/Map";
-import TileWMS from "ol/source/TileWMS";
-import VectorSource from "ol/source/Vector";
-import XYZ from "ol/source/XYZ";
-import View from "ol/View";
-import GeoJSON from "ol/format/GeoJSON";
+import TileLayer from "ol/layer/Tile.js";
+import VectorLayer from "ol/layer/Vector.js";
+import Map from "ol/Map.js";
+import TileWMS from "ol/source/TileWMS.js";
+import VectorSource from "ol/source/Vector.js";
+import XYZ from "ol/source/XYZ.js";
+import View from "ol/View.js";
+import GeoJSON from "ol/format/GeoJSON.js";
 import {
   MAP_CTX_EXTENT_FIXTURE,
   MAP_CTX_FIXTURE,
@@ -19,34 +19,35 @@ import {
   MAP_CTX_LAYER_WMS_FIXTURE,
   MAP_CTX_LAYER_WMTS_FIXTURE,
   MAP_CTX_LAYER_XYZ_FIXTURE,
-} from "@geospatial-sdk/core/fixtures/map-context.fixtures";
+} from "@geospatial-sdk/core/fixtures/map-context.fixtures.js";
 import {
   MapContext,
   MapContextLayer,
   MapContextLayerGeojson,
   MapContextLayerWms,
-  SourceLoadErrorEvent,
 } from "@geospatial-sdk/core";
-import Layer from "ol/layer/Layer";
+import Layer from "ol/layer/Layer.js";
 import {
   createLayer,
   createMapFromContext,
   createView,
   resetMapFromContext,
-} from "./create-map";
-import WMTS from "ol/source/WMTS";
-import { VectorTile } from "ol/source";
+} from "./create-map.js";
+import WMTS from "ol/source/WMTS.js";
+import { VectorTile } from "ol/source.js";
 import { MapboxVectorLayer } from "ol-mapbox-style";
 import {
   handleEndpointError,
   tileLoadErrorCatchFunction,
-} from "./handle-errors";
-import { ImageTile } from "ol";
+} from "./handle-errors.js";
+import ImageTile from "ol/ImageTile.js";
 import TileState from "ol/TileState.js";
-import VectorTileLayer from "ol/layer/VectorTile";
+import VectorTileLayer from "ol/layer/VectorTile.js";
+import { FeatureUrlFunction } from "ol/featureloader.js";
 
 vi.mock("./handle-errors", async (importOriginal) => {
-  const actual = await importOriginal();
+  const actual =
+    (await importOriginal()) as typeof import("./handle-errors.js");
   return {
     ...actual,
     tileLoadErrorCatchFunction: vi.fn(),
@@ -54,6 +55,10 @@ vi.mock("./handle-errors", async (importOriginal) => {
   };
 });
 
+afterEach(() => {
+  vi.clearAllMocks();
+});
+
 describe("MapContextService", () => {
   describe("#createLayer", () => {
     let layerModel: MapContextLayer, layer: Layer;
@@ -140,7 +145,7 @@ describe("MapContextService", () => {
         expect(layer.getVisible()).toBe(false);
         expect(layer.getOpacity()).toBe(0.5);
         expect(layer.get("label")).toBe("Communes");
-        // @ts-ignore
+        // @ts-expect-error TS2554 we're not providing a view extent here
         expect(layer.getSource()?.getAttributions()!()).toEqual(["camptocamp"]);
       });
       it("create a TileWMS source", () => {
@@ -200,7 +205,7 @@ describe("MapContextService", () => {
 
         const attributions = layer.getSource()?.getAttributions();
         expect(attributions).not.toBeNull();
-        // @ts-ignore
+        // @ts-expect-error TS2554 we're not providing a view extent here
         expect(attributions!()).toEqual(["camptocamp"]);
       });
       it("create a Vector source", () => {
@@ -209,7 +214,8 @@ describe("MapContextService", () => {
       });
       it("set correct url load function", () => {
         const source = layer.getSource() as VectorSource;
-        const urlLoader = source.getUrl() as Function;
+        const urlLoader = source.getUrl() as FeatureUrlFunction;
+        // @ts-expect-error TS2345
         expect(urlLoader([10, 20, 30, 40])).toBe(
           "https://www.datagrandest.fr/geoserver/region-grand-est/ows?service=WFS&version=1.1.0&request=GetFeature&outputFormat=application%2Fjson&typename=ms%3Acommune_actuelle_3857&srsname=EPSG%3A3857&bbox=10%2C20%2C30%2C40%2CEPSG%3A3857&maxFeatures=10000",
         );
@@ -330,11 +336,8 @@ describe("MapContextService", () => {
 
     describe("WMTS", () => {
       beforeEach(async () => {
-        (layerModel = MAP_CTX_LAYER_WMTS_FIXTURE),
-          (layer = await createLayer(layerModel));
-      });
-      afterEach(() => {
-        vi.clearAllMocks();
+        layerModel = MAP_CTX_LAYER_WMTS_FIXTURE;
+        layer = await createLayer(layerModel);
       });
       it("create a tile layer", () => {
         expect(layer).toBeTruthy();
@@ -344,7 +347,9 @@ describe("MapContextService", () => {
         expect(layer.getVisible()).toBe(true);
         expect(layer.getOpacity()).toBe(1);
         expect(layer.get("label")).toBeUndefined();
-        expect(layer.getSource()?.getAttributions()).toBeNull();
+        const source = layer.getSource() as WMTS;
+        expect(source.getAttributions()).toBeNull();
+        expect(source.getStyle()).toBe("default");
       });
       it("create a WMTS source", () => {
         const source = layer.getSource();
@@ -372,15 +377,25 @@ describe("MapContextService", () => {
       it("should call handleEndpointError", () => {
         expect(handleEndpointError).toHaveBeenCalled();
       });
-      afterEach(() => {
-        vi.clearAllMocks();
+    });
+    describe("WMTS without default style given", () => {
+      beforeEach(async () => {
+        layerModel = {
+          ...MAP_CTX_LAYER_WMTS_FIXTURE,
+          url: "https://wmts/no-default-style",
+        };
+        layer = await createLayer(layerModel);
+      });
+      it("uses the first style as default", async () => {
+        const source = layer.getSource() as WMTS;
+        expect(source.getStyle()).toEqual("first");
       });
     });
 
     describe("Maplibre Style", () => {
       beforeEach(async () => {
-        (layerModel = MAP_CTX_LAYER_MAPBLIBRE_STYLE_FIXTURE),
-          (layer = await createLayer(layerModel));
+        layerModel = MAP_CTX_LAYER_MAPBLIBRE_STYLE_FIXTURE;
+        layer = await createLayer(layerModel);
       });
       it("create a tile layer", () => {
         expect(layer).toBeTruthy();
@@ -399,8 +414,8 @@ describe("MapContextService", () => {
 
     describe("MVT", () => {
       beforeEach(async () => {
-        (layerModel = MAP_CTX_LAYER_MVT_FIXTURE),
-          (layer = await createLayer(layerModel));
+        layerModel = MAP_CTX_LAYER_MVT_FIXTURE;
+        layer = await createLayer(layerModel);
       });
       it("create a VectorTileLayer", () => {
         expect(layer).toBeTruthy();

package/lib/map/create-map.ts

@@ -113,7 +113,7 @@ export async function createLayer(layerModel: MapContextLayer): Promise<Layer> {
           olLayer.setSource(
             new WMTS({
               layer: layer.name,
-              style: layer.defaultStyle,
+              style: layer.defaultStyle || layer.styles[0].name,
               matrixSet: matrixSet.identifier,
               format: resourceUrl.format,
               url: resourceUrl.url,

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

@@ -1,11 +1,13 @@
 import { ImageTile, Tile } from "ol";
 import TileState from "ol/TileState.js";
 import { SourceLoadErrorEvent } from "@geospatial-sdk/core";
-import { handleTileError, tileLoadErrorCatchFunction } from "./handle-errors";
-import { Map } from "ol";
+import {
+  handleTileError,
+  tileLoadErrorCatchFunction,
+} from "./handle-errors.js";
 import { describe } from "node:test";
-import TileLayer from "ol/layer/Tile";
-import VectorLayer from "ol/layer/Vector";
+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");
@@ -25,11 +27,9 @@ global.fetch = vi.fn().mockImplementation((url: string) => {
 });
 
 describe("handle-errors", () => {
-  let map: Map;
   let tile: Tile;
 
   beforeEach(() => {
-    map = new Map();
     tile = new ImageTile(
       [0, 0, 0],
       TileState.IDLE,

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

@@ -1,20 +1,20 @@
-import Map from "ol/Map";
+import Map from "ol/Map.js";
 import { Mock } from "vitest";
 import {
   getFeaturesFromVectorSources,
   getFeaturesFromWmsSources,
   getGFIUrl,
   listen,
-} from "./register-events";
+} from "./register-events.js";
 import { Collection, MapBrowserEvent, Object as BaseObject } from "ol";
-import View from "ol/View";
-import { toLonLat } from "ol/proj";
-import TileWMS from "ol/source/TileWMS";
-import VectorSource from "ol/source/Vector";
-import VectorLayer from "ol/layer/Vector";
-import Point from "ol/geom/Point";
-import TileLayer from "ol/layer/Tile";
-import OlFeature from "ol/Feature";
+import View from "ol/View.js";
+import { toLonLat } from "ol/proj.js";
+import TileWMS from "ol/source/TileWMS.js";
+import VectorSource from "ol/source/Vector.js";
+import VectorLayer from "ol/layer/Vector.js";
+import Point from "ol/geom/Point.js";
+import TileLayer from "ol/layer/Tile.js";
+import OlFeature from "ol/Feature.js";
 
 const EXPECTED_MAP_EXTENT_EPSG4326 = [
   -0.0035932611364780857, -0.0026949458513598756, 0.0035932611364780857,

package/lib/map/styles.test.ts

@@ -1,15 +1,15 @@
 import chroma from "chroma-js";
-import Style from "ol/style/Style";
-import Feature from "ol/Feature";
-import { LineString, Point, Polygon } from "ol/geom";
+import Style, { StyleFunction } from "ol/style/Style.js";
+import Feature from "ol/Feature.js";
+import { LineString, Point, Polygon } from "ol/geom.js";
 import {
   createGeometryStyles,
   createStyleFunction,
   defaultHighlightStyle,
   defaultStyle,
   StyleByGeometryType,
-} from "./styles";
-import CircleStyle from "ol/style/Circle";
+} from "./styles.js";
+import CircleStyle from "ol/style/Circle.js";
 
 describe("MapStyleService", () => {
   describe("#createGeometryStyles", () => {
@@ -139,7 +139,7 @@ describe("MapStyleService", () => {
   });
 
   describe("#createStyleFunction", () => {
-    let styleFn: Function;
+    let styleFn: StyleFunction;
     let feature: Feature;
     it("returns a function", () => {
       styleFn = createStyleFunction(
@@ -154,7 +154,7 @@ describe("MapStyleService", () => {
         feature.setGeometry(new LineString([]));
       });
       it("resolves to a double style with stroke", () => {
-        const style = styleFn(feature, 1);
+        const style = styleFn(feature, 1) as Style[];
         expect(style).toEqual([expect.any(Style), expect.any(Style)]);
         expect(style[0].getStroke()).toBeTruthy();
         expect(style[0].getFill()).toBeFalsy();
@@ -166,7 +166,7 @@ describe("MapStyleService", () => {
         feature.setGeometry(new Point([]));
       });
       it("resolves to a style with image", () => {
-        const style = styleFn(feature, 1);
+        const style = styleFn(feature, 1) as Style;
         expect(style.getImage()).toBeTruthy();
         expect(style.getFill()).toBeFalsy();
         expect(style.getStroke()).toBeFalsy();
@@ -177,7 +177,7 @@ describe("MapStyleService", () => {
         feature.setGeometry(new Polygon([]));
       });
       it("resolves to a style with fill and stroke", () => {
-        const style = styleFn(feature, 1);
+        const style = styleFn(feature, 1) as Style;
         expect(style.getFill()).toBeTruthy();
         expect(style.getStroke()).toBeTruthy();
         expect(style.getImage()).toBeFalsy();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geospatial-sdk/openlayers",
-  "version": "0.0.5-dev.42+baa75c1",
+  "version": "0.0.5-dev.44+44c94a2",
   "description": "OpenLayers-related utilities",
   "keywords": [
     "ol",
@@ -37,10 +37,10 @@
     "ol": ">6.x"
   },
   "dependencies": {
-    "@geospatial-sdk/core": "^0.0.5-dev.42+baa75c1",
+    "@geospatial-sdk/core": "^0.0.5-dev.44+44c94a2",
     "chroma-js": "^2.4.2",
     "lodash.throttle": "^4.1.1",
     "ol-mapbox-style": "12.4.0"
   },
-  "gitHead": "baa75c1fed77ed160f6a2d94bfeb5358cc91d63a"
+  "gitHead": "44c94a2e3458beb7e3f3ffc98ed170c21a0fc460"
 }