@nextgis/leaflet-map-adapter 3.0.0-alpha.5 → 3.0.0

package/lib/leaflet-map-adapter.esm-bundler.js

@@ -1,7 +1,7 @@
-/** Bundle of @nextgis/leaflet-map-adapter; version: 3.0.0-alpha.5; author: NextGIS */
+/** Bundle of @nextgis/leaflet-map-adapter; version: 3.0.0; author: NextGIS */
 import { EventEmitter } from 'events';
-import { Control, DomEvent, GeoJSON, DivIcon, Marker, CircleMarker, FeatureGroup, ImageOverlay as ImageOverlay$1, Layer, Util, CRS, GridLayer, DomUtil, TileLayer as TileLayer$1, Map, latLngBounds, latLng } from 'leaflet';
-import { defined, debounce as debounce$1, updateUrlParams } from '@nextgis/utils';
+import { Control, DomEvent, GeoJSON, DivIcon, Marker, CircleMarker, FeatureGroup, ImageOverlay as ImageOverlay$1, Layer, Util, GridLayer, DomUtil, TileLayer as TileLayer$1, Map, latLngBounds, latLng } from 'leaflet';
+import { defined, debounce as debounce$1, isObject, updateUrlParams } from '@nextgis/utils';
 import { isPaintCallback, isPaint } from '@nextgis/paint';
 import Queue from '@nextgis/queue';
 
@@ -349,8 +349,8 @@ class GeoJsonEvents {
 }
 
 var __defProp$8 = Object.defineProperty;
-var __defProps$4 = Object.defineProperties;
-var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
+var __defProps$5 = Object.defineProperties;
+var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$6 = Object.getOwnPropertySymbols;
 var __hasOwnProp$6 = Object.prototype.hasOwnProperty;
 var __propIsEnum$6 = Object.prototype.propertyIsEnumerable;
