@nextgis/ngw-leaflet 1.5.0 → 1.8.0

package/lib/ngw-leaflet.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 1.5.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.8.0; author: NextGIS */
 var NgwLeaflet = (function () {
     'use strict';
 
@@ -14862,7 +14862,6 @@ var NgwLeaflet = (function () {
      *
      * promise.cancel();
      * ```
-     * @public
      */
     var CancelablePromise = /** @class */ (function () {
         function CancelablePromise(executor, timeout) {
@@ -15174,8 +15173,7 @@ var NgwLeaflet = (function () {
     }
 
     /**
-     *
-     * @param ev @deprecated
+     * @internal
      */
     function deprecatedMapClick(ev) {
         if (!ev.lngLat && ev.latLng) {
@@ -15187,6 +15185,7 @@ var NgwLeaflet = (function () {
         return ev;
     }
 
+    /** @internal */
     function deprecatedWarn(message) {
         console.warn("DEPRECATED WARN: " + message);
     }
@@ -15377,8 +15376,8 @@ var NgwLeaflet = (function () {
         return newObj;
     }
 
-    function reEscape(s) {
-        return s.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+    function isObject$1(val) {
+        return Object.prototype.toString.call(val) === '[object Object]';
     }
 
     function fixUrlStr(url) {
@@ -15386,13 +15385,6 @@ var NgwLeaflet = (function () {
         return url.replace(/([^:]\/)\/+/g, '$1');
     }
 
-    /**
-     * @module utils
-     */
-    function isObject$1(val) {
-        return Object.prototype.toString.call(val) === '[object Object]';
-    }
-
     function isExpression(value) {
         if (Array.isArray(value)) {
             return true;
@@ -15481,6 +15473,9 @@ var NgwLeaflet = (function () {
         return;
     }
 
+    function reEscape(s) {
+        return s.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+    }
     function like(b, a, iLike) {
         a = String(a);
         b = String(b);
@@ -15540,7 +15535,7 @@ var NgwLeaflet = (function () {
     function propertiesFilter(properties, filters) {
         var logic = typeof filters[0] === 'string' ? filters[0] : 'all';
         var filterFunction = function (p) {
-            if (checkIfPropertyFilter(p)) {
+            if (isPropertyFilter(p)) {
                 var field_1 = p[0], operation = p[1], value_1 = p[2];
                 var operationExec = operationsAliases[operation];
                 if (operationExec) {
@@ -15940,7 +15935,7 @@ var NgwLeaflet = (function () {
     var ID$2 = 0;
     var OPTIONS$1 = {
         minZoom: 0,
-        maxZoom: 21,
+        maxZoom: 20,
         paint: {
             color: 'blue',
             opacity: 0.4,
@@ -16111,7 +16106,7 @@ var NgwLeaflet = (function () {
         };
         /**
          * Returns the map's geographical centerpoint.
-         * @return lngLat Array of two numbers representing longitude and latitude of the center of the map view.
+         * @returns lngLat Array of two numbers representing longitude and latitude of the center of the map view.
          *
          * @example
          * ```javascript
@@ -16144,7 +16139,7 @@ var NgwLeaflet = (function () {
         };
         /**
          * Returns the map's current zoom level.
-         * @return The map's current zoom level (0-24).
+         * @returns The map's current zoom level (0-24).
          */
         WebMapMain.prototype.getZoom = function () {
             return this.mapAdapter.getZoom();
@@ -16512,13 +16507,14 @@ var NgwLeaflet = (function () {
          */
         WebMapLayers.prototype.fitLayer = function (layerDef, options) {
             return __awaiter(this, void 0, void 0, function () {
-                var layer, extent;
+                var layer, getBounds, extent;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             layer = this.getLayer(layerDef);
-                            if (!(layer && layer.getExtent)) return [3 /*break*/, 2];
-                            return [4 /*yield*/, layer.getExtent()];
+                            getBounds = layer && (layer.getBounds || layer.getExtent);
+                            if (!getBounds) return [3 /*break*/, 2];
+                            return [4 /*yield*/, getBounds.call(layer)];
                         case 1:
                             extent = _a.sent();
                             if (extent) {
@@ -16616,7 +16612,7 @@ var NgwLeaflet = (function () {
                 var layer;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.addLayer(adapter, __assign(__assign({}, options), { baselayer: true }))];
+                        case 0: return [4 /*yield*/, this.addLayer(adapter, __assign(__assign({}, options), { baselayer: true }), undefined)];
                         case 1:
                             layer = _a.sent();
                             return [2 /*return*/, layer];
@@ -16642,12 +16638,12 @@ var NgwLeaflet = (function () {
             var _a, _b;
             if (options === void 0) { options = {}; }
             return __awaiter(this, void 0, void 0, function () {
-                var id, _order, adapterEngine, geoJsonOptions, _c, maxZoom, minZoom, visibility, modified, _adapter, layerId, layer, opacity, extent;
+                var id, _order, adapterEngine, geoJsonOptions, _c, maxZoom, minZoom, visibility, modified, _adapter, layerId, layer, opacity, getBounds, extent;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
                             id = this._layersIdCounter++;
-                            _order = order !== undefined
+                            _order = defined(order)
                                 ? order
                                 : options.order !== undefined
                                     ? options.order
@@ -16745,8 +16741,9 @@ var NgwLeaflet = (function () {
                             if (opacity !== undefined && opacity <= 1) {
                                 this.setLayerOpacity(_adapter, opacity);
                             }
-                            if (!(options.fit && _adapter.getExtent)) return [3 /*break*/, 11];
-                            return [4 /*yield*/, _adapter.getExtent()];
+                            getBounds = layer && (_adapter.getBounds || _adapter.getExtent);
+                            if (!(options.fit && getBounds)) return [3 /*break*/, 11];
+                            return [4 /*yield*/, getBounds.call(_adapter)];
                         case 9:
                             extent = _d.sent();
                             if (!extent) return [3 /*break*/, 11];
@@ -16886,11 +16883,19 @@ var NgwLeaflet = (function () {
             opt.paint = opt.paint || {};
             return this.addLayer(adapter || 'GEOJSON', opt);
         };
-        /** Shortcut for {@link WebMapLayers.addGeoJsonLayer} to initialize adapter with generic types for working in typescript */
+        /** Shortcut for {@link WebMapLayers.addGeoJsonLayer} to create GeoJson adapter with generic types for working in typescript */
         WebMapLayers.prototype.addFeatureLayer = function (options) {
             if (options === void 0) { options = {}; }
             return this.addGeoJsonLayer(options);
         };
+        /** Shortcut for {@link WebMapLayers.addLayer} to create TileLayer adapter */
+        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) {
+            return this.addLayer('IMAGE', __assign(__assign({}, options), { url: url }));
+        };
         /**
          * Show added layer on the map by it definition.
          */
@@ -16925,49 +16930,66 @@ var NgwLeaflet = (function () {
             var onMap = layer && layer.options.visibility;
             var toStatus = status !== undefined ? status : !onMap;
             var silent = options.silent !== undefined ? options.silent : false;
-            var action = function (l) {
-                var id = String(l.id);
-                var preEventName = toStatus ? 'layer:preshow' : 'layer:prehide';
-                var eventName = toStatus ? 'layer:show' : 'layer:hide';
-                if (!silent) {
-                    _this._emitLayerEvent(preEventName, id, l);
-                    _this._emitLayerEvent('layer:pretoggle', id, l);
-                }
-                if (toStatus && _this.mapAdapter) {
-                    var order = l.options.baselayer ? 0 : l.options.order;
-                    // do not show baselayer if another on the map
-                    if (l.options.baselayer && _this._baselayers.length) {
-                        var anotherVisibleLayerBaseLayer = _this._baselayers.find(function (x) {
-                            return x !== l.id && _this.isLayerVisible(x);
-                        });
-                        if (anotherVisibleLayerBaseLayer) {
-                            _this.hideLayer(anotherVisibleLayerBaseLayer);
-                        }
-                    }
-                    if (l.showLayer) {
-                        l.showLayer.call(l, l.layer);
-                    }
-                    else if (l.layer !== undefined) {
-                        _this.mapAdapter.showLayer(l.layer);
-                    }
-                    if (order !== undefined) {
-                        _this.mapAdapter.setLayerOrder(l.layer, order, _this._layers);
-                    }
-                }
-                else {
-                    if (l.hideLayer) {
-                        l.hideLayer.call(l, l.layer);
-                    }
-                    else if (l.layer !== undefined) {
-                        _this.mapAdapter.hideLayer(l.layer);
+            var action = function (l) { return __awaiter(_this, void 0, void 0, function () {
+                var id, preEventName, eventName, order, anotherVisibleBaselayers, _i, anotherVisibleBaselayers_1, bl;
+                var _this = this;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            id = String(l.id);
+                            preEventName = toStatus ? 'layer:preshow' : 'layer:prehide';
+                            eventName = toStatus ? 'layer:show' : 'layer:hide';
+                            if (!silent) {
+                                this._emitLayerEvent(preEventName, id, l);
+                                this._emitLayerEvent('layer:pretoggle', id, l);
+                            }
+                            if (!(toStatus && this.mapAdapter)) return [3 /*break*/, 5];
+                            order = l.options.baselayer ? 0 : l.options.order;
+                            if (!(l.options.baselayer && this._baselayers.length)) return [3 /*break*/, 4];
+                            anotherVisibleBaselayers = this._baselayers.filter(function (x) {
+                                return x !== l.id && _this.isLayerVisible(x);
+                            });
+                            _i = 0, anotherVisibleBaselayers_1 = anotherVisibleBaselayers;
+                            _a.label = 1;
+                        case 1:
+                            if (!(_i < anotherVisibleBaselayers_1.length)) return [3 /*break*/, 4];
+                            bl = anotherVisibleBaselayers_1[_i];
+                            return [4 /*yield*/, this.hideLayer(bl)];
+                        case 2:
+                            _a.sent();
+                            _a.label = 3;
+                        case 3:
+                            _i++;
+                            return [3 /*break*/, 1];
+                        case 4:
+                            if (l.showLayer) {
+                                l.showLayer.call(l, l.layer);
+                            }
+                            else if (l.layer !== undefined) {
+                                this.mapAdapter.showLayer(l.layer);
+                            }
+                            if (order !== undefined) {
+                                this.mapAdapter.setLayerOrder(l.layer, order, this._layers);
+                            }
+                            return [3 /*break*/, 6];
+                        case 5:
+                            if (l.hideLayer) {
+                                l.hideLayer.call(l, l.layer);
+                            }
+                            else if (l.layer !== undefined) {
+                                this.mapAdapter.hideLayer(l.layer);
+                            }
+                            _a.label = 6;
+                        case 6:
+                            if (!silent) {
+                                this._emitLayerEvent(eventName, id, l);
+                                this._emitLayerEvent('layer:toggle', id, l);
+                            }
+                            l.options.visibility = toStatus;
+                            return [2 /*return*/];
                     }
-                }
-                if (!silent) {
-                    _this._emitLayerEvent(eventName, id, l);
-                    _this._emitLayerEvent('layer:toggle', id, l);
-                }
-                l.options.visibility = toStatus;
-            };
+                });
+            }); };
             if (layer && layer.options.visibility !== toStatus) {
                 return this.onMapLoad().then(function () { return action(layer); });
             }
@@ -17392,7 +17414,6 @@ var NgwLeaflet = (function () {
 
     /**
      * Collection of methods for managing map controls
-     * @public
      */
     var WebMapControls = /** @class */ (function (_super) {
         __extends(WebMapControls, _super);
@@ -17506,7 +17527,6 @@ var NgwLeaflet = (function () {
          * webMap.addControl(toggleControl, 'top-right');
          * ```
          * {@link http://code.nextgis.com/demo-examples-toggle-control | Toggle button control example}
-         * @public
          */
         WebMapControls.prototype.createToggleControl = function (options) {
             return __awaiter(this, void 0, void 0, function () {
@@ -17532,7 +17552,6 @@ var NgwLeaflet = (function () {
          *
          * @param control - Instance of WEB-GIS framework control.
          *                  What is returned by the {@Link WebMapControls.createControl | create} method
-         * @public
          */
         WebMapControls.prototype.removeControl = function (control) {
             var _this = this;
@@ -17550,7 +17569,6 @@ var NgwLeaflet = (function () {
          * Get instance of registered control
          * @param control - Any registered control string name
          * @param options - Custom control options
-         * @public
          */
         WebMapControls.prototype.getControl = function (control, options) {
             var engine = this.mapAdapter.controlAdapters[control];
@@ -17690,7 +17708,6 @@ var NgwLeaflet = (function () {
      * @typeParam C - Control
      * @typeParam E - Events
      *
-     * @public
      */
     var WebMap = /** @class */ (function (_super) {
         __extends(WebMap, _super);
@@ -17709,82 +17726,75 @@ var NgwLeaflet = (function () {
         WebMap.prototype._addLayerProviders = function () {
             var e_1, _a, e_2, _b;
             return __awaiter(this, void 0, void 0, function () {
-                var _c, _d, kit, adapters, adapters_1, adapters_1_1, adapter, newAdapter, e_2_1, e_1_1, er_1;
+                var _c, _d, kit, adapters, adapters_1, adapters_1_1, adapter, newAdapter, e_2_1, e_1_1;
                 return __generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
-                            _e.trys.push([0, 26, , 27]);
-                            _e.label = 1;
-                        case 1:
-                            _e.trys.push([1, 19, 20, 25]);
+                            _e.trys.push([0, 18, 19, 24]);
                             _c = __asyncValues(this._starterKits);
-                            _e.label = 2;
-                        case 2: return [4 /*yield*/, _c.next()];
-                        case 3:
-                            if (!(_d = _e.sent(), !_d.done)) return [3 /*break*/, 18];
+                            _e.label = 1;
+                        case 1: return [4 /*yield*/, _c.next()];
+                        case 2:
+                            if (!(_d = _e.sent(), !_d.done)) return [3 /*break*/, 17];
                             kit = _d.value;
-                            if (!kit.getLayerAdapters) return [3 /*break*/, 17];
+                            if (!kit.getLayerAdapters) return [3 /*break*/, 16];
                             return [4 /*yield*/, kit.getLayerAdapters.call(kit)];
-                        case 4:
+                        case 3:
                             adapters = _e.sent();
-                            if (!adapters) return [3 /*break*/, 17];
-                            _e.label = 5;
-                        case 5:
-                            _e.trys.push([5, 11, 12, 17]);
+                            if (!adapters) return [3 /*break*/, 16];
+                            _e.label = 4;
+                        case 4:
+                            _e.trys.push([4, 10, 11, 16]);
                             adapters_1 = (e_2 = void 0, __asyncValues(adapters));
-                            _e.label = 6;
-                        case 6: return [4 /*yield*/, adapters_1.next()];
-                        case 7:
-                            if (!(adapters_1_1 = _e.sent(), !adapters_1_1.done)) return [3 /*break*/, 10];
+                            _e.label = 5;
+                        case 5: return [4 /*yield*/, adapters_1.next()];
+                        case 6:
+                            if (!(adapters_1_1 = _e.sent(), !adapters_1_1.done)) return [3 /*break*/, 9];
                             adapter = adapters_1_1.value;
                             return [4 /*yield*/, adapter.createAdapter(this)];
-                        case 8:
+                        case 7:
                             newAdapter = _e.sent();
                             if (newAdapter) {
                                 this.mapAdapter.layerAdapters[adapter.name] = newAdapter;
                             }
-                            _e.label = 9;
-                        case 9: return [3 /*break*/, 6];
-                        case 10: return [3 /*break*/, 17];
-                        case 11:
+                            _e.label = 8;
+                        case 8: return [3 /*break*/, 5];
+                        case 9: return [3 /*break*/, 16];
+                        case 10:
                             e_2_1 = _e.sent();
                             e_2 = { error: e_2_1 };
-                            return [3 /*break*/, 17];
-                        case 12:
-                            _e.trys.push([12, , 15, 16]);
-                            if (!(adapters_1_1 && !adapters_1_1.done && (_b = adapters_1.return))) return [3 /*break*/, 14];
+                            return [3 /*break*/, 16];
+                        case 11:
+                            _e.trys.push([11, , 14, 15]);
+                            if (!(adapters_1_1 && !adapters_1_1.done && (_b = adapters_1.return))) return [3 /*break*/, 13];
                             return [4 /*yield*/, _b.call(adapters_1)];
-                        case 13:
+                        case 12:
                             _e.sent();
-                            _e.label = 14;
-                        case 14: return [3 /*break*/, 16];
-                        case 15:
+                            _e.label = 13;
+                        case 13: return [3 /*break*/, 15];
+                        case 14:
                             if (e_2) throw e_2.error;
                             return [7 /*endfinally*/];
-                        case 16: return [7 /*endfinally*/];
-                        case 17: return [3 /*break*/, 2];
-                        case 18: return [3 /*break*/, 25];
-                        case 19:
+                        case 15: return [7 /*endfinally*/];
+                        case 16: return [3 /*break*/, 1];
+                        case 17: return [3 /*break*/, 24];
+                        case 18:
                             e_1_1 = _e.sent();
                             e_1 = { error: e_1_1 };
-                            return [3 /*break*/, 25];
-                        case 20:
-                            _e.trys.push([20, , 23, 24]);
-                            if (!(_d && !_d.done && (_a = _c.return))) return [3 /*break*/, 22];
+                            return [3 /*break*/, 24];
+                        case 19:
+                            _e.trys.push([19, , 22, 23]);
+                            if (!(_d && !_d.done && (_a = _c.return))) return [3 /*break*/, 21];
                             return [4 /*yield*/, _a.call(_c)];
-                        case 21:
+                        case 20:
                             _e.sent();
-                            _e.label = 22;
-                        case 22: return [3 /*break*/, 24];
-                        case 23:
+                            _e.label = 21;
+                        case 21: return [3 /*break*/, 23];
+                        case 22:
                             if (e_1) throw e_1.error;
                             return [7 /*endfinally*/];
-                        case 24: return [7 /*endfinally*/];
-                        case 25: return [3 /*break*/, 27];
-                        case 26:
-                            er_1 = _e.sent();
-                            throw new Error(er_1);
-                        case 27: return [2 /*return*/];
+                        case 23: return [7 /*endfinally*/];
+                        case 24: return [2 /*return*/];
                     }
                 });
             });
@@ -17795,7 +17805,7 @@ var NgwLeaflet = (function () {
         WebMap.prototype._onLoadSync = function () {
             var e_3, _a;
             return __awaiter(this, void 0, void 0, function () {
-                var _b, _c, kit, er_2, e_3_1;
+                var _b, _c, kit, er_1, e_3_1;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -17815,8 +17825,8 @@ var NgwLeaflet = (function () {
                             _d.sent();
                             return [3 /*break*/, 6];
                         case 5:
-                            er_2 = _d.sent();
-                            console.error(er_2);
+                            er_1 = _d.sent();
+                            console.error(er_1);
                             return [3 /*break*/, 6];
                         case 6: return [3 /*break*/, 1];
                         case 7: return [3 /*break*/, 14];
@@ -18893,6 +18903,68 @@ var NgwLeaflet = (function () {
         return filterOptions;
     }
 
+    function getNgwWebmapExtent(webmap) {
+        var bottom = webmap['extent_bottom'];
+        var left = webmap['extent_left'];
+        var top = webmap['extent_top'];
+        var right = webmap['extent_right'];
+        if (bottom && left && top && right) {
+            var extent = [left, bottom, right, top];
+            if (extent[3] > 82) {
+                extent[3] = 82;
+            }
+            if (extent[1] < -82) {
+                extent[1] = -82;
+            }
+            return extent;
+        }
+    }
+    function fetchNgwLayerExtent(_a) {
+        var resourceId = _a.resourceId, connector = _a.connector, _b = _a.cache, cache = _b === void 0 ? true : _b;
+        return connector
+            .get('layer.extent', { cache: cache }, { id: resourceId })
+            .then(function (resp) {
+            if (resp) {
+                var _a = resp.extent, maxLat = _a.maxLat, maxLon = _a.maxLon, minLat = _a.minLat, minLon = _a.minLon;
+                var extentArray = [minLon, minLat, maxLon, maxLat];
+                return extentArray;
+            }
+        });
+    }
+    function fetchNgwLayerItemExtent(_a) {
+        var resourceId = _a.resourceId, featureId = _a.featureId, connector = _a.connector, _b = _a.cache, cache = _b === void 0 ? true : _b;
+        return connector
+            .get('feature_layer.feature.item_extent', { cache: cache }, { id: resourceId, fid: featureId })
+            .then(function (resp) {
+            if (resp) {
+                var _a = resp.extent, maxLat = _a.maxLat, maxLon = _a.maxLon, minLat = _a.minLat, minLon = _a.minLon;
+                var extentArray = [minLon, minLat, maxLon, maxLat];
+                return extentArray;
+            }
+        });
+    }
+    function fetchNgwResourceExtent(item, connector) {
+        if (item.webmap) {
+            return CancelablePromise.resolve(getNgwWebmapExtent(item.webmap));
+        }
+        else {
+            var resource = item.resource;
+            if (resource.cls && resource.cls.indexOf('style') !== -1) {
+                return connector.getResource(resource.parent.id).then(function (res) {
+                    if (res) {
+                        return fetchNgwLayerExtent({
+                            resourceId: res.resource.id,
+                            connector: connector,
+                        });
+                    }
+                });
+            }
+            else {
+                return fetchNgwLayerExtent({ resourceId: resource.id, connector: connector });
+            }
+        }
+    }
+
     function resourceIdFromLayerOptions(options, connector) {
         return __awaiter(this, void 0, void 0, function () {
             var resource, item, keyname, resourceId, resourceItem;
@@ -18983,7 +19055,7 @@ var NgwLeaflet = (function () {
         if (logic === 'any') {
             filters_.forEach(function (f) {
                 if (checkIfPropertyFilter(f)) {
-                    _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams), [createParam(f)]) })));
+                    _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), [createParam(f)]) })));
                 }
                 else {
                     createFeatureFieldFilterQueries(__assign(__assign({}, opt), { filters: f }), _queries, __spreadArray([], _parentAllParams));
@@ -19005,11 +19077,11 @@ var NgwLeaflet = (function () {
             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), filters_2));
+                    createFeatureFieldFilterQueries(__assign(__assign({}, opt), { filters: x }), _queries, __spreadArray(__spreadArray([], _parentAllParams, true), filters_2));
                 }
             }
             else {
-                _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams), filters_2) })));
+                _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), filters_2) })));
             }
         }
         return CancelablePromise.all(_queries).then(function (itemsParts) {
@@ -19131,56 +19203,6 @@ var NgwLeaflet = (function () {
         });
     }
 
-    function getNgwWebmapExtent(webmap) {
-        var bottom = webmap['extent_bottom'];
-        var left = webmap['extent_left'];
-        var top = webmap['extent_top'];
-        var right = webmap['extent_right'];
-        if (bottom && left && top && right) {
-            var extent = [left, bottom, right, top];
-            if (extent[3] > 82) {
-                extent[3] = 82;
-            }
-            if (extent[1] < -82) {
-                extent[1] = -82;
-            }
-            return extent;
-        }
-    }
-    function fetchNgwLayerExtent(_a) {
-        var resourceId = _a.resourceId, connector = _a.connector, _b = _a.cache, cache = _b === void 0 ? true : _b;
-        return connector
-            .get('layer.extent', { cache: cache }, { id: resourceId })
-            .then(function (resp) {
-            if (resp) {
-                var _a = resp.extent, maxLat = _a.maxLat, maxLon = _a.maxLon, minLat = _a.minLat, minLon = _a.minLon;
-                var extentArray = [minLon, minLat, maxLon, maxLat];
-                return extentArray;
-            }
-        });
-    }
-    function fetchNgwResourceExtent(item, connector) {
-        if (item.webmap) {
-            return CancelablePromise.resolve(getNgwWebmapExtent(item.webmap));
-        }
-        else {
-            var resource = item.resource;
-            if (resource.cls && resource.cls.indexOf('style') !== -1) {
-                return connector.getResource(resource.parent.id).then(function (res) {
-                    if (res) {
-                        return fetchNgwLayerExtent({
-                            resourceId: res.resource.id,
-                            connector: connector,
-                        });
-                    }
-                });
-            }
-            else {
-                return fetchNgwLayerExtent({ resourceId: resource.id, connector: connector });
-            }
-        }
-    }
-
     function createGeoJsonAdapter(props) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
@@ -19282,16 +19304,26 @@ var NgwLeaflet = (function () {
                                     });
                                 });
                             };
+                            /** @deprecated use {@link NgwGeoJsonAdapter.getBounds} instead */
                             NgwGeoJsonAdapter.prototype.getExtent = function () {
-                                var hasData = this.getLayers && this.getLayers().length;
-                                if (this.options.strategy === 'BBOX' || hasData) {
-                                    return fetchNgwResourceExtent(item, connector);
-                                }
-                                else {
-                                    if (_super.prototype.getExtent) {
-                                        return _super.prototype.getExtent.call(this);
-                                    }
-                                }
+                                return this.getBounds();
+                            };
+                            NgwGeoJsonAdapter.prototype.getBounds = function () {
+                                return __awaiter(this, void 0, void 0, function () {
+                                    var hasData;
+                                    return __generator(this, function (_a) {
+                                        hasData = this.getLayers && this.getLayers().length;
+                                        if (this.options.strategy === 'BBOX' || hasData) {
+                                            return [2 /*return*/, fetchNgwResourceExtent(item, connector)];
+                                        }
+                                        else {
+                                            if (_super.prototype.getBounds) {
+                                                return [2 /*return*/, _super.prototype.getBounds.call(this)];
+                                            }
+                                        }
+                                        return [2 /*return*/];
+                                    });
+                                });
                             };
                             NgwGeoJsonAdapter.prototype.beforeRemove = function () {
                                 removed = true;
@@ -19354,7 +19386,7 @@ var NgwLeaflet = (function () {
                                                 return [3 /*break*/, 8];
                                             case 7:
                                                 er_1 = _a.sent();
-                                                if (er_1.name !== 'CancelError') {
+                                                if (er_1 instanceof Error && er_1.name !== 'CancelError') {
                                                     throw er_1;
                                                 }
                                                 return [3 /*break*/, 8];
@@ -19458,10 +19490,11 @@ var NgwLeaflet = (function () {
         });
     }
 
-    function getLayerAdapterOptions(options, webMap, baseUrl) {
+    function ngwApiToAdapterOptions(_a) {
+        var options = _a.options, webMap = _a.webMap, baseUrl = _a.baseUrl;
         var adapter = options.adapter || 'IMAGE';
         var url;
-        var layerAdapters = webMap.getLayerAdapters();
+        var layerAdapters = webMap && webMap.getLayerAdapters();
         var isImageAllowed = layerAdapters ? layerAdapters.IMAGE : true;
         var resourceId = options.resource;
         var nd = options.tileNoData ? options.tileNoData : 200;
@@ -19537,7 +19570,7 @@ var NgwLeaflet = (function () {
     function createRasterAdapter(_a) {
         var layerOptions = _a.layerOptions, webMap = _a.webMap, connector = _a.connector, item = _a.item;
         return __awaiter(this, void 0, void 0, function () {
-            var resourceCls, clsAdapterAlias, adapter, layerAdapters, isImageAllowed, adapterClass, resourceId_1;
+            var resourceCls, clsAdapterAlias, adapter, layerAdapters, isImageAllowed, AdapterClass, resourceId_1;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -19559,21 +19592,25 @@ var NgwLeaflet = (function () {
                                 adapter = 'TILE';
                             }
                         }
-                        adapterClass = webMap.mapAdapter.layerAdapters[adapter];
-                        if (!adapterClass) return [3 /*break*/, 2];
+                        AdapterClass = webMap.mapAdapter.layerAdapters[adapter];
+                        if (!AdapterClass) return [3 /*break*/, 2];
                         return [4 /*yield*/, resourceIdFromLayerOptions(layerOptions, connector)];
                     case 1:
                         resourceId_1 = _b.sent();
                         return [2 /*return*/, /** @class */ (function (_super) {
-                                __extends(Adapter, _super);
-                                function Adapter(map, _options) {
+                                __extends(RasterAdapter, _super);
+                                function RasterAdapter(map, _options) {
                                     var _a;
                                     var _this = _super.call(this, map, _options) || this;
                                     _this.map = map;
                                     // options = {};
                                     _this.item = item;
                                     _this.resourceId = resourceId_1;
-                                    var opt = getLayerAdapterOptions(layerOptions, webMap, connector.options.baseUrl || '');
+                                    var opt = ngwApiToAdapterOptions({
+                                        options: layerOptions,
+                                        webMap: webMap,
+                                        baseUrl: connector.options.baseUrl || '',
+                                    });
                                     if (opt) {
                                         var layerAdapterOptions = __assign(__assign({}, opt), { setViewDelay: (_a = layerOptions.adapterOptions) === null || _a === void 0 ? void 0 : _a.setViewDelay, params: { resource: resourceId_1 }, 
                                             // @deprecated
@@ -19601,10 +19638,10 @@ var NgwLeaflet = (function () {
                                     }
                                     return _this;
                                 }
-                                Adapter.prototype.addLayer = function (addOptions) {
+                                RasterAdapter.prototype.addLayer = function (addOptions) {
                                     return _super.prototype.addLayer.call(this, __assign(__assign({}, this.options), addOptions));
                                 };
-                                Adapter.prototype.getIdentificationIds = function () {
+                                RasterAdapter.prototype.getIdentificationIds = function () {
                                     return __awaiter(this, void 0, void 0, function () {
                                         var id;
                                         return __generator(this, function (_a) {
@@ -19616,8 +19653,8 @@ var NgwLeaflet = (function () {
                                         });
                                     });
                                 };
-                                return Adapter;
-                            }(adapterClass))];
+                                return RasterAdapter;
+                            }(AdapterClass))];
                     case 2: throw new Error(adapter + ' not supported yet. Only TILE');
                 }
             });
@@ -20325,16 +20362,17 @@ var NgwLeaflet = (function () {
         return NgwWebmapItem;
     }(Item));
 
-    function createOnFirstShowNgwAdapter(_a) {
-        var webMap = _a.webMap, connector = _a.connector, item = _a.item, _b = _a.adapterOptions, adapterOptions = _b === void 0 ? {} : _b, _c = _a.idPrefix, idPrefix = _c === void 0 ? 'basemapwebmap' : _c;
+    function createOnFirstShowAdapter(_a) {
+        var webMap = _a.webMap, _b = _a.adapterOptions, adapterOptions = _b === void 0 ? {} : _b, onLayerAdded = _a.onLayerAdded, createAdapter = _a.createAdapter;
         return __awaiter(this, void 0, void 0, function () {
             var OnFirstShowAdapter;
-            return __generator(this, function (_d) {
+            return __generator(this, function (_c) {
                 OnFirstShowAdapter = /** @class */ (function () {
                     function OnFirstShowAdapter() {
                         this.options = {};
                         this.layer = [];
                         this._removed = false;
+                        this._creatingInProgress = false;
                     }
                     OnFirstShowAdapter.prototype.addLayer = function () {
                         return this.layer;
@@ -20343,8 +20381,10 @@ var NgwLeaflet = (function () {
                         this._removed = true;
                         this.layer.forEach(function (x) { return webMap.removeLayer(x); });
                     };
+                    OnFirstShowAdapter.prototype.destroyed = function () {
+                        return this._removed;
+                    };
                     OnFirstShowAdapter.prototype.showLayer = function () {
-                        var _this = this;
                         this.options.visibility = true;
                         if (this.layer.length) {
                             this.layer.forEach(function (x) {
@@ -20352,31 +20392,50 @@ var NgwLeaflet = (function () {
                             });
                         }
                         else {
-                            createAsyncAdapter({
-                                resource: item.resource_id,
-                                adapterOptions: {
-                                    name: item.display_name,
-                                    opacity: item.opacity,
-                                },
-                            }, webMap, connector).then(function (Adapter) {
-                                if (Adapter) {
-                                    var adapter_1 = new Adapter(webMap.mapAdapter.map, __assign(__assign({}, adapterOptions), { baselayer: false }));
-                                    adapter_1.addLayer({}).then(function (baselayer) {
-                                        adapter_1.options.baselayer = false;
-                                        Object.assign(adapter_1.options, adapterOptions);
-                                        adapter_1.id = idPrefix + '-' + item.resource_id;
-                                        adapter_1.layer = baselayer;
-                                        if (_this._removed) {
-                                            webMap.removeLayer(adapter_1);
+                            this.loadLayer();
+                        }
+                    };
+                    OnFirstShowAdapter.prototype.loadLayer = function () {
+                        return __awaiter(this, void 0, void 0, function () {
+                            var Adapter, adapter, realLayer;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        if (!(!this.layer.length && !this._creatingInProgress)) return [3 /*break*/, 5];
+                                        this._creatingInProgress = true;
+                                        return [4 /*yield*/, createAdapter(this)];
+                                    case 1:
+                                        Adapter = _a.sent();
+                                        if (!Adapter) return [3 /*break*/, 5];
+                                        adapter = new Adapter(webMap.mapAdapter.map, __assign({}, adapterOptions));
+                                        return [4 /*yield*/, adapter.addLayer({
+                                                order: this.options.order,
+                                                headers: this.options.headers,
+                                                baselayer: this.options.baselayer,
+                                            })];
+                                    case 2:
+                                        realLayer = _a.sent();
+                                        if (onLayerAdded) {
+                                            onLayerAdded(adapter);
                                         }
-                                        if (_this.options.visibility) {
-                                            webMap.showLayer(adapter_1);
+                                        Object.assign(adapter.options, adapterOptions);
+                                        adapter.layer = realLayer;
+                                        if (this._removed) {
+                                            webMap.removeLayer(adapter);
                                         }
-                                        _this.layer.push(adapter_1);
-                                    });
+                                        if (!this.options.visibility) return [3 /*break*/, 4];
+                                        return [4 /*yield*/, webMap.showLayer(adapter)];
+                                    case 3:
+                                        _a.sent();
+                                        _a.label = 4;
+                                    case 4:
+                                        this.layer.push(adapter);
+                                        this._creatingInProgress = false;
+                                        _a.label = 5;
+                                    case 5: return [2 /*return*/, this.layer];
                                 }
                             });
-                        }
+                        });
                     };
                     OnFirstShowAdapter.prototype.hideLayer = function () {
                         this.options.visibility = false;
@@ -20391,6 +20450,35 @@ var NgwLeaflet = (function () {
         });
     }
 
+    function createOnFirstShowNgwAdapter(_a) {
+        var webMap = _a.webMap, connector = _a.connector, item = _a.item, _b = _a.adapterOptions, adapterOptions = _b === void 0 ? {} : _b, _c = _a.idPrefix, idPrefix = _c === void 0 ? 'first-show-adapter' : _c;
+        return __awaiter(this, void 0, void 0, function () {
+            var createAdapter, onLayerAdded, OnFirstNgwShowAdapter;
+            return __generator(this, function (_d) {
+                createAdapter = function () {
+                    return createAsyncAdapter({
+                        resource: item.resource_id,
+                        adapterOptions: {
+                            name: item.display_name,
+                            opacity: item.opacity,
+                        },
+                    }, webMap, connector);
+                };
+                onLayerAdded = function (adapter) {
+                    adapter.options.baselayer = false;
+                    adapter.id = idPrefix + '-' + item.resource_id;
+                };
+                OnFirstNgwShowAdapter = createOnFirstShowAdapter({
+                    webMap: webMap,
+                    adapterOptions: adapterOptions,
+                    onLayerAdded: onLayerAdded,
+                    createAdapter: createAdapter,
+                });
+                return [2 /*return*/, OnFirstNgwShowAdapter];
+            });
+        });
+    }
+
     var BookmarkItem = /** @class */ (function () {
         function BookmarkItem(options) {
             this.options = options;
@@ -20506,7 +20594,11 @@ var NgwLeaflet = (function () {
                 this.layer.properties.property('visibility').set(false);
             }
         };
+        /** @deprecated use {@link NgwWebmapLayerAdapter.getBounds} instead */
         NgwWebmapLayerAdapter.prototype.getExtent = function () {
+            return this.getBounds();
+        };
+        NgwWebmapLayerAdapter.prototype.getBounds = function () {
             var webmap = this.response && this.response.webmap;
             if (webmap) {
                 return getNgwWebmapExtent(webmap);
@@ -20673,6 +20765,7 @@ var NgwLeaflet = (function () {
                     // to avoid set many basemaps on init
                     var visibility = enabledAlreadySet ? false : x.enabled;
                     webMap.addBaseLayer(adapter, {
+                        id: WEBMAP_BASELAYER_ID_PREFIX + x.resource_id,
                         name: x.display_name,
                         opacity: x.opacity,
                         visibility: visibility,
@@ -20706,10 +20799,14 @@ var NgwLeaflet = (function () {
                         return updateImageParams(params, resourceId_1);
                     };
                     var adapter = item.layer_adapter.toUpperCase();
-                    var layerAdapterOptions = getLayerAdapterOptions({
-                        adapter: adapter,
-                        resource: resourceId_1,
-                    }, webMap, this.options.connector.options.baseUrl || '');
+                    var layerAdapterOptions = ngwApiToAdapterOptions({
+                        options: {
+                            adapter: adapter,
+                            resource: resourceId_1,
+                        },
+                        webMap: webMap,
+                        baseUrl: this.options.connector.options.baseUrl || '',
+                    });
                     item = __assign(__assign({}, item), layerAdapterOptions);
                 }
             }
@@ -20781,7 +20878,15 @@ var NgwLeaflet = (function () {
     var NgwResource = /** @class */ (function () {
         function NgwResource() {
         }
+        /** @deprecated use {@link NgwResource.getBounds} instead */
         NgwResource.prototype.getExtent = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    return [2 /*return*/, this.getBounds()];
+                });
+            });
+        };
+        NgwResource.prototype.getBounds = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var _a;
                 return __generator(this, function (_b) {
@@ -20792,7 +20897,7 @@ var NgwLeaflet = (function () {
                             }
                             if (!this.item) return [3 /*break*/, 2];
                             _a = this;
-                            return [4 /*yield*/, fetchNgwResourceExtent(this.item, this.connector).then()];
+                            return [4 /*yield*/, fetchNgwResourceExtent(this.item, this.connector)];
                         case 1:
                             _a._extent = _b.sent();
                             return [2 /*return*/, this._extent];
@@ -21165,7 +21270,7 @@ var NgwLeaflet = (function () {
         MULTILINESTRINGZ: 'line',
         MULTIPOLYGONZ: 'polygon',
     };
-    function addNgwLayer(options, webMap, connector) {
+    function createNgwLayerAdapter(options, webMap, connector) {
         var headers = connector.getAuthorizationHeaders();
         if (headers) {
             options.headers = headers;
@@ -21299,25 +21404,20 @@ var NgwLeaflet = (function () {
         function IdentifyItem(options) {
             var f = options.feature;
             this.id = f.id;
+            this.geom = f.geom;
             this.label = f.label;
-            this.layerId = f.layerId;
             this.parent = f.parent;
             this.fields = f.fields;
-            this.geom = f.geom;
+            this.layerId = f.layerId;
             this.connector = options.connector;
         }
-        IdentifyItem.prototype.identify = function () {
+        IdentifyItem.prototype.identify = function (options) {
             var _this = this;
+            if (options === void 0) { options = {}; }
             if (this._item) {
                 return CancelablePromise.resolve(this._item);
             }
-            return fetchNgwLayerItem({
-                connector: this.connector,
-                featureId: this.id,
-                resourceId: this.layerId,
-                fields: null,
-                extensions: ['attachment', 'description'],
-            }).then(function (resp) {
+            return fetchNgwLayerItem(__assign({ connector: this.connector, featureId: this.id, resourceId: this.layerId, fields: null, extensions: ['attachment', 'description'] }, options)).then(function (resp) {
                 _this._item = resp;
                 _this.geom = resp.geom;
                 _this.extensions = resp.extensions;
@@ -21334,6 +21434,16 @@ var NgwLeaflet = (function () {
                 return _this._resource.feature_layer;
             });
         };
+        IdentifyItem.prototype.getBounds = function () {
+            if (this._extent) {
+                return CancelablePromise.resolve(this._extent);
+            }
+            return fetchNgwLayerItemExtent({
+                connector: this.connector,
+                featureId: this.id,
+                resourceId: this.layerId,
+            });
+        };
         IdentifyItem.prototype.geojson = function () {
             var _this = this;
             if (this._geojson) {
@@ -21349,6 +21459,8 @@ var NgwLeaflet = (function () {
         return IdentifyItem;
     }());
 
+    var WEBMAP_BASELAYER_ID_PREFIX = 'webmap-baselayer';
+
     function fetchNgwLayerItem(options) {
         var params = __assign({}, FEATURE_REQUEST_PARAMS);
         updateItemRequestParam(params, options);
@@ -21657,6 +21769,14 @@ var NgwLeaflet = (function () {
         return options;
     }
 
+    function getIdentifyRadius(center, zoom, pixelRadius) {
+        pixelRadius = pixelRadius !== null && pixelRadius !== void 0 ? pixelRadius : 10;
+        var metresPerPixel = (40075016.686 * Math.abs(Math.cos((center[1] * 180) / Math.PI))) /
+            Math.pow(2, zoom + 8);
+        var radius = pixelRadius * metresPerPixel * 0.0005;
+        return radius;
+    }
+
     /**
      * Base class containing the logic of interaction WebMap with NextGIS services.
      *
@@ -21675,7 +21795,6 @@ var NgwLeaflet = (function () {
      *   webmapId: 3985
      * });
      * ```
-     * @public
      */
     var NgwMap = /** @class */ (function (_super) {
         __extends(NgwMap, _super);
@@ -21769,7 +21888,7 @@ var NgwLeaflet = (function () {
                                     options.adapterOptions.setViewDelay = this.options.setViewDelay;
                                 }
                             }
-                            adapter = addNgwLayer(options, this, this.connector);
+                            adapter = createNgwLayerAdapter(options, this, this.connector);
                             adapterOpts = __assign(__assign({ visibility: true }, options), options.adapterOptions);
                             return [4 /*yield*/, this.addLayer(adapter, adapterOpts)];
                         case 3:
@@ -21928,7 +22047,7 @@ var NgwLeaflet = (function () {
          */
         NgwMap.prototype.fitLayer = function (layerDef, options) {
             return __awaiter(this, void 0, void 0, function () {
-                var id, ngwLayer, extent, item, resourceId;
+                var id, ngwLayer, bounds, item, resourceId;
                 var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -21941,12 +22060,12 @@ var NgwLeaflet = (function () {
                             }
                             ngwLayer = id && this._ngwLayers[id];
                             if (!ngwLayer) return [3 /*break*/, 7];
-                            if (!ngwLayer.layer.getExtent) return [3 /*break*/, 2];
-                            return [4 /*yield*/, ngwLayer.layer.getExtent()];
+                            if (!ngwLayer.layer.getBounds) return [3 /*break*/, 2];
+                            return [4 /*yield*/, ngwLayer.layer.getBounds()];
                         case 1:
-                            extent = _a.sent();
-                            if (extent) {
-                                this.fitBounds(extent, options);
+                            bounds = _a.sent();
+                            if (bounds) {
+                                this.fitBounds(bounds, options);
                             }
                             return [3 /*break*/, 6];
                         case 2:
@@ -22105,10 +22224,10 @@ var NgwLeaflet = (function () {
                         case 1:
                             _a.sent();
                             if (this.options.qmsId) {
-                                this.addQmsBaseLayer();
+                                this._addQmsBaseLayer();
                             }
                             if (this.options.osm) {
-                                this.addOsmBaseLayer();
+                                this._addOsmBaseLayer();
                             }
                             resources = [];
                             layerFitAllowed = this._isFitFromResource();
@@ -22153,10 +22272,10 @@ var NgwLeaflet = (function () {
                 });
             });
         };
-        NgwMap.prototype.addOsmBaseLayer = function () {
+        NgwMap.prototype._addOsmBaseLayer = function () {
             this.addBaseLayer('OSM');
         };
-        NgwMap.prototype.addQmsBaseLayer = function () {
+        NgwMap.prototype._addQmsBaseLayer = function () {
             var qmsId;
             var qmsLayerName;
             if (Array.isArray(this.options.qmsId)) {
@@ -22207,7 +22326,7 @@ var NgwLeaflet = (function () {
         };
         NgwMap.prototype._selectFromNgwRaster = function (ev) {
             return __awaiter(this, void 0, void 0, function () {
-                var promises, layers, getIdsPromise, getIds, ids, pixelRadius, center, zoom, metresPerPixel, radius, selectPromise;
+                var promises, layers, getIdsPromise, getIds, ids, pixelRadius, center, zoom, radius, selectPromise;
                 var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -22252,9 +22371,7 @@ var NgwLeaflet = (function () {
                                 this._emitStatusEvent('ngw:select', null);
                                 return [2 /*return*/];
                             }
-                            metresPerPixel = (40075016.686 * Math.abs(Math.cos((center[1] * 180) / Math.PI))) /
-                                Math.pow(2, zoom + 8);
-                            radius = pixelRadius * metresPerPixel * 0.0005;
+                            radius = getIdentifyRadius(center, zoom, pixelRadius);
                             selectPromise = sendIdentifyRequest(ev, {
                                 layers: ids,
                                 connector: this.connector,
@@ -22305,83 +22422,6 @@ var NgwLeaflet = (function () {
         return NgwMap;
     }(WebMap));
 
-    var typeAlias = {
-        Point: 'point',
-        LineString: 'line',
-        MultiPoint: 'point',
-        Polygon: 'polygon',
-        MultiLineString: 'line',
-        MultiPolygon: 'polygon',
-        GeometryCollection: 'polygon',
-    };
-    var PAINT = {
-        stroke: false,
-        opacity: 1,
-    };
-    var backAliases = {};
-    for (var a in typeAlias) {
-        var layerType = typeAlias[a];
-        var backAlias = backAliases[layerType] || [];
-        backAlias.push(a);
-        backAliases[layerType] = backAlias;
-    }
-    function findMostFrequentGeomType(arr) {
-        var counts = {};
-        for (var fry = 0; fry < arr.length; fry++) {
-            counts[arr[fry]] = 1 + (counts[arr[fry]] || 0);
-        }
-        var maxName = '';
-        for (var c in counts) {
-            var maxCount = maxName ? counts[maxName] : 0;
-            if (counts[c] > maxCount) {
-                maxName = c;
-            }
-        }
-        return maxName;
-    }
-    function detectType(geojson) {
-        var geometry;
-        if (geojson.type === 'FeatureCollection') {
-            var featuresTypes = geojson.features.map(function (f) { return f.geometry.type; });
-            geometry = findMostFrequentGeomType(featuresTypes);
-        }
-        else if (geojson.type === 'GeometryCollection') {
-            var geometryTypes = geojson.geometries.map(function (g) { return g.type; });
-            geometry = findMostFrequentGeomType(geometryTypes);
-        }
-        else if (geojson.type === 'Feature') {
-            geometry = geojson.geometry.type;
-        }
-        else {
-            geometry = geojson.type;
-        }
-        return geometry;
-    }
-    function geometryFilter(geometry, type) {
-        var geoJsonGeometry = backAliases[type] || [];
-        return geoJsonGeometry.indexOf(geometry) !== -1;
-    }
-    function filterGeometries(data, type) {
-        if (data.type === 'FeatureCollection') {
-            var _data = data;
-            _data.features = _data.features.filter(function (f) {
-                return geometryFilter(f.geometry.type, type);
-            });
-        }
-        else if (data.type === 'Feature') {
-            var allow = geometryFilter(data.geometry.type, type);
-            if (!allow) {
-                return false;
-            }
-        }
-        else if (data.type === 'GeometryCollection') {
-            var _data = data;
-            _data.geometries = _data.geometries.filter(function (g) {
-                return geometryFilter(g.type, type);
-            });
-        }
-        return data;
-    }
     function convertMapClickEvent(evt) {
         var coord = evt.containerPoint;
         var latLng = evt.latlng;
@@ -22482,6 +22522,118 @@ var NgwLeaflet = (function () {
         return AttributionControl;
     }(leafletSrc.exports.Control.Attribution));
 
+    function boundsToArray(bounds) {
+        var ne = bounds.getNorthEast();
+        var sw = bounds.getSouthWest();
+        return [sw.lng, sw.lat, ne.lng, ne.lat];
+    }
+
+    var typeAlias = {
+        Point: 'point',
+        LineString: 'line',
+        MultiPoint: 'point',
+        Polygon: 'polygon',
+        MultiLineString: 'line',
+        MultiPolygon: 'polygon',
+        GeometryCollection: 'polygon',
+    };
+    var PAINT = {
+        stroke: false,
+        opacity: 1,
+    };
+    var backAliases = {};
+    for (var a in typeAlias) {
+        var layerType = typeAlias[a];
+        var backAlias = backAliases[layerType] || [];
+        backAlias.push(a);
+        backAliases[layerType] = backAlias;
+    }
+    function geometryFilter(geometry, type) {
+        var geoJsonGeometry = backAliases[type] || [];
+        return geoJsonGeometry.indexOf(geometry) !== -1;
+    }
+    function filterGeometries(data, type) {
+        if (data.type === 'FeatureCollection') {
+            var _data = data;
+            _data.features = _data.features.filter(function (f) {
+                return geometryFilter(f.geometry.type, type);
+            });
+        }
+        else if (data.type === 'Feature') {
+            var allow = geometryFilter(data.geometry.type, type);
+            if (!allow) {
+                return false;
+            }
+        }
+        else if (data.type === 'GeometryCollection') {
+            var _data = data;
+            _data.geometries = _data.geometries.filter(function (g) {
+                return geometryFilter(g.type, type);
+            });
+        }
+        return data;
+    }
+    function featuresBounds(features) {
+        var geoJsonLayer = new leafletSrc.exports.GeoJSON();
+        var features_ = Array.isArray(features) ? features : [features];
+        features_.forEach(function (f) { return geoJsonLayer.addData(f); });
+        return geoJsonLayer.getBounds();
+    }
+    function getFeaturesBounds(features) {
+        return boundsToArray(featuresBounds(features));
+    }
+    function getFeaturesCenter(features) {
+        var _a = featuresBounds(features).getCenter(), lat = _a.lat, lng = _a.lng;
+        return [lng, lat];
+    }
+    function createFeaturePositionOptions(features) {
+        return {
+            getBounds: function () { return getFeaturesBounds(features); },
+            getCenter: function () { return getFeaturesCenter(features); },
+        };
+    }
+
+    function createMouseEvent(_a) {
+        var layer = _a.layer, source = _a.source;
+        var layer_ = source.target;
+        var feature = layer_.feature;
+        var opt = __assign({ layer: layer, feature: feature, event: convertMapClickEvent(source), source: source }, createFeaturePositionOptions(feature));
+        return opt;
+    }
+
+    function findMostFrequentGeomType(arr) {
+        var counts = {};
+        for (var fry = 0; fry < arr.length; fry++) {
+            counts[arr[fry]] = 1 + (counts[arr[fry]] || 0);
+        }
+        var maxName = '';
+        for (var c in counts) {
+            var maxCount = maxName ? counts[maxName] : 0;
+            if (counts[c] > maxCount) {
+                maxName = c;
+            }
+        }
+        return maxName;
+    }
+    function detectType(geojson) {
+        var geometry;
+        if (geojson.type === 'FeatureCollection') {
+            var featuresTypes = geojson.features.map(function (f) { return f.geometry.type; });
+            geometry = findMostFrequentGeomType(featuresTypes);
+        }
+        else if (geojson.type === 'GeometryCollection') {
+            var geometryTypes = geojson.geometries.map(function (g) { return g.type; });
+            geometry = findMostFrequentGeomType(geometryTypes);
+        }
+        else if (geojson.type === 'Feature') {
+            geometry = geojson.geometry.type;
+        }
+        else {
+            geometry = geojson.type;
+        }
+        return geometry;
+    }
+
     var BaseAdapter = /** @class */ (function () {
         function BaseAdapter(map, options) {
             this.map = map;
@@ -22497,7 +22649,8 @@ var NgwLeaflet = (function () {
                 this.pane = pane;
             }
         }
-        BaseAdapter.prototype.addLayer = function (_options) {
+        BaseAdapter.prototype.addLayer = function (options) {
+            Object.assign(this.options, options);
             return undefined;
         };
         return BaseAdapter;
@@ -22518,12 +22671,12 @@ var NgwLeaflet = (function () {
             _this.$unselect = function () {
                 _this.unselect();
             };
-            _this.layer = new leafletSrc.exports.FeatureGroup([], { pane: _this.pane });
             return _this;
         }
         GeoJsonAdapter.prototype.addLayer = function (options) {
-            this.options = options;
+            Object.assign(this.options, options);
             this.paint = options.paint;
+            this.layer = new leafletSrc.exports.FeatureGroup([], __assign(__assign({}, options.nativeOptions), { pane: this.pane }));
             this.selectedPaint = options.selectedPaint;
             options.paint = this.paint;
             if (options.data) {
@@ -22571,8 +22724,9 @@ var NgwLeaflet = (function () {
             }
         };
         GeoJsonAdapter.prototype.getSelected = function () {
+            var _this = this;
             return this._selectedLayers.map(function (x) {
-                return { feature: x.feature, layer: x };
+                return __assign({ target: _this, feature: x.feature, layer: x }, createFeaturePositionOptions(x.feature));
             });
         };
         GeoJsonAdapter.prototype.getFiltered = function () {
@@ -22582,28 +22736,28 @@ var NgwLeaflet = (function () {
             var _this = this;
             // Some optimization
             this._filterFun = fun;
-            // @ts-ignore
-            var _map = this.layer._map;
-            if (_map) {
-                this.layer.remove();
-            }
-            var filteredLayers = [];
-            this._layers.forEach(function (_a) {
-                var feature = _a.feature, layer = _a.layer;
-                if (layer) {
-                    var ok = fun ? fun({ feature: feature, layer: layer }) : true;
-                    if (ok) {
-                        _this.layer.addLayer(layer);
-                        filteredLayers.push({ feature: feature, layer: layer });
-                    }
-                    else {
-                        _this.layer.removeLayer(layer);
+            var layer_ = this.layer;
+            var map = layer_ && layer_._map;
+            if (layer_ && map) {
+                layer_.remove();
+                var filteredLayers_1 = [];
+                this._layers.forEach(function (_a) {
+                    var feature = _a.feature, layer = _a.layer;
+                    if (layer) {
+                        var ok = fun
+                            ? fun(__assign({ target: _this, feature: feature, layer: layer }, createFeaturePositionOptions(feature)))
+                            : true;
+                        if (ok) {
+                            layer_.addLayer(layer);
+                            filteredLayers_1.push(__assign({ target: _this, feature: feature, layer: layer }, createFeaturePositionOptions(feature)));
+                        }
+                        else {
+                            layer_.removeLayer(layer);
+                        }
                     }
-                }
-            });
-            this._filteredLayers = filteredLayers;
-            if (_map) {
-                this.layer.addTo(_map);
+                });
+                this._filteredLayers = filteredLayers_1;
+                layer_.addTo(map);
             }
             return this._filteredLayers;
         };
@@ -22615,34 +22769,32 @@ var NgwLeaflet = (function () {
             return this._layers.map(function (_a) {
                 var layer = _a.layer, feature = _a.feature;
                 var visible = layer && !!layer._map;
-                return {
-                    feature: feature,
-                    layer: layer,
-                    visible: visible,
-                    target: _this,
-                };
+                return __assign({ feature: feature, layer: layer, visible: visible, target: _this }, createFeaturePositionOptions(feature));
             });
         };
         GeoJsonAdapter.prototype.clearLayer = function (cb) {
             this.unselect();
-            if (cb) {
-                for (var fry = this._layers.length; fry--;) {
-                    var def = this._layers[fry];
-                    if (def) {
-                        var feature = def.feature, layer = def.layer;
-                        if (feature && layer) {
-                            var exist = cb(feature);
-                            if (exist) {
-                                this.layer.removeLayer(layer);
-                                this._layers.splice(fry, 1);
+            var layer_ = this.layer;
+            if (layer_) {
+                if (cb) {
+                    for (var fry = this._layers.length; fry--;) {
+                        var def = this._layers[fry];
+                        if (def) {
+                            var feature = def.feature, layer = def.layer;
+                            if (feature && layer) {
+                                var exist = cb(feature);
+                                if (exist) {
+                                    layer_.removeLayer(layer);
+                                    this._layers.splice(fry, 1);
+                                }
                             }
                         }
                     }
                 }
-            }
-            else {
-                this.layer.clearLayers();
-                this._layers = [];
+                else {
+                    layer_.clearLayers();
+                    this._layers = [];
+                }
             }
         };
         GeoJsonAdapter.prototype.setData = function (data) {
@@ -22704,12 +22856,14 @@ var NgwLeaflet = (function () {
                 });
             }
         };
+        /** @deprecated use {@link GeoJsonAdapter.getBounds} instead */
         GeoJsonAdapter.prototype.getExtent = function () {
-            var bounds = this.layer.getBounds();
-            var ne = bounds.getNorthEast();
-            var sw = bounds.getSouthWest();
-            if (ne && sw) {
-                return [sw.lng, sw.lat, ne.lng, ne.lat];
+            return this.getBounds();
+        };
+        GeoJsonAdapter.prototype.getBounds = function () {
+            if (this.layer) {
+                var bounds = this.layer.getBounds();
+                return boundsToArray(bounds);
             }
         };
         GeoJsonAdapter.prototype.setOpacity = function (value) {
@@ -22782,14 +22936,7 @@ var NgwLeaflet = (function () {
                                 }
                             };
                             if (!options.createPopupContent) return [3 /*break*/, 2];
-                            return [4 /*yield*/, options.createPopupContent({
-                                    layer: layer,
-                                    feature: feature,
-                                    target: this,
-                                    type: type,
-                                    close: close,
-                                    onClose: onClose,
-                                })];
+                            return [4 /*yield*/, options.createPopupContent(__assign({ layer: layer, feature: feature, target: this, type: type, close: close, onClose: onClose }, createFeaturePositionOptions(feature)))];
                         case 1:
                             _d = _e.sent();
                             return [3 /*break*/, 3];
@@ -22949,75 +23096,81 @@ var NgwLeaflet = (function () {
                 lopt = this._createPaintOptions(paint, type);
             }
             lopt.onEachFeature = function (feature, layer) {
+                _this._onEachFeature(feature, layer);
+            };
+            return lopt;
+        };
+        GeoJsonAdapter.prototype._onEachFeature = function (feature, layer) {
+            var _this = this;
+            var layer_ = this.layer;
+            if (layer_) {
+                var def_1 = __assign({ target: this, feature: feature, layer: layer }, createFeaturePositionOptions(feature));
                 // @ts-ignore
-                layer.options.pane = _this.pane;
-                _this._layers.push({ feature: feature, layer: layer });
+                layer.options.pane = this.pane;
+                this._layers.push(def_1);
                 var ok = true;
-                if (_this._filterFun) {
-                    ok = _this._filterFun({ feature: feature, layer: layer });
+                if (this._filterFun) {
+                    ok = this._filterFun(def_1);
                 }
                 if (ok) {
-                    var _a = _this.options, popup = _a.popup, popupOptions = _a.popupOptions, selectable = _a.selectable, interactive = _a.interactive, selectOnHover = _a.selectOnHover;
+                    var _a = this.options, popup = _a.popup, popupOptions = _a.popupOptions, selectable = _a.selectable, interactive = _a.interactive, selectOnHover = _a.selectOnHover;
                     // @ts-ignore
                     layer.options.interactive = defined(interactive) ? interactive : true;
-                    _this.layer.addLayer(layer);
+                    layer_.addLayer(layer);
                     if (selectable) {
                         if (selectOnHover) {
                             layer.on('mouseover', function () {
-                                _this._selectLayer({ feature: feature, layer: layer }, 'hover');
+                                _this._selectLayer(def_1, 'hover');
                             });
                             layer.on('mouseout', function () {
-                                _this._unSelectLayer({ feature: feature, layer: layer });
+                                _this._unSelectLayer(def_1);
                             });
                         }
                         else {
-                            layer.on('click', function (e) { return _this._selectOnLayerClick(e); }, _this);
+                            layer.on('click', function (e) { return _this._selectOnLayerClick(e); }, this);
                         }
                     }
-                    _this._handleMouseEvents(layer);
+                    this._handleMouseEvents(layer);
                     if (popup) {
-                        _this._openPopup({ layer: layer, feature: feature }, popupOptions, 'api');
+                        this._openPopup(__assign({ target: this, layer: layer, feature: feature }, createFeaturePositionOptions(feature)), popupOptions, 'api');
                     }
-                    _this._updateTooltip({ layer: layer, feature: feature });
+                    this._updateTooltip({ layer: layer, feature: feature });
                 }
-            };
-            return lopt;
+            }
         };
         GeoJsonAdapter.prototype._handleMouseEvents = function (layer) {
             var _this = this;
             var isSelected = function (l) { return _this._selectedLayers.indexOf(l) !== -1; };
-            var createMouseOptions = function (e) {
-                var layer_ = e.target;
-                return {
-                    layer: _this,
-                    feature: layer_.feature,
-                    event: convertMapClickEvent(e),
-                    source: e,
-                };
-            };
             var _a = this.options, onClick = _a.onClick, onLayerClick = _a.onLayerClick, onMouseOut = _a.onMouseOut, onMouseOver = _a.onMouseOver;
             // TODO: remove backward compatibility for onLayerClick
             var onClick_ = onClick || onLayerClick;
             if (onClick_) {
                 layer.on('click', function (e) {
-                    onClick_(__assign({ selected: isSelected(e.target) }, createMouseOptions(e)));
+                    onClick_(__assign({ selected: isSelected(e.target) }, _this._createMouseEvent(e)));
                 }, this);
             }
             if (onMouseOut) {
                 layer.on('mouseout', function (e) {
-                    onMouseOut(createMouseOptions(e));
+                    onMouseOut(_this._createMouseEvent(e));
                 }, this);
             }
             if (onMouseOver) {
                 layer.on('mouseover', function (e) {
-                    onMouseOver(createMouseOptions(e));
+                    onMouseOver(_this._createMouseEvent(e));
                 }, this);
             }
         };
+        GeoJsonAdapter.prototype._createMouseEvent = function (source) {
+            return createMouseEvent({
+                layer: this,
+                source: source,
+            });
+        };
         GeoJsonAdapter.prototype._selectOnLayerClick = function (e) {
             leafletSrc.exports.DomEvent.stopPropagation(e);
             var layer = e.target;
-            var def = { layer: layer, feature: layer.feature };
+            var feature = layer.feature;
+            var def = __assign({ target: this, layer: layer, feature: feature }, createFeaturePositionOptions(feature));
             var isSelected = this._selectedLayers.find(function (x) { return x.layer === layer; });
             if (isSelected) {
                 if (this.options && this.options.unselectOnSecondClick) {
@@ -23046,11 +23199,8 @@ var NgwLeaflet = (function () {
                 this._openPopup(def, popupOptions, type, latlng);
             }
             if (this.options.onSelect) {
-                this.options.onSelect({
-                    type: type,
-                    layer: this,
-                    features: def.feature ? [def.feature] : [],
-                });
+                var features = def.feature ? [def.feature] : [];
+                this.options.onSelect(__assign({ type: type, layer: this, features: features }, createFeaturePositionOptions(features)));
             }
         };
         GeoJsonAdapter.prototype._unSelectLayer = function (def) {
@@ -23398,7 +23548,7 @@ var NgwLeaflet = (function () {
             if (url) {
                 options = __assign({ transparent: true }, options);
                 var updateWmsParamsFromOpt_1 = options.updateWmsParams;
-                this.layer = new ImageLayer(url, __assign(__assign({ pane: this.pane, headers: options.headers, setViewDelay: options.setViewDelay }, options), options.params));
+                this.layer = new ImageLayer(url, __assign(__assign(__assign({ pane: this.pane, headers: options.headers, setViewDelay: options.setViewDelay }, options), options.params), options.nativeOptions));
                 if (updateWmsParamsFromOpt_1) {
                     var updateWmsParams_1 = this.layer.updateWmsParams;
                     this.layer.updateWmsParams = function (map) {
@@ -23533,26 +23683,18 @@ var NgwLeaflet = (function () {
             return _super !== null && _super.apply(this, arguments) || this;
         }
         WmsAdapter.prototype.addLayer = function (options) {
-            if (options) {
-                var url = options.url, opt = __rest(options, ["url"]);
-                if (url) {
-                    var layerOptions = {
-                        pane: this.pane,
-                        attribution: opt.attribution,
-                        minZoom: opt.minZoom,
-                        maxZoom: opt.maxZoom,
-                        layers: options.layers,
-                        format: options.format,
-                    };
-                    var layer = void 0;
-                    if (opt.headers) {
-                        layer = new WmsLayer(url, __assign(__assign({}, layerOptions), { headers: opt.headers }));
-                    }
-                    else {
-                        layer = new leafletSrc.exports.TileLayer.WMS(url, layerOptions);
-                    }
-                    return layer;
+            Object.assign(this.options, options);
+            var url = options.url, opt = __rest(options, ["url"]);
+            if (url) {
+                var layerOptions = __assign({ pane: this.pane, attribution: opt.attribution, minZoom: opt.minZoom, maxZoom: opt.maxZoom, layers: options.layers, format: options.format }, options.nativeOptions);
+                var layer = void 0;
+                if (opt.headers) {
+                    layer = new WmsLayer(url, __assign(__assign({}, layerOptions), { headers: opt.headers }));
+                }
+                else {
+                    layer = new leafletSrc.exports.TileLayer.WMS(url, layerOptions);
                 }
+                return layer;
             }
         };
         return WmsAdapter;
@@ -23564,7 +23706,7 @@ var NgwLeaflet = (function () {
             return _super !== null && _super.apply(this, arguments) || this;
         }
         OsmAdapter.prototype.addLayer = function (options) {
-            var url = options.url || 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+            var url = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
             return _super.prototype.addLayer.call(this, __assign(__assign({ name: 'OpenStreetMap', attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors' }, options), { url: url }));
         };
         return OsmAdapter;
@@ -23857,3 +23999,4 @@ var NgwLeaflet = (function () {
     return NgwLeaflet;
 
 }());
+//# sourceMappingURL=ngw-leaflet.global.js.map