@nextgis/ngw-leaflet 3.0.0-alpha.18 → 3.0.0-alpha.19

package/lib/ngw-leaflet.esm-bundler.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 3.0.0-alpha.17; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 3.0.0-alpha.18; author: NextGIS */
 import LeafletMapAdapter from '@nextgis/leaflet-map-adapter';
 import { NgwMap } from '@nextgis/ngw-map';
 import { Icon } from 'leaflet';

package/lib/ngw-leaflet.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 3.0.0-alpha.17; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 3.0.0-alpha.18; author: NextGIS */
 var NgwLeaflet = (function () {
   'use strict';
 
@@ -17041,7 +17041,6 @@ var NgwLeaflet = (function () {
   var __publicField$D = (obj, key, value) => __defNormalProp$U(obj, typeof key !== "symbol" ? key + "" : key, value);
   class ImageLayer extends leafletSrcExports.Layer {
     constructor(url, options) {
-      var _a;
       super(options);
       __publicField$D(this, "defaultWmsParams", {
         service: "WMS",
@@ -17076,18 +17075,21 @@ var NgwLeaflet = (function () {
       const opts = {};
       let opt;
       for (opt in options) {
+        const val = options[opt];
         if (opt in this.options) {
-          opts[opt] = options[opt];
-        } else if (!isObject$1(options[opt])) {
-          params[opt] = options[opt];
+          opts[opt] = val;
+        }
+      }
+      if (options.params) {
+        for (const param in options.params) {
+          const val = options.params[param];
+          if (!isObject$1(val) && !Array.isArray(val) && typeof val !== "function") {
+            params[param] = val;
+          }
         }
       }
       leafletSrcExports.Util.setOptions(this, opts);
-      this.wmsParams = leafletSrcExports.Util.extend(
-        {},
-        this.defaultWmsParams,
-        (_a = params == null ? void 0 : params.params) != null ? _a : {}
-      );
+      this.wmsParams = leafletSrcExports.Util.extend({}, this.defaultWmsParams, params);
     }
     setParams(params) {
       leafletSrcExports.Util.extend(this.wmsParams, params);
@@ -18191,7 +18193,7 @@ var NgwLeaflet = (function () {
 
   var pkg = {
   	name: "@nextgis/ngw-connector",
-  	version: "3.0.0-alpha.17",
+  	version: "3.0.0-alpha.18",
   	_priority: 12,
   	description: "A lightweight HTTP client optimized for use with NextGIS Web API",
   	main: "index.js",
@@ -21317,6 +21319,10 @@ var NgwLeaflet = (function () {
     }
   }
 
+  function createLayerSymbolParam(resourceId, intervals) {
+    return { [`symbols[${resourceId}]`]: intervals.join(",") || void 0 };
+  }
+
   var __defProp$p = Object.defineProperty;
   var __defProps$d = Object.defineProperties;
   var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
@@ -21385,7 +21391,9 @@ var NgwLeaflet = (function () {
       this.connector = connector;
       this.layer = layer;
       this.layerId = layerId;
-      this.legend = this.createLegend(legend);
+      if (legend) {
+        this.legend = this.createLegend(legend);
+      }
       this.resourceId = resourceId;
       this.webMap = webMap;
       this.onSymbolRenderChange = onSymbolRenderChange;
@@ -21394,12 +21402,13 @@ var NgwLeaflet = (function () {
       this.layerId = String(layer.id);
       this.layer = layer;
     }
-    create(options) {
-      return __async$j(this, null, function* () {
+    create() {
+      return __async$j(this, arguments, function* (options = {}) {
         if (this.connector) {
           const ngwLegend = yield this.connector.route("render.legend_symbols", {
             id: this.resourceId
           }).get(__spreadValues$h({}, options));
+          this.legend = ngwLegend;
           return this.createLegend(ngwLegend);
         }
       });
@@ -21413,15 +21422,17 @@ var NgwLeaflet = (function () {
       }));
     }
     setSymbolRender(symbolIndex, status) {
-      const legendItem = this.legend.find((l) => l.index === symbolIndex);
-      if (legendItem) {
-        const render = legendItem.render;
-        if (render !== status) {
-          legendItem.render = status;
-          const newSymbols = this.legend.filter((l) => l.render).map((l) => l.index);
-          this.setLegendSymbol(newSymbols);
-          if (this.onSymbolRenderChange) {
-            this.onSymbolRenderChange(newSymbols);
+      if (this.legend) {
+        const legendItem = this.legend.find((l) => l.index === symbolIndex);
+        if (legendItem) {
+          const render = legendItem.render;
+          if (render !== status) {
+            legendItem.render = status;
+            const newSymbols = this.legend.filter((l) => l.render).map((l) => l.index);
+            this.setLegendSymbol(newSymbols);
+            if (this.onSymbolRenderChange) {
+              this.onSymbolRenderChange(newSymbols);
+            }
           }
         }
       }
@@ -21433,9 +21444,7 @@ var NgwLeaflet = (function () {
       }
       if (this.layer.updateLayer) {
         this.layer.updateLayer({
-          params: {
-            [`symbols[${this.resourceId}]`]: intervals.join(",") || void 0
-          }
+          params: __spreadValues$h({}, createLayerSymbolParam(this.resourceId, intervals))
         });
       }
       if (intervals.length) {
@@ -21588,13 +21597,10 @@ var NgwLeaflet = (function () {
           if (connector && "resourceId" in this.item) {
             const resourceId = Number(this.item.resourceId);
             if (this.item.item_type === "layer") {
-              const ngwLegend = yield connector.route("render.legend_symbols", {
-                id: resourceId
-              }).get(__spreadValues$g({}, options));
-              if (this.layer && ngwLegend) {
+              if (this.layer) {
                 const legend = new Legend({
+                  connector: this.connector,
                   layerId: id,
-                  legend: ngwLegend,
                   layer: this.layer,
                   resourceId,
                   webMap: this.webMap,
@@ -21607,6 +21613,7 @@ var NgwLeaflet = (function () {
                     });
                   }
                 });
+                yield legend.create(options);
                 return [legend];
               }
             }