@@ -366,7 +366,7 @@ var __spreadValues$6 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
+var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 var __objRest$2 = (source, exclude) => {
   var target = {};
   for (var prop in source)
@@ -461,7 +461,7 @@ class GeoJsonPaint {
     if (html) {
       element.innerHTML = html;
     }
-    const divIcon = new DivIcon(__spreadProps$4(__spreadValues$6({
+    const divIcon = new DivIcon(__spreadProps$5(__spreadValues$6({
       className: ""
     }, toLIconOpt), {
       html: element
@@ -510,8 +510,8 @@ class GeoJsonPaint {
 }
 
 var __defProp$7 = Object.defineProperty;
-var __defProps$3 = Object.defineProperties;
-var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
+var __defProps$4 = Object.defineProperties;
+var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$5 = Object.getOwnPropertySymbols;
 var __hasOwnProp$5 = Object.prototype.hasOwnProperty;
 var __propIsEnum$5 = Object.prototype.propertyIsEnumerable;
@@ -527,7 +527,7 @@ var __spreadValues$5 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
+var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 var __publicField$4 = (obj, key, value) => __defNormalProp$7(obj, typeof key !== "symbol" ? key + "" : key, value);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
@@ -576,7 +576,7 @@ class GeoJsonAdapter extends BaseAdapter {
   addLayer(options) {
     Object.assign(this.options, options);
     this.paint = options.paint;
-    this.layer = new FeatureGroup([], __spreadProps$3(__spreadValues$5({}, options.nativeOptions), {
+    this.layer = new FeatureGroup([], __spreadProps$4(__spreadValues$5({}, options.nativeOptions), {
       pane: this.pane
     }));
     this.selectedPaint = options.selectedPaint;
@@ -875,13 +875,15 @@ class GeoJsonAdapter extends BaseAdapter {
         const unselectOnClose = (_b = (_a = this.options.popupOptions) == null ? void 0 : _a.unselectOnClose) != null ? _b : true;
         if (unselectOnClose) {
           const p = layer.getPopup();
-          p && p.once(
-            "remove",
-            () => {
-              close();
-            },
-            this
-          );
+          if (p) {
+            p.once(
+              "remove",
+              () => {
+                close();
+              },
+              this
+            );
+          }
         }
         this._openedPopup.push([popup, _closeHandlers, def]);
         popup.openPopup(latLng);
@@ -926,7 +928,7 @@ class GeoJsonAdapter extends BaseAdapter {
             if (feature) {
               return this._paint.preparePaint(__spreadValues$5(__spreadValues$5({}, PAINT), paint(feature)));
             } else {
-              return this._paint.preparePaint(__spreadProps$3(__spreadValues$5({}, PAINT), { type: "path" }));
+              return this._paint.preparePaint(__spreadProps$4(__spreadValues$5({}, PAINT), { type: "path" }));
             }
           }
         };
@@ -1162,16 +1164,9 @@ var __defNormalProp$5 = (obj, key, value) => key in obj ? __defProp$5(obj, key,
 var __publicField$2 = (obj, key, value) => __defNormalProp$5(obj, typeof key !== "symbol" ? key + "" : key, value);
 class ImageLayer extends Layer {
   constructor(url, options) {
-    var _a;
     super(options);
     __publicField$2(this, "defaultWmsParams", {
-      service: "WMS",
-      request: "GetMap",
-      version: "1.1.1",
-      layers: "",
-      styles: "",
-      format: "image/jpeg",
-      transparent: false
+      request: "GetMap"
     });
     __publicField$2(this, "options", {
       crs: null,
@@ -1180,6 +1175,7 @@ class ImageLayer extends Layer {
       opacity: 1,
       isBack: false,
       minZoom: 0,
+      maxZoom: void 0,
       pane: "tilePane",
       headers: null,
       withCredentials: false,
@@ -1196,18 +1192,21 @@ class ImageLayer extends Layer {
     const opts = {};
     let opt;
     for (opt in options) {
+      const val = options[opt];
       if (opt in this.options) {
-        opts[opt] = options[opt];
-      } else {
-        params[opt] = options[opt];
+        opts[opt] = val;
+      }
+    }
+    if (options.params) {
+      for (const param in options.params) {
+        const val = options.params[param];
+        if (!isObject(val) && !Array.isArray(val) && typeof val !== "function") {
+          params[param] = val;
+        }
       }
     }
     Util.setOptions(this, opts);
-    this.wmsParams = Util.extend(
-      {},
-      this.defaultWmsParams,
-      (_a = params == null ? void 0 : params.params) != null ? _a : {}
-    );
+    this.wmsParams = Util.extend({}, this.defaultWmsParams, params);
   }
   setParams(params) {
     Util.extend(this.wmsParams, params);
@@ -1332,9 +1331,7 @@ class ImageLayer extends Layer {
       size.x = Math.ceil(size.x * factor);
       size.y = Math.ceil(size.y * factor);
     }
-    const wmsVersion = parseFloat(this.wmsParams.version);
     const crs = this.options.crs || map.options.crs;
-    const projectionKey = wmsVersion >= 1.3 ? "crs" : "srs";
     if (crs) {
       const nw = crs.project(bounds.getNorthWest());
       const se = crs.project(bounds.getSouthEast());
@@ -1342,8 +1339,7 @@ class ImageLayer extends Layer {
         width: size.x,
         height: size.y
       };
-      params[projectionKey] = crs.code;
-      params.bbox = (wmsVersion >= 1.3 && crs === CRS.EPSG4326 ? [se.y, nw.x, nw.y, se.x] : [nw.x, se.y, se.x, nw.y]).join(",");
+      params.bbox = [nw.x, se.y, se.x, nw.y];
       Util.extend(this.wmsParams, params);
     }
   }
@@ -1355,6 +1351,8 @@ class ImageLayer extends Layer {
 }
 
 var __defProp$4 = Object.defineProperty;
+var __defProps$3 = Object.defineProperties;
+var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$4 = Object.getOwnPropertySymbols;
 var __hasOwnProp$4 = Object.prototype.hasOwnProperty;
 var __propIsEnum$4 = Object.prototype.propertyIsEnumerable;
@@ -1370,6 +1368,7 @@ var __spreadValues$4 = (a, b) => {
     }
   return a;
 };
+var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
 var __publicField$1 = (obj, key, value) => __defNormalProp$4(obj, typeof key !== "symbol" ? key + "" : key, value);
 class ImageAdapter extends BaseAdapter {
   constructor() {
@@ -1377,15 +1376,19 @@ class ImageAdapter extends BaseAdapter {
     __publicField$1(this, "layer");
   }
   addLayer(options) {
+    var _a;
     const url = options && options.url;
     if (url) {
-      options = __spreadValues$4({ transparent: true }, options);
       const updateWmsParamsFromOpt = options.updateWmsParams;
       this.layer = new ImageLayer(url, __spreadValues$4(__spreadValues$4(__spreadValues$4({
         pane: this.pane,
         headers: options.headers,
         setViewDelay: options.setViewDelay
-      }, options), options.params), options.nativeOptions));
+      }, __spreadProps$3(__spreadValues$4({
+        transparent: true
+      }, options), {
+        opacity: (_a = options.opacity) != null ? _a : void 0
+      })), options.params), options.nativeOptions));
       if (updateWmsParamsFromOpt) {
         const updateWmsParams = this.layer.updateWmsParams;
         this.layer.updateWmsParams = function(map) {
@@ -1867,7 +1870,7 @@ const _LeafletMapAdapter = class _LeafletMapAdapter {
     }
   }
   removeLayer(layer) {
-    layer && layer.remove && layer.remove();
+    if (layer && layer.remove) layer.remove();
   }
   showLayer(layer) {
     if (this.map) {