@geospatial-sdk/legend 0.0.5-dev.58 → 0.0.5-dev.60

package/dist/create-legend/from-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"from-layer.d.ts","sourceRoot":"","sources":["../../lib/create-legend/from-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAIhB,MAAM,sBAAsB,CAAC;AAG9B;;GAEG;AACH,UAAU,aAAa;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAoED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,eAAe,EACtB,OAAO,GAAE,aAAkB,GAC1B,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAiE7B"}
+{"version":3,"file":"from-layer.d.ts","sourceRoot":"","sources":["../../lib/create-legend/from-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAIhB,MAAM,sBAAsB,CAAC;AAG9B;;GAEG;AACH,UAAU,aAAa;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AA+ED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,eAAe,EACtB,OAAO,GAAE,aAAkB,GAC1B,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAiE7B"}

package/dist/create-legend/from-layer.js

@@ -16,6 +16,7 @@ function createWmsLegendUrl(layer, options = {}) {
         "LAYER",
         "LAYERTITLE",
         "SLD_VERSION",
+        "STYLE",
         "WIDTH",
         "HEIGHT",
     ]));
@@ -25,6 +26,9 @@ function createWmsLegendUrl(layer, options = {}) {
     legendUrl.searchParams.set("LAYER", layer.name);
     legendUrl.searchParams.set("LAYERTITLE", false.toString()); // Disable layer title for QGIS Server
     legendUrl.searchParams.set("SLD_VERSION", "1.1.0"); // Default SLD version
+    if (layer.style !== undefined) {
+        legendUrl.searchParams.set("STYLE", layer.style);
+    }
     if (widthPxHint) {
         legendUrl.searchParams.set("WIDTH", widthPxHint.toString());
     }
@@ -42,10 +46,18 @@ function createWmsLegendUrl(layer, options = {}) {
 async function createWmtsLegendUrl(layer) {
     const endpoint = await new WmtsEndpoint(layer.url).isReady();
     const layerByName = endpoint.getLayerByName(layer.name);
-    if (layerByName.styles &&
-        layerByName.styles.length > 0 &&
-        layerByName.styles[0].legendUrl) {
-        return layerByName.styles[0].legendUrl;
+    if (layerByName.styles && layerByName.styles.length > 0) {
+        // If a specific style is requested, find its legend URL
+        if (layer.style !== undefined) {
+            const matchingStyle = layerByName.styles.find((s) => s.name === layer.style);
+            if (matchingStyle?.legendUrl) {
+                return matchingStyle.legendUrl;
+            }
+        }
+        // Fall back to the first style's legend URL
+        if (layerByName.styles[0].legendUrl) {
+            return layerByName.styles[0].legendUrl;
+        }
     }
     return null;
 }

package/lib/create-legend/from-layer.test.ts

@@ -56,6 +56,17 @@ describe("createLegendFromLayer", () => {
     expect(img?.src).toContain("HEIGHT=100");
   });
 
+  it("includes STYLE parameter in WMS legend URL when layer has a style", async () => {
+    const result = await createLegendFromLayer({
+      ...baseWmsLayer,
+      style: "my_custom_style",
+    });
+
+    const img = (result as HTMLElement).querySelector("img");
+
+    expect(img?.src).toContain("STYLE=my_custom_style");
+  });
+
   it("creates a legend for a valid WMTS layer with legend URL", async () => {
     const mockLegendUrl = "https://example.com/legend.png";
     const mockIsReady = {
@@ -98,6 +109,32 @@ describe("createLegendFromLayer", () => {
     );
   });
 
+  it("uses matching style legend URL for WMTS layer when layer.style is set", async () => {
+    const mockIsReady = {
+      getLayerByName: () => ({
+        styles: [
+          {
+            name: "default",
+            legendUrl: "https://example.com/default-legend.png",
+          },
+          { name: "night", legendUrl: "https://example.com/night-legend.png" },
+        ],
+      }),
+    } as unknown as WmtsEndpoint;
+
+    vi.spyOn(WmtsEndpoint.prototype, "isReady").mockImplementation(function () {
+      return Promise.resolve(mockIsReady);
+    });
+
+    const result = await createLegendFromLayer({
+      ...baseWmtsLayer,
+      style: "night",
+    });
+    const img = (result as HTMLElement).querySelector("img");
+
+    expect(img?.src).toBe("https://example.com/night-legend.png");
+  });
+
   it("returns null for invalid layer type", async () => {
     const invalidLayer = { ...baseWmsLayer, type: "invalid" as any };
 

package/lib/create-legend/from-layer.ts

@@ -36,6 +36,7 @@ function createWmsLegendUrl(
       "LAYER",
       "LAYERTITLE",
       "SLD_VERSION",
+      "STYLE",
       "WIDTH",
       "HEIGHT",
     ]),
@@ -46,7 +47,9 @@ function createWmsLegendUrl(
   legendUrl.searchParams.set("LAYER", layer.name);
   legendUrl.searchParams.set("LAYERTITLE", false.toString()); // Disable layer title for QGIS Server
   legendUrl.searchParams.set("SLD_VERSION", "1.1.0"); // Default SLD version
-
+  if (layer.style !== undefined) {
+    legendUrl.searchParams.set("STYLE", layer.style);
+  }
   if (widthPxHint) {
     legendUrl.searchParams.set("WIDTH", widthPxHint.toString());
   }
@@ -70,12 +73,20 @@ async function createWmtsLegendUrl(
 
   const layerByName = endpoint.getLayerByName(layer.name);
 
-  if (
-    layerByName.styles &&
-    layerByName.styles.length > 0 &&
-    layerByName.styles[0].legendUrl
-  ) {
-    return layerByName.styles[0].legendUrl;
+  if (layerByName.styles && layerByName.styles.length > 0) {
+    // If a specific style is requested, find its legend URL
+    if (layer.style !== undefined) {
+      const matchingStyle = layerByName.styles.find(
+        (s: { name?: string }) => s.name === layer.style,
+      );
+      if (matchingStyle?.legendUrl) {
+        return matchingStyle.legendUrl;
+      }
+    }
+    // Fall back to the first style's legend URL
+    if (layerByName.styles[0].legendUrl) {
+      return layerByName.styles[0].legendUrl;
+    }
   }
 
   return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geospatial-sdk/legend",
-  "version": "0.0.5-dev.58+2a0ef33",
+  "version": "0.0.5-dev.60+f826933",
   "description": "Get legend graphic from the map-context",
   "keywords": [
     "legend"
@@ -30,10 +30,10 @@
     "build": "tsc"
   },
   "devDependencies": {
-    "@geospatial-sdk/core": "^0.0.5-dev.58+2a0ef33"
+    "@geospatial-sdk/core": "^0.0.5-dev.60+f826933"
   },
   "bugs": {
     "url": "https://github.com/camptocamp/geospatial-sdk/issues"
   },
-  "gitHead": "2a0ef33a707649901451dfc3572c2b9efdb00c26"
+  "gitHead": "f8269338a04fb473cb6a467a12d2cddad89e6b98"
 }