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

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;AAwDtC,wBAAsB,WAAW,CAAC,UAAU,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAoQ7E;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"}
+{"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

@@ -26,6 +26,8 @@ import { canDoIncrementalUpdate, updateLayerProperties, } from "./layer-update.j
 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);
@@ -66,20 +68,33 @@ export async function createLayer(layerModel) {
             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;

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

@@ -46,6 +46,8 @@ import {
 } from "./create-map.js";
 import { tileLoadErrorCatchFunction } from "./handle-errors.js";
 import { GEOSPATIAL_SDK_PREFIX } from "./constants.js";
+import ImageLayer from "ol/layer/Image.js";
+import ImageWMS from "ol/source/ImageWMS.js";
 
 vi.mock("./handle-errors", async (importOriginal) => {
   const actual =
@@ -185,8 +187,11 @@ describe("MapContextService", () => {
       it("set correct WMS params", () => {
         const source = layer.getSource() as TileWMS;
         const params = source.getParams();
-        expect(params.LAYERS).toBe((layerModel as MapContextLayerWms).name);
-        expect(params.STYLES).toBe((layerModel as MapContextLayerWms).style);
+        expect(params).toEqual({
+          LAYERS: (layerModel as MapContextLayerWms).name,
+          STYLES: (layerModel as MapContextLayerWms).style,
+          TILED: true,
+        });
       });
       it("set correct url without existing REQUEST and SERVICE params", () => {
         const source = layer.getSource() as TileWMS;
@@ -225,6 +230,50 @@ describe("MapContextService", () => {
           type: `${GEOSPATIAL_SDK_PREFIX}layer-loading-status`,
         });
       });
+
+      describe("not using tiles", () => {
+        beforeEach(async () => {
+          layerModel = { ...MAP_CTX_LAYER_WMS_FIXTURE, useTiles: false };
+          layer = await createLayer(layerModel);
+          layer.on(
+            `${GEOSPATIAL_SDK_PREFIX}layer-loading-status`,
+            eventCallback,
+          );
+          layer.on(`${GEOSPATIAL_SDK_PREFIX}layer-data-info`, eventCallback);
+        });
+        it("create an image layer", () => {
+          expect(layer).toBeTruthy();
+          expect(layer).toBeInstanceOf(ImageLayer);
+        });
+        it("set correct layer properties", () => {
+          expect(layer.getVisible()).toBe(false);
+          expect(layer.getOpacity()).toBe(0.5);
+          expect(layer.get("label")).toBe("Communes");
+          // @ts-expect-error TS2554 we're not providing a view extent here
+          expect(layer.getSource()?.getAttributions()!()).toEqual([
+            "camptocamp",
+          ]);
+        });
+        it("create an ImageWMS source", () => {
+          const source = layer.getSource();
+          expect(source).toBeInstanceOf(ImageWMS);
+        });
+        it("set correct WMS params", () => {
+          const source = layer.getSource() as ImageWMS;
+          const params = source.getParams();
+          expect(params).toEqual({
+            LAYERS: (layerModel as MapContextLayerWms).name,
+            STYLES: (layerModel as MapContextLayerWms).style,
+          });
+        });
+        it("set correct url without existing REQUEST and SERVICE params", () => {
+          const source = layer.getSource() as ImageWMS;
+          const url = source.getUrl();
+          expect(url).toBe(
+            "https://www.datagrandest.fr/geoserver/region-grand-est/ows",
+          );
+        });
+      });
     });
 
     describe("WFS", () => {

package/lib/map/create-map.ts

@@ -50,6 +50,8 @@ import {
   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
@@ -99,24 +101,36 @@ export async function createLayer(layerModel: MapContextLayer): Promise<Layer> {
 
     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: Tile, src: string) {
-          return tileLoadErrorCatchFunction(
-            layer as TileLayer<TileWMS>,
-            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: Tile, src: string) {
+                return tileLoadErrorCatchFunction(
+                  layer as TileLayer<TileWMS>,
+                  tile,
+                  src,
+                );
+              },
+            }),
+          });
+        }
         defer().then(() => emitLayerLoadingStatusSuccess(layer));
       }
       break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geospatial-sdk/openlayers",
-  "version": "0.0.5-dev.56+eae591c",
+  "version": "0.0.5-dev.57+457e2f3",
   "description": "OpenLayers-related utilities",
   "keywords": [
     "ol",
@@ -37,9 +37,9 @@
     "ol": ">9.x"
   },
   "dependencies": {
-    "@geospatial-sdk/core": "^0.0.5-dev.56+eae591c",
+    "@geospatial-sdk/core": "^0.0.5-dev.57+457e2f3",
     "lodash.throttle": "^4.1.1",
     "ol-mapbox-style": "12.4.0"
   },
-  "gitHead": "eae591cfcca0346c3cac6fe7d5dcddf88fe408f4"
+  "gitHead": "457e2f3e1cf7b542bee94549314405cd4a2b983e"
 }