@nextgis/ngw-map 1.13.8 → 1.14.0

package/lib/ngw-map.esm-browser.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.13.8; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.14.0; author: NextGIS */
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -1861,7 +1861,7 @@ function clearObject(obj) {
 var ID$2 = 0;
 var OPTIONS$1 = {
     minZoom: 0,
-    maxZoom: 20,
+    maxZoom: 22,
     paint: {
         color: '#0000ff',
         opacity: 0.4,
@@ -5895,7 +5895,7 @@ function ngwApiToAdapterOptions(_a) {
                     'resource=' +
                     resourceId +
                     '&simplification=' +
-                    ((_b = options.simplification) !== null && _b !== void 0 ? _b : 8);
+                    ((_b = options.simplification) !== null && _b !== void 0 ? _b : 6);
             // url = baseUrl + '/api/resource/' + options.resourceId + '/{z}/{x}/{y}.mvt';
             return {
                 url: url,
@@ -5974,29 +5974,13 @@ function createRasterAdapter(_a) {
                                     baseUrl: connector.options.baseUrl || '',
                                 });
                                 if (opt) {
-                                    var layerAdapterOptions = __assign(__assign(__assign({}, opt), layerOptions.adapterOptions), { params: { resource: resourceId_1 }, 
-                                        // @deprecated
-                                        layers: String(resourceId_1), resourceId: resourceId_1 });
+                                    var layerAdapterOptions = __assign(__assign(__assign({}, opt), layerOptions.adapterOptions), { params: { resource: resourceId_1 }, layers: opt.layers || String(resourceId_1), resourceId: resourceId_1 });
                                     if (layerOptions.adapterOptions &&
                                         defined(layerOptions.adapterOptions.setViewDelay)) {
                                         layerAdapterOptions.setViewDelay =
                                             layerOptions.adapterOptions.setViewDelay;
                                     }
                                     _this.options = __assign(__assign({}, _this.options), layerAdapterOptions);
-                                    // if (true) {
-                                    //   Object.defineProperty(this.options, 'layers', {
-                                    //     get: () => {
-                                    //       console.warn('Do not use `layers` in ImageAdapterOptions');
-                                    //       return String(resourceId);
-                                    //     },
-                                    //   });
-                                    //   Object.defineProperty(this.options, 'resourceId', {
-                                    //     get: () => {
-                                    //       console.warn('Do not use `resourceId` in ImageAdapterOptions');
-                                    //       return resourceId;
-                                    //     },
-                                    //   });
-                                    // }
                                 }
                                 return _this;
                             }
@@ -8667,13 +8651,14 @@ var NgwMap = /** @class */ (function (_super) {
         var _this = this;
         if (!this.$$selectFromNgwRaster) {
             this.$$selectFromNgwRaster = function (ev) {
-                var count = _this.emitter.listenerCount('ngw:select');
+                var count = _this._getSelectListenersCount();
                 if (count) {
                     _this._selectFromNgwRaster(ev);
                 }
             };
             this.$$selectFromNgwVector = function (ev) {
-                if (_this.emitter.listenerCount('ngw:select')) {
+                var count = _this._getSelectListenersCount();
+                if (count) {
                     _this._selectFromNgwVector(ev);
                 }
             };
@@ -8684,8 +8669,10 @@ var NgwMap = /** @class */ (function (_super) {
     NgwMap.prototype.disableSelection = function () {
         if (this.$$selectFromNgwRaster) {
             this.emitter.removeListener('click', this.$$selectFromNgwRaster);
-            this.emitter.removeListener('click', this._selectFromNgwVector);
             this.$$selectFromNgwRaster = undefined;
+        }
+        if (this.$$selectFromNgwVector) {
+            this.emitter.removeListener('layer:click', this.$$selectFromNgwVector);
             this.$$selectFromNgwVector = undefined;
         }
     };
@@ -8841,7 +8828,11 @@ var NgwMap = /** @class */ (function (_super) {
     NgwMap.prototype._selectFromNgwVector = function (ev) {
         var _a;
         var layer = ev.layer;
-        // item property means layer is NgwResource
+        var selectable = layer.options.selectable && this.isLayerVisible(layer);
+        if (!selectable) {
+            return undefined;
+        }
+        // Item property means layer is NgwResource
         var id = layer.item && layer.item.resource.id;
         var feature = ev.feature;
         if (id !== undefined && feature) {
@@ -8871,10 +8862,10 @@ var NgwMap = /** @class */ (function (_super) {
     };
     NgwMap.prototype._selectFromNgwRaster = function (ev) {
         return __awaiter(this, void 0, void 0, function () {
-            var promises, layers, _i, layers_1, l, layer, identFunc, getIdsPromise, getIds, ids, pixelRadius, center, zoom, radius, selectPromise;
+            var promises, layers, _i, layers_1, l, layer, identFunc, getIdsPromise, getIds, ids, _a, getIds_1, x, pixelRadius, center, zoom, radius, selectPromise;
             var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         this._emitStatusEvent('ngw:preselect');
                         promises = [];
@@ -8898,13 +8889,14 @@ var NgwMap = /** @class */ (function (_super) {
                         getIdsPromise = Promise.all(promises);
                         return [4 /*yield*/, getIdsPromise];
                     case 1:
-                        getIds = _a.sent();
+                        getIds = _b.sent();
                         ids = [];
-                        getIds.forEach(function (x) {
+                        for (_a = 0, getIds_1 = getIds; _a < getIds_1.length; _a++) {
+                            x = getIds_1[_a];
                             if (x) {
-                                x.forEach(function (y) { return ids.push(y); });
+                                ids.push.apply(ids, x);
                             }
-                        });
+                        }
                         if (!ids.length) {
                             this._emitStatusEvent('ngw:select', null);
                             return [2 /*return*/];
@@ -8944,6 +8936,9 @@ var NgwMap = /** @class */ (function (_super) {
         };
         return __assign(__assign({}, identify), { getIdentifyItems: getIdentifyItems_ });
     };
+    NgwMap.prototype._getSelectListenersCount = function () {
+        return this.emitter.listenerCount('ngw:select');
+    };
     NgwMap.prototype._whiteLabel = function () {
         return __awaiter(this, void 0, void 0, function () {
             var container, logo;