@nextgis/ngw-leaflet 1.11.8 → 1.12.0

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 1.11.8; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.12.0; author: NextGIS */
 import 'leaflet/dist/leaflet.css';
 import { Icon } from 'leaflet';
 import { NgwMap } from '@nextgis/ngw-map';
@@ -7,6 +7,86 @@ import iconRetinaUrl from 'leaflet/dist/images/marker-icon-2x.png';
 import iconUrl from 'leaflet/dist/images/marker-icon.png';
 import shadowUrl from 'leaflet/dist/images/marker-shadow.png';
 
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise */
+
+var extendStatics = function(d, b) {
+    extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+    return extendStatics(d, b);
+};
+
+function __extends(d, b) {
+    if (typeof b !== "function" && b !== null)
+        throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+    extendStatics(d, b);
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+}
+
+var __assign = function() {
+    __assign = Object.assign || function __assign(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
+function __generator(thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+}
+
 function styleInject(css, ref) {
   if ( ref === void 0 ) ref = {};
   var insertAt = ref.insertAt;
@@ -37,15 +117,6 @@ function styleInject(css, ref) {
 var css_248z = ".ngw-map-container.leaflet-container{background:#fff}.leaflet-pane .leaflet-popup-pane{z-index:9999999999}";
 styleInject(css_248z);
 
-/**
- * Single-file bundle for rapid deployment of {@link https://leafletjs.com/ | Leaflet }-based web-gis applications with NextGIS services
- *
- * @remarks
- * Styles images and other assets are already in bundle, you don't need to include anything except one JS file!
- *
- * @packageDocumentation
- * @module ngw-leaflet
- */
 // @ts-ignore
 delete Icon.Default.prototype._getIconUrl;
 Icon.Default.mergeOptions({
@@ -71,16 +142,25 @@ Icon.Default.mergeOptions({
  * });
  * ```
  */
-class NgwLeaflet extends NgwMap {
-    constructor(options) {
-        options = { ...options, mapAdapter: new LeafletMapAdapter() };
-        super(options);
+var NgwLeaflet = /** @class */ (function (_super) {
+    __extends(NgwLeaflet, _super);
+    function NgwLeaflet(options) {
+        var _this = this;
+        options = __assign(__assign({}, options), { mapAdapter: new LeafletMapAdapter() });
+        _this = _super.call(this, options) || this;
+        return _this;
     }
-    static async create(options) {
-        const ngwMap = new NgwLeaflet(options);
-        return ngwMap.onLoad();
-    }
-}
+    NgwLeaflet.create = function (options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var ngwMap;
+            return __generator(this, function (_a) {
+                ngwMap = new NgwLeaflet(options);
+                return [2 /*return*/, ngwMap.onLoad()];
+            });
+        });
+    };
+    return NgwLeaflet;
+}(NgwMap));
 if (window && !window.NgwMap) {
     window.NgwMap = NgwLeaflet;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ngw-leaflet.esm-bundler.js","sources":["../../../node_modules/style-inject/dist/style-inject.es.js","../src/index.ts"],"sourcesContent":["function styleInject(css, ref) {\n  if ( ref === void 0 ) ref = {};\n  var insertAt = ref.insertAt;\n\n  if (!css || typeof document === 'undefined') { return; }\n\n  var head = document.head || document.getElementsByTagName('head')[0];\n  var style = document.createElement('style');\n  style.type = 'text/css';\n\n  if (insertAt === 'top') {\n    if (head.firstChild) {\n      head.insertBefore(style, head.firstChild);\n    } else {\n      head.appendChild(style);\n    }\n  } else {\n    head.appendChild(style);\n  }\n\n  if (style.styleSheet) {\n    style.styleSheet.cssText = css;\n  } else {\n    style.appendChild(document.createTextNode(css));\n  }\n}\n\nexport default styleInject;\n","/**\n * Single-file bundle for rapid deployment of {@link https://leafletjs.com/ | Leaflet }-based web-gis applications with NextGIS services\n *\n * @remarks\n * Styles images and other assets are already in bundle, you don't need to include anything except one JS file!\n *\n * @packageDocumentation\n * @module ngw-leaflet\n */\nimport 'leaflet/dist/leaflet.css';\nimport './leaflet-style-override.css';\n\nimport { Icon } from 'leaflet';\nimport { NgwMap, NgwMapOptions } from '@nextgis/ngw-map';\nimport LeafletMapAdapter from '@nextgis/leaflet-map-adapter';\n\nimport iconRetinaUrl from 'leaflet/dist/images/marker-icon-2x.png';\nimport iconUrl from 'leaflet/dist/images/marker-icon.png';\nimport shadowUrl from 'leaflet/dist/images/marker-shadow.png';\n\nimport { Map } from 'leaflet';\n\n// @ts-ignore\ndelete Icon.Default.prototype._getIconUrl;\n\nIcon.Default.mergeOptions({\n  iconRetinaUrl: iconRetinaUrl,\n  iconUrl: iconUrl,\n  shadowUrl: shadowUrl,\n});\n\n/**\n * Displaying the [NgwMap](ngw-map-api)\n * using the  [LeafletMapAdapter](leaflet-map-adapter-api)\n *\n * @example\n * ```javascript\n * // Base initialization\n * // [live demo](http://code.nextgis.com/ngw-leaflet-examples-ngw-webmap)\n * import { NgwMap } from '@nextgis/ngw-leaflet';\n *\n * const ngwMap = new NgwMap({\n *   target: 'map',\n *   qmsId: 448,\n *   baseUrl: 'https://demo.nextgis.com',\n *   webmapId: 3985\n * });\n * ```\n */\nclass NgwLeaflet extends NgwMap<Map> {\n  constructor(options: NgwMapOptions) {\n    options = { ...options, mapAdapter: new LeafletMapAdapter() };\n    super(options);\n  }\n  static async create(options: NgwMapOptions): Promise<NgwLeaflet> {\n    const ngwMap = new NgwLeaflet(options);\n    return ngwMap.onLoad();\n  }\n}\n\nexport default NgwLeaflet;\n\nif ((window as any) && !(window as any).NgwMap) {\n  (window as any).NgwMap = NgwLeaflet;\n}\n"],"names":[],"mappings":";;;;;;;;;AAAA,SAAS,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE;AAC/B,EAAE,KAAK,GAAG,KAAK,KAAK,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC;AACjC,EAAE,IAAI,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;AAC9B;AACA,EAAE,IAAI,CAAC,GAAG,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,EAAE,OAAO,EAAE;AAC1D;AACA,EAAE,IAAI,IAAI,GAAG,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,EAAE,IAAI,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;AAC9C,EAAE,KAAK,CAAC,IAAI,GAAG,UAAU,CAAC;AAC1B;AACA,EAAE,IAAI,QAAQ,KAAK,KAAK,EAAE;AAC1B,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE;AACzB,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;AAChD,KAAK,MAAM;AACX,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC9B,KAAK;AACL,GAAG,MAAM;AACT,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5B,GAAG;AACH;AACA,EAAE,IAAI,KAAK,CAAC,UAAU,EAAE;AACxB,IAAI,KAAK,CAAC,UAAU,CAAC,OAAO,GAAG,GAAG,CAAC;AACnC,GAAG,MAAM;AACT,IAAI,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;AACpD,GAAG;AACH;;;;;ACzBA;;;;;;;;;AAsBA;AACA,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC;AAE1C,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;IACxB,aAAa,EAAE,aAAa;IAC5B,OAAO,EAAE,OAAO;IAChB,SAAS,EAAE,SAAS;CACrB,CAAC,CAAC;AAEH;;;;;;;;;;;;;;;;;;AAkBA,MAAM,UAAW,SAAQ,MAAW;IAClC,YAAY,OAAsB;QAChC,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,IAAI,iBAAiB,EAAE,EAAE,CAAC;QAC9D,KAAK,CAAC,OAAO,CAAC,CAAC;KAChB;IACD,aAAa,MAAM,CAAC,OAAsB;QACxC,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;QACvC,OAAO,MAAM,CAAC,MAAM,EAAE,CAAC;KACxB;CACF;AAID,IAAK,MAAc,IAAI,CAAE,MAAc,CAAC,MAAM,EAAE;IAC7C,MAAc,CAAC,MAAM,GAAG,UAAU,CAAC;;;;;"}
+{"version":3,"file":"ngw-leaflet.esm-bundler.js","sources":["../../../node_modules/style-inject/dist/style-inject.es.js","../src/index.ts"],"sourcesContent":["function styleInject(css, ref) {\n  if ( ref === void 0 ) ref = {};\n  var insertAt = ref.insertAt;\n\n  if (!css || typeof document === 'undefined') { return; }\n\n  var head = document.head || document.getElementsByTagName('head')[0];\n  var style = document.createElement('style');\n  style.type = 'text/css';\n\n  if (insertAt === 'top') {\n    if (head.firstChild) {\n      head.insertBefore(style, head.firstChild);\n    } else {\n      head.appendChild(style);\n    }\n  } else {\n    head.appendChild(style);\n  }\n\n  if (style.styleSheet) {\n    style.styleSheet.cssText = css;\n  } else {\n    style.appendChild(document.createTextNode(css));\n  }\n}\n\nexport default styleInject;\n","/**\n * Single-file bundle for rapid deployment of {@link https://leafletjs.com/ | Leaflet }-based web-gis applications with NextGIS services\n *\n * @remarks\n * Styles images and other assets are already in bundle, you don't need to include anything except one JS file!\n *\n * @packageDocumentation\n * @module ngw-leaflet\n */\nimport 'leaflet/dist/leaflet.css';\nimport './leaflet-style-override.css';\n\nimport { Icon } from 'leaflet';\nimport { NgwMap, NgwMapOptions } from '@nextgis/ngw-map';\nimport LeafletMapAdapter from '@nextgis/leaflet-map-adapter';\n\nimport iconRetinaUrl from 'leaflet/dist/images/marker-icon-2x.png';\nimport iconUrl from 'leaflet/dist/images/marker-icon.png';\nimport shadowUrl from 'leaflet/dist/images/marker-shadow.png';\n\nimport { Map } from 'leaflet';\n\n// @ts-ignore\ndelete Icon.Default.prototype._getIconUrl;\n\nIcon.Default.mergeOptions({\n  iconRetinaUrl: iconRetinaUrl,\n  iconUrl: iconUrl,\n  shadowUrl: shadowUrl,\n});\n\n/**\n * Displaying the [NgwMap](ngw-map-api)\n * using the  [LeafletMapAdapter](leaflet-map-adapter-api)\n *\n * @example\n * ```javascript\n * // Base initialization\n * // [live demo](http://code.nextgis.com/ngw-leaflet-examples-ngw-webmap)\n * import { NgwMap } from '@nextgis/ngw-leaflet';\n *\n * const ngwMap = new NgwMap({\n *   target: 'map',\n *   qmsId: 448,\n *   baseUrl: 'https://demo.nextgis.com',\n *   webmapId: 3985\n * });\n * ```\n */\nclass NgwLeaflet extends NgwMap<Map> {\n  constructor(options: NgwMapOptions) {\n    options = { ...options, mapAdapter: new LeafletMapAdapter() };\n    super(options);\n  }\n  static async create(options: NgwMapOptions): Promise<NgwLeaflet> {\n    const ngwMap = new NgwLeaflet(options);\n    return ngwMap.onLoad();\n  }\n}\n\nexport default NgwLeaflet;\n\nif ((window as any) && !(window as any).NgwMap) {\n  (window as any).NgwMap = NgwLeaflet;\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAS,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE;AAC/B,EAAE,KAAK,GAAG,KAAK,KAAK,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC;AACjC,EAAE,IAAI,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;AAC9B;AACA,EAAE,IAAI,CAAC,GAAG,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE,EAAE,OAAO,EAAE;AAC1D;AACA,EAAE,IAAI,IAAI,GAAG,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,EAAE,IAAI,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;AAC9C,EAAE,KAAK,CAAC,IAAI,GAAG,UAAU,CAAC;AAC1B;AACA,EAAE,IAAI,QAAQ,KAAK,KAAK,EAAE;AAC1B,IAAI,IAAI,IAAI,CAAC,UAAU,EAAE;AACzB,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;AAChD,KAAK,MAAM;AACX,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC9B,KAAK;AACL,GAAG,MAAM;AACT,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;AAC5B,GAAG;AACH;AACA,EAAE,IAAI,KAAK,CAAC,UAAU,EAAE;AACxB,IAAI,KAAK,CAAC,UAAU,CAAC,OAAO,GAAG,GAAG,CAAC;AACnC,GAAG,MAAM;AACT,IAAI,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;AACpD,GAAG;AACH;;;;;ACHA;AACA,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC;AAE1C,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;IACxB,aAAa,EAAE,aAAa;IAC5B,OAAO,EAAE,OAAO;IAChB,SAAS,EAAE,SAAS;CACrB,CAAC,CAAC;AAEH;;;;;;;;;;;;;;;;;;;IAkByB,8BAAW;IAClC,oBAAY,OAAsB;QAAlC,iBAGC;QAFC,OAAO,yBAAQ,OAAO,KAAE,UAAU,EAAE,IAAI,iBAAiB,EAAE,GAAE,CAAC;QAC9D,QAAA,kBAAM,OAAO,CAAC,SAAC;;KAChB;IACY,iBAAM,GAAnB,UAAoB,OAAsB;;;;gBAClC,MAAM,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;gBACvC,sBAAO,MAAM,CAAC,MAAM,EAAE,EAAC;;;KACxB;IACH,iBAAC;AAAD,CATA,CAAyB,MAAM,GAS9B;AAID,IAAK,MAAc,IAAI,CAAE,MAAc,CAAC,MAAM,EAAE;IAC7C,MAAc,CAAC,MAAM,GAAG,UAAU,CAAC;;;;;"}

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

@@ -1,2 +1,16 @@
-import"leaflet/dist/leaflet.css";import{Icon as e}from"leaflet";import{NgwMap as t}from"@nextgis/ngw-map";import a from"@nextgis/leaflet-map-adapter";import n from"leaflet/dist/images/marker-icon-2x.png";import o from"leaflet/dist/images/marker-icon.png";import r from"leaflet/dist/images/marker-shadow.png";!function(e,t){void 0===t&&(t={});var a=t.insertAt;if(e&&"undefined"!=typeof document){var n=document.head||document.getElementsByTagName("head")[0],o=document.createElement("style");o.type="text/css","top"===a&&n.firstChild?n.insertBefore(o,n.firstChild):n.appendChild(o),o.styleSheet?o.styleSheet.cssText=e:o.appendChild(document.createTextNode(e))}}(".ngw-map-container.leaflet-container{background:#fff}.leaflet-pane .leaflet-popup-pane{z-index:9999999999}"),delete e.Default.prototype._getIconUrl,e.Default.mergeOptions({iconRetinaUrl:n,iconUrl:o,shadowUrl:r});class i extends t{constructor(e){super(e={...e,mapAdapter:new a})}static async create(e){return new i(e).onLoad()}}window&&!window.NgwMap&&(window.NgwMap=i);export{i as default};
+import"leaflet/dist/leaflet.css";import{Icon as t}from"leaflet";import{NgwMap as e}from"@nextgis/ngw-map";import n from"@nextgis/leaflet-map-adapter";import r from"leaflet/dist/images/marker-icon-2x.png";import o from"leaflet/dist/images/marker-icon.png";import a from"leaflet/dist/images/marker-shadow.png";
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */var i=function(t,e){return(i=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&(t[n]=e[n])})(t,e)};var l=function(){return(l=Object.assign||function(t){for(var e,n=1,r=arguments.length;n<r;n++)for(var o in e=arguments[n])Object.prototype.hasOwnProperty.call(e,o)&&(t[o]=e[o]);return t}).apply(this,arguments)};function c(t,e,n,r){return new(n||(n=Promise))((function(o,a){function i(t){try{c(r.next(t))}catch(e){a(e)}}function l(t){try{c(r.throw(t))}catch(e){a(e)}}function c(t){var e;t.done?o(t.value):(e=t.value,e instanceof n?e:new n((function(t){t(e)}))).then(i,l)}c((r=r.apply(t,e||[])).next())}))}function u(t,e){var n,r,o,a,i={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return a={next:l(0),throw:l(1),return:l(2)},"function"==typeof Symbol&&(a[Symbol.iterator]=function(){return this}),a;function l(a){return function(l){return function(a){if(n)throw new TypeError("Generator is already executing.");for(;i;)try{if(n=1,r&&(o=2&a[0]?r.return:a[0]?r.throw||((o=r.return)&&o.call(r),0):r.next)&&!(o=o.call(r,a[1])).done)return o;switch(r=0,o&&(a=[2&a[0],o.value]),a[0]){case 0:case 1:o=a;break;case 4:return i.label++,{value:a[1],done:!1};case 5:i.label++,r=a[1],a=[0];continue;case 7:a=i.ops.pop(),i.trys.pop();continue;default:if(!(o=i.trys,(o=o.length>0&&o[o.length-1])||6!==a[0]&&2!==a[0])){i=0;continue}if(3===a[0]&&(!o||a[1]>o[0]&&a[1]<o[3])){i.label=a[1];break}if(6===a[0]&&i.label<o[1]){i.label=o[1],o=a;break}if(o&&i.label<o[2]){i.label=o[2],i.ops.push(a);break}o[2]&&i.ops.pop(),i.trys.pop();continue}a=e.call(t,i)}catch(l){a=[6,l],r=0}finally{n=o=0}if(5&a[0])throw a[1];return{value:a[0]?a[1]:void 0,done:!0}}([a,l])}}}!function(t,e){void 0===e&&(e={});var n=e.insertAt;if(t&&"undefined"!=typeof document){var r=document.head||document.getElementsByTagName("head")[0],o=document.createElement("style");o.type="text/css","top"===n&&r.firstChild?r.insertBefore(o,r.firstChild):r.appendChild(o),o.styleSheet?o.styleSheet.cssText=t:o.appendChild(document.createTextNode(t))}}(".ngw-map-container.leaflet-container{background:#fff}.leaflet-pane .leaflet-popup-pane{z-index:9999999999}"),delete t.Default.prototype._getIconUrl,t.Default.mergeOptions({iconRetinaUrl:r,iconUrl:o,shadowUrl:a});var f=function(t){function e(e){return e=l(l({},e),{mapAdapter:new n}),t.call(this,e)||this}return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Class extends value "+String(e)+" is not a constructor or null");function n(){this.constructor=t}i(t,e),t.prototype=null===e?Object.create(e):(n.prototype=e.prototype,new n)}(e,t),e.create=function(t){return c(this,void 0,void 0,(function(){return u(this,(function(n){return[2,new e(t).onLoad()]}))}))},e}(e);window&&!window.NgwMap&&(window.NgwMap=f);export{f as default};
 //# sourceMappingURL=ngw-leaflet.esm-bundler.prod.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"ngw-leaflet.esm-bundler.prod.js","sources":["../../../node_modules/style-inject/dist/style-inject.es.js","../src/index.ts"],"sourcesContent":["function styleInject(css, ref) {\n  if ( ref === void 0 ) ref = {};\n  var insertAt = ref.insertAt;\n\n  if (!css || typeof document === 'undefined') { return; }\n\n  var head = document.head || document.getElementsByTagName('head')[0];\n  var style = document.createElement('style');\n  style.type = 'text/css';\n\n  if (insertAt === 'top') {\n    if (head.firstChild) {\n      head.insertBefore(style, head.firstChild);\n    } else {\n      head.appendChild(style);\n    }\n  } else {\n    head.appendChild(style);\n  }\n\n  if (style.styleSheet) {\n    style.styleSheet.cssText = css;\n  } else {\n    style.appendChild(document.createTextNode(css));\n  }\n}\n\nexport default styleInject;\n","/**\n * Single-file bundle for rapid deployment of {@link https://leafletjs.com/ | Leaflet }-based web-gis applications with NextGIS services\n *\n * @remarks\n * Styles images and other assets are already in bundle, you don't need to include anything except one JS file!\n *\n * @packageDocumentation\n * @module ngw-leaflet\n */\nimport 'leaflet/dist/leaflet.css';\nimport './leaflet-style-override.css';\n\nimport { Icon } from 'leaflet';\nimport { NgwMap, NgwMapOptions } from '@nextgis/ngw-map';\nimport LeafletMapAdapter from '@nextgis/leaflet-map-adapter';\n\nimport iconRetinaUrl from 'leaflet/dist/images/marker-icon-2x.png';\nimport iconUrl from 'leaflet/dist/images/marker-icon.png';\nimport shadowUrl from 'leaflet/dist/images/marker-shadow.png';\n\nimport { Map } from 'leaflet';\n\n// @ts-ignore\ndelete Icon.Default.prototype._getIconUrl;\n\nIcon.Default.mergeOptions({\n  iconRetinaUrl: iconRetinaUrl,\n  iconUrl: iconUrl,\n  shadowUrl: shadowUrl,\n});\n\n/**\n * Displaying the [NgwMap](ngw-map-api)\n * using the  [LeafletMapAdapter](leaflet-map-adapter-api)\n *\n * @example\n * ```javascript\n * // Base initialization\n * // [live demo](http://code.nextgis.com/ngw-leaflet-examples-ngw-webmap)\n * import { NgwMap } from '@nextgis/ngw-leaflet';\n *\n * const ngwMap = new NgwMap({\n *   target: 'map',\n *   qmsId: 448,\n *   baseUrl: 'https://demo.nextgis.com',\n *   webmapId: 3985\n * });\n * ```\n */\nclass NgwLeaflet extends NgwMap<Map> {\n  constructor(options: NgwMapOptions) {\n    options = { ...options, mapAdapter: new LeafletMapAdapter() };\n    super(options);\n  }\n  static async create(options: NgwMapOptions): Promise<NgwLeaflet> {\n    const ngwMap = new NgwLeaflet(options);\n    return ngwMap.onLoad();\n  }\n}\n\nexport default NgwLeaflet;\n\nif ((window as any) && !(window as any).NgwMap) {\n  (window as any).NgwMap = NgwLeaflet;\n}\n"],"names":["css","ref","insertAt","document","head","getElementsByTagName","style","createElement","type","firstChild","insertBefore","appendChild","styleSheet","cssText","createTextNode","Icon","Default","prototype","_getIconUrl","mergeOptions","iconRetinaUrl","iconUrl","shadowUrl","NgwLeaflet","NgwMap","constructor","options","super","mapAdapter","LeafletMapAdapter","create","onLoad","window"],"mappings":"qTAAA,SAAqBA,EAAKC,QACX,IAARA,IAAiBA,EAAM,IAC5B,IAAIC,EAAWD,EAAIC,SAEnB,GAAKF,GAA2B,oBAAbG,SAAnB,CAEA,IAAIC,EAAOD,SAASC,MAAQD,SAASE,qBAAqB,QAAQ,GAC9DC,EAAQH,SAASI,cAAc,SACnCD,EAAME,KAAO,WAEI,QAAbN,GACEE,EAAKK,WACPL,EAAKM,aAAaJ,EAAOF,EAAKK,YAKhCL,EAAKO,YAAYL,GAGfA,EAAMM,WACRN,EAAMM,WAAWC,QAAUb,EAE3BM,EAAMK,YAAYR,SAASW,eAAed,2HCAvCe,EAAKC,QAAQC,UAAUC,YAE9BH,EAAKC,QAAQG,aAAa,CACxBC,cAAeA,EACfC,QAASA,EACTC,UAAWA,IAqBb,MAAMC,UAAmBC,EACvBC,YAAYC,GAEVC,MADAD,EAAU,IAAKA,EAASE,WAAY,IAAIC,IAG1CC,oBAAoBJ,GAElB,OADe,IAAIH,EAAWG,GAChBK,UAMbC,SAAoBA,OAAeR,SACrCQ,OAAeR,OAASD"}
+{"version":3,"file":"ngw-leaflet.esm-bundler.prod.js","sources":["../../../node_modules/style-inject/dist/style-inject.es.js","../src/index.ts"],"sourcesContent":["function styleInject(css, ref) {\n  if ( ref === void 0 ) ref = {};\n  var insertAt = ref.insertAt;\n\n  if (!css || typeof document === 'undefined') { return; }\n\n  var head = document.head || document.getElementsByTagName('head')[0];\n  var style = document.createElement('style');\n  style.type = 'text/css';\n\n  if (insertAt === 'top') {\n    if (head.firstChild) {\n      head.insertBefore(style, head.firstChild);\n    } else {\n      head.appendChild(style);\n    }\n  } else {\n    head.appendChild(style);\n  }\n\n  if (style.styleSheet) {\n    style.styleSheet.cssText = css;\n  } else {\n    style.appendChild(document.createTextNode(css));\n  }\n}\n\nexport default styleInject;\n","/**\n * Single-file bundle for rapid deployment of {@link https://leafletjs.com/ | Leaflet }-based web-gis applications with NextGIS services\n *\n * @remarks\n * Styles images and other assets are already in bundle, you don't need to include anything except one JS file!\n *\n * @packageDocumentation\n * @module ngw-leaflet\n */\nimport 'leaflet/dist/leaflet.css';\nimport './leaflet-style-override.css';\n\nimport { Icon } from 'leaflet';\nimport { NgwMap, NgwMapOptions } from '@nextgis/ngw-map';\nimport LeafletMapAdapter from '@nextgis/leaflet-map-adapter';\n\nimport iconRetinaUrl from 'leaflet/dist/images/marker-icon-2x.png';\nimport iconUrl from 'leaflet/dist/images/marker-icon.png';\nimport shadowUrl from 'leaflet/dist/images/marker-shadow.png';\n\nimport { Map } from 'leaflet';\n\n// @ts-ignore\ndelete Icon.Default.prototype._getIconUrl;\n\nIcon.Default.mergeOptions({\n  iconRetinaUrl: iconRetinaUrl,\n  iconUrl: iconUrl,\n  shadowUrl: shadowUrl,\n});\n\n/**\n * Displaying the [NgwMap](ngw-map-api)\n * using the  [LeafletMapAdapter](leaflet-map-adapter-api)\n *\n * @example\n * ```javascript\n * // Base initialization\n * // [live demo](http://code.nextgis.com/ngw-leaflet-examples-ngw-webmap)\n * import { NgwMap } from '@nextgis/ngw-leaflet';\n *\n * const ngwMap = new NgwMap({\n *   target: 'map',\n *   qmsId: 448,\n *   baseUrl: 'https://demo.nextgis.com',\n *   webmapId: 3985\n * });\n * ```\n */\nclass NgwLeaflet extends NgwMap<Map> {\n  constructor(options: NgwMapOptions) {\n    options = { ...options, mapAdapter: new LeafletMapAdapter() };\n    super(options);\n  }\n  static async create(options: NgwMapOptions): Promise<NgwLeaflet> {\n    const ngwMap = new NgwLeaflet(options);\n    return ngwMap.onLoad();\n  }\n}\n\nexport default NgwLeaflet;\n\nif ((window as any) && !(window as any).NgwMap) {\n  (window as any).NgwMap = NgwLeaflet;\n}\n"],"names":["css","ref","insertAt","document","head","getElementsByTagName","style","createElement","type","firstChild","insertBefore","appendChild","styleSheet","cssText","createTextNode","Icon","Default","prototype","_getIconUrl","mergeOptions","iconRetinaUrl","iconUrl","shadowUrl","options","mapAdapter","LeafletMapAdapter","_super","__extends","NgwLeaflet","onLoad","NgwMap","window"],"mappings":";;;;;;;;;;;;;;6zDAAA,SAAqBA,EAAKC,QACX,IAARA,IAAiBA,EAAM,IAC5B,IAAIC,EAAWD,EAAIC,SAEnB,GAAKF,GAA2B,oBAAbG,SAAnB,CAEA,IAAIC,EAAOD,SAASC,MAAQD,SAASE,qBAAqB,QAAQ,GAC9DC,EAAQH,SAASI,cAAc,SACnCD,EAAME,KAAO,WAEI,QAAbN,GACEE,EAAKK,WACPL,EAAKM,aAAaJ,EAAOF,EAAKK,YAKhCL,EAAKO,YAAYL,GAGfA,EAAMM,WACRN,EAAMM,WAAWC,QAAUb,EAE3BM,EAAMK,YAAYR,SAASW,eAAed,2HCAvCe,EAAKC,QAAQC,UAAUC,YAE9BH,EAAKC,QAAQG,aAAa,CACxBC,cAAeA,EACfC,QAASA,EACTC,UAAWA,sBAsBX,WAAYC,UACVA,SAAeA,IAASC,WAAY,IAAIC,IACxCC,YAAMH,SAMV,0PATyBI,MAKVC,SAAb,SAAoBL,sEAElB,SADe,IAAIK,EAAWL,GAChBM,oBAPOC,GAapBC,SAAoBA,OAAeD,SACrCC,OAAeD,OAASF"}

package/lib/ngw-leaflet.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 1.11.8; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.12.0; author: NextGIS */
 var NgwLeaflet = (function () {
     'use strict';
 
@@ -16772,6 +16772,9 @@ var NgwLeaflet = (function () {
                             _c.sent();
                             _c.label = 11;
                         case 11:
+                            if (options.onAdded) {
+                                options.onAdded(_adapter);
+                            }
                             this._emitLayerEvent('layer:add', layerId, _adapter);
                             return [2 /*return*/, _adapter];
                         case 12: return [2 /*return*/, Promise.reject('No adapter')];
@@ -16912,8 +16915,15 @@ var NgwLeaflet = (function () {
         WebMapLayers.prototype.addTileLayer = function (url, options) {
             return this.addLayer('TILE', __assign(__assign({}, options), { url: url }));
         };
-        /** Shortcut for {@link WebMapLayers.addLayer} to create TileLayer adapter */
-        WebMapLayers.prototype.addImageLayer = function (url, options) {
+        WebMapLayers.prototype.addImageLayer = function (urlOrOptions, options) {
+            var url;
+            if (typeof urlOrOptions === 'string') {
+                url = urlOrOptions;
+            }
+            else {
+                url = urlOrOptions.url;
+                options = urlOrOptions;
+            }
             return this.addLayer('IMAGE', __assign(__assign({}, options), { url: url }));
         };
         /**
@@ -19228,10 +19238,10 @@ var NgwLeaflet = (function () {
     function createGeoJsonFeature(item) {
         var geometry = item.geom;
         var feature = {
+            geometry: geometry,
             id: item.id,
             type: 'Feature',
             properties: item.fields,
-            geometry: geometry,
         };
         return feature;
     }
@@ -19254,68 +19264,85 @@ var NgwLeaflet = (function () {
     }
     // NGW REST API is not able to filtering by combined queries
     // therefore the filter is divided into several requests
-    function createFeatureFieldFilterQueries(opt, _queries, _parentAllParams) {
+    function createFeatureFieldFilterQueries(opt) {
+        var queries = getQueries(opt);
+        return CancelablePromise.all(queries).then(function (itemsParts) {
+            // this list of ids used for optimization
+            var ids = [];
+            var items = [];
+            for (var _i = 0, itemsParts_1 = itemsParts; _i < itemsParts_1.length; _i++) {
+                var part = itemsParts_1[_i];
+                for (var _a = 0, part_1 = part; _a < part_1.length; _a++) {
+                    var item = part_1[_a];
+                    if (!ids.includes(item.id)) {
+                        items.push(item);
+                        ids.push(item.id);
+                    }
+                }
+            }
+            var offset = opt.offset !== undefined ? opt.offset : 0;
+            var limit = opt.limit !== undefined ? opt.limit : items.length;
+            if (opt.offset || opt.limit) {
+                return items.splice(offset, limit);
+            }
+            return items;
+        });
+    }
+    function createParam(pf) {
+        var field = pf[0], operation = pf[1], value = pf[2];
+        var isFldStr = field !== 'id' ? 'fld_' : '';
+        var vStart = '';
+        var vEnd = '';
+        var field_ = String(field)
+            .trim()
+            .replace(/^(%?)(.+?)(%?)$/, function (m, a, b, c) {
+            vStart = a;
+            vEnd = c;
+            return b;
+        });
+        var v = vStart + value + vEnd;
+        return ["".concat(isFldStr).concat(field_, "__").concat(operation), v];
+    }
+    function getQueries(opt, _queries, _parentAllParams) {
         if (_queries === void 0) { _queries = []; }
         if (_parentAllParams === void 0) { _parentAllParams = []; }
         var filters = opt.filters;
         var logic = typeof filters[0] === 'string' ? filters[0] : 'all';
         var filters_ = filters.filter(function (x) { return Array.isArray(x); });
-        var createParam = function (pf) {
-            var field = pf[0], operation = pf[1], value = pf[2];
-            var isFldStr = field !== 'id' ? 'fld_' : '';
-            var vStart = '';
-            var vEnd = '';
-            var field_ = String(field)
-                .trim()
-                .replace(/^(%?)(.+?)(%?)$/, function (m, a, b, c) {
-                vStart = a;
-                vEnd = c;
-                return b;
-            });
-            var v = vStart + value + vEnd;
-            return ["".concat(isFldStr).concat(field_, "__").concat(operation), v];
-        };
         if (logic === 'any') {
-            filters_.forEach(function (f) {
+            for (var _i = 0, filters_1 = filters_; _i < filters_1.length; _i++) {
+                var f = filters_1[_i];
                 if (isPropertyFilter(f)) {
                     _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), [createParam(f)], false) })));
                 }
                 else {
-                    createFeatureFieldFilterQueries(__assign(__assign({}, opt), { filters: f }), _queries, __spreadArray([], _parentAllParams, true));
+                    getQueries(__assign(__assign({}, opt), { filters: f }), _queries, __spreadArray([], _parentAllParams, true));
                 }
-            });
+            }
         }
         else if (logic === 'all') {
-            var filters_2 = [];
+            var filters_3 = [];
             var propertiesFilterList = [];
-            for (var _i = 0, filters_1 = filters_; _i < filters_1.length; _i++) {
-                var f = filters_1[_i];
+            for (var _a = 0, filters_2 = filters_; _a < filters_2.length; _a++) {
+                var f = filters_2[_a];
                 if (isPropertyFilter(f)) {
-                    filters_2.push(createParam(f));
+                    filters_3.push(createParam(f));
                 }
                 else {
                     propertiesFilterList.push(f);
                 }
             }
             if (propertiesFilterList.length) {
-                for (var _a = 0, propertiesFilterList_1 = propertiesFilterList; _a < propertiesFilterList_1.length; _a++) {
-                    var x = propertiesFilterList_1[_a];
-                    createFeatureFieldFilterQueries(__assign(__assign({}, opt), { filters: x }), _queries, __spreadArray(__spreadArray([], _parentAllParams, true), filters_2, true));
+                for (var _b = 0, propertiesFilterList_1 = propertiesFilterList; _b < propertiesFilterList_1.length; _b++) {
+                    var x = propertiesFilterList_1[_b];
+                    getQueries(__assign(__assign({}, opt), { filters: x }), _queries, __spreadArray(__spreadArray([], _parentAllParams, true), filters_3, true));
                 }
             }
             else {
-                _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), filters_2, true) })));
+                _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), filters_3, true) })));
             }
         }
-        return CancelablePromise.all(_queries).then(function (itemsParts) {
-            var items = itemsParts.reduce(function (a, b) { return a.concat(b); }, []);
-            var offset = opt.offset !== undefined ? opt.offset : 0;
-            var limit = opt.limit !== undefined ? opt.limit : items.length;
-            if (opt.offset || opt.limit) {
-                return items.splice(offset, limit);
-            }
-            return items;
-        });
+        return _queries;
     }
     function createWktFromCoordArray(coord) {
         var polygon = coord.map(function (_a) {
@@ -19327,7 +19354,7 @@ var NgwLeaflet = (function () {
     }
     function fetchNgwLayerItemsRequest(options) {
         var params = __assign({}, FEATURE_REQUEST_PARAMS);
-        var connector = options.connector, limit = options.limit, offset = options.offset, intersects = options.intersects, orderBy = options.orderBy, resourceId = options.resourceId, paramList = options.paramList;
+        var limit = options.limit, offset = options.offset, orderBy = options.orderBy, paramList = options.paramList, connector = options.connector, intersects = options.intersects, resourceId = options.resourceId;
         if (limit) {
             if (limit !== Number.POSITIVE_INFINITY) {
                 params.limit = limit;
@@ -19340,7 +19367,6 @@ var NgwLeaflet = (function () {
         if (offset) {
             params.offset = offset;
         }
-        // TODO: fix type for options
         updateItemRequestParam(params, options);
         if (orderBy) {
             params.order_by = orderBy.join(',');
@@ -19392,12 +19418,16 @@ var NgwLeaflet = (function () {
         var filters = options.filters;
         if (filters) {
             return createFeatureFieldFilterQueries(__assign(__assign({}, options), { filters: filters })).then(function (data) {
+                var _a;
+                var clientFilterValidate = (_a = options.clientFilterValidate) !== null && _a !== void 0 ? _a : true;
                 // Additional client-side filter check
-                data.filter(function (y) {
-                    var fields = prepareNgwFieldsToPropertiesFilter(__assign({}, y.fields));
-                    var result = propertiesFilter(fields, filters);
-                    return result;
-                });
+                if (clientFilterValidate) {
+                    data = data.filter(function (y) {
+                        var fields = prepareNgwFieldsToPropertiesFilter(__assign(__assign({}, y.fields), { id: y.id }));
+                        var result = propertiesFilter(fields, filters);
+                        return result;
+                    });
+                }
                 return data;
             });
         }
@@ -19756,6 +19786,26 @@ var NgwLeaflet = (function () {
         });
     }
 
+    function getImageAdapterOptions(_a) {
+        var resourceId = _a.resourceId, baseUrl = _a.baseUrl, nd = _a.nd, headers = _a.headers;
+        var url = baseUrl + '/api/component/render/image';
+        var params = { resource: resourceId };
+        if (nd) {
+            params.nd = nd;
+        }
+        return {
+            url: url,
+            resourceId: resourceId,
+            headers: headers,
+            params: params,
+            updateWmsParams: function (params_) {
+                if (nd) {
+                    params_.nd = nd;
+                }
+                return updateImageParams(params_, resourceId);
+            },
+        };
+    }
     function ngwApiToAdapterOptions(_a) {
         var options = _a.options, webMap = _a.webMap, baseUrl = _a.baseUrl;
         var adapter = options.adapter || 'IMAGE';
@@ -19767,16 +19817,12 @@ var NgwLeaflet = (function () {
         if (typeof resourceId === 'number') {
             if (adapter === 'IMAGE') {
                 if (isImageAllowed) {
-                    url = baseUrl + '/api/component/render/image';
-                    return {
-                        url: url,
+                    return getImageAdapterOptions({
                         resourceId: resourceId,
                         headers: options.headers,
-                        params: { resource: resourceId, nd: nd },
-                        updateWmsParams: function (params) {
-                            return updateImageParams(__assign({ nd: nd }, params), resourceId);
-                        },
-                    };
+                        nd: nd,
+                        baseUrl: baseUrl,
+                    });
                 }
                 else {
                     adapter = 'TILE';
@@ -21191,6 +21237,7 @@ var NgwLeaflet = (function () {
         NgwWebmapLayerAdapter.prototype._setBasemaps = function (baseWebmap) {
             var _this = this;
             var webMap = this.options.webMap;
+            // to avoid set many basemaps on init
             var enabledAlreadySet = false;
             var _loop_1 = function (x) {
                 createOnFirstShowNgwAdapter({
@@ -21199,9 +21246,11 @@ var NgwLeaflet = (function () {
                     item: x,
                     adapterOptions: { crossOrigin: this_1.options.crossOrigin },
                 }).then(function (adapter) {
-                    // to avoid set many basemaps on init
                     var visibility = enabledAlreadySet ? false : x.enabled;
-                    webMap
+                    if (x.enabled) {
+                        enabledAlreadySet = true;
+                    }
+                    return webMap
                         .addBaseLayer(adapter, {
                         id: WEBMAP_BASELAYER_ID_PREFIX + x.resource_id,
                         name: x.display_name,
@@ -21211,9 +21260,6 @@ var NgwLeaflet = (function () {
                         .then(function (l) {
                         l.id && _this._webmapBaselayersIds.push(l.id);
                     });
-                    if (x.enabled) {
-                        enabledAlreadySet = true;
-                    }
                 });
             };
             var this_1 = this;
@@ -21695,7 +21741,7 @@ var NgwLeaflet = (function () {
     function updateImageParams(params, resourceId) {
         var bbox = params.bbox, width = params.width, height = params.height, nd = params.nd;
         return {
-            resource: resourceId,
+            resource: Array.isArray(resourceId) ? resourceId.join(',') : resourceId,
             extent: bbox,
             size: width + ',' + height,
             timestamp: Date.now(),
@@ -22003,38 +22049,45 @@ var NgwLeaflet = (function () {
         }
         return CancelablePromise.resolve(undefined);
     }
-    function sendIdentifyRequest(ev, options) {
-        deprecatedMapClick(ev);
-        var _a = ev.lngLat, lng = _a[0], lat = _a[1];
+    function featureLayerIdentify(options) {
+        var g = options.geom;
         var geom = [];
-        if (options.geom) {
-            var polygon_1 = options.geom.type === 'Feature'
-                ? options.geom.geometry
-                : options.geom.type === 'Polygon'
-                    ? options.geom
-                    : false;
-            if (polygon_1) {
-                geom = polygon_1.coordinates[0];
+        if (Array.isArray(g)) {
+            geom = g;
+        }
+        else {
+            var polygon = g.type === 'Feature' ? g.geometry : g.type === 'Polygon' ? g : false;
+            if (polygon) {
+                geom = polygon.coordinates[0];
             }
         }
-        if (!geom.length) {
-            geom = getCirclePolygonCoordinates(lng, lat, options.radius);
+        if (geom) {
+            // create wkt string
+            var polygonStr = [];
+            for (var _i = 0, geom_1 = geom; _i < geom_1.length; _i++) {
+                var _a = geom_1[_i], lng = _a[0], lat = _a[1];
+                var _b = degrees2meters(lng, lat), x = _b[0], y = _b[1];
+                polygonStr.push(x + ' ' + y);
+            }
+            var wkt = "POLYGON((".concat(polygonStr.join(', '), "))");
+            var layers = options.layers;
+            var data = {
+                geom: wkt,
+                srs: 3857,
+                layers: layers,
+            };
+            return options.connector.post('feature_layer.identify', { data: data });
         }
-        // create wkt string
-        var polygon = [];
-        geom.forEach(function (_a) {
-            var lng = _a[0], lat = _a[1];
-            var _b = degrees2meters(lng, lat), x = _b[0], y = _b[1];
-            polygon.push(x + ' ' + y);
-        });
-        var wkt = "POLYGON((".concat(polygon.join(', '), "))");
-        var layers = options.layers;
-        var data = {
-            geom: wkt,
-            srs: 3857,
-            layers: layers,
-        };
-        return options.connector.post('feature_layer.identify', { data: data });
+        else {
+            throw new Error('Not valid geometry format to make intersection');
+        }
+    }
+    function sendIdentifyRequest(ev, options) {
+        var _a;
+        deprecatedMapClick(ev);
+        var _b = ev.lngLat, lng = _b[0], lat = _b[1];
+        var geom = (_a = options.geom) !== null && _a !== void 0 ? _a : getCirclePolygonCoordinates(lng, lat, options.radius);
+        return featureLayerIdentify(__assign(__assign({}, options), { geom: geom }));
     }
     function createIdentifyItem(opt) {
         return new IdentifyItem(opt);
@@ -22920,6 +22973,9 @@ var NgwLeaflet = (function () {
         link.title = title;
         link.setAttribute('role', 'button');
         link.setAttribute('aria-label', title);
+        if (options.addClass) {
+            link.classList.add(options.addClass);
+        }
         leafletSrc.exports.DomEvent.disableClickPropagation(link);
         leafletSrc.exports.DomEvent.on(link, 'click', leafletSrc.exports.DomEvent.stop);
         if (options.html instanceof HTMLElement) {