@nextgis/ngw-map 1.13.8 → 1.15.1

package/lib/ngw-map.global.js

@@ -1,8 +1,8 @@
-/** Bundle of @nextgis/ngw-map; version: 1.13.8; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.15.1; author: NextGIS */
 var NgwMap = (function (exports) {
     'use strict';
 
-    /*! *****************************************************************************
+    /******************************************************************************
     Copyright (c) Microsoft Corporation.
 
     Permission to use, copy, modify, and/or distribute this software for any
@@ -1864,7 +1864,7 @@ var NgwMap = (function (exports) {
     var ID$2 = 0;
     var OPTIONS$1 = {
         minZoom: 0,
-        maxZoom: 20,
+        maxZoom: 22,
         paint: {
             color: '#0000ff',
             opacity: 0.4,
@@ -4440,6 +4440,29 @@ var NgwMap = (function (exports) {
                 return _this._getChildrenOf(parent, requestOptions);
             });
         };
+        ResourcesControl.prototype.update = function (resource, data) {
+            var _this = this;
+            return this.getId(resource).then(function (id) {
+                if (id !== undefined) {
+                    return _this.connector.put('resource.item', { data: data }, { id: id });
+                }
+            });
+        };
+        /**
+         * Fast way to delete resource from NGW and clean cache.
+         * @param resource - Resource definition
+         */
+        ResourcesControl.prototype.delete = function (resource) {
+            var _this = this;
+            return this.getId(resource).then(function (id) {
+                if (id !== undefined) {
+                    return _this.connector.delete('resource.item', null, { id: id }).then(function () {
+                        _this._cleanResourceItemCache(id);
+                        return undefined;
+                    });
+                }
+            });
+        };
         ResourcesControl.prototype._getChildrenOf = function (parent, requestOptions, _items) {
             var _this = this;
             if (_items === void 0) { _items = []; }
@@ -4467,29 +4490,6 @@ var NgwMap = (function (exports) {
                 return _items;
             });
         };
-        ResourcesControl.prototype.update = function (resource, data) {
-            var _this = this;
-            return this.getId(resource).then(function (id) {
-                if (id !== undefined) {
-                    return _this.connector.put('resource.item', { data: data }, { id: id });
-                }
-            });
-        };
-        /**
-         * Fast way to delete resource from NGW and clean cache.
-         * @param resource - Resource definition
-         */
-        ResourcesControl.prototype.delete = function (resource) {
-            var _this = this;
-            return this.getId(resource).then(function (id) {
-                if (id !== undefined) {
-                    return _this.connector.delete('resource.item', null, { id: id }).then(function () {
-                        _this._cleanResourceItemCache(id);
-                        return undefined;
-                    });
-                }
-            });
-        };
         ResourcesControl.prototype._cleanResourceItemCache = function (id) {
             return __awaiter(this, void 0, void 0, function () {
                 var all, toDelete, _i, all_1, c, cid, rid, _a, toDelete_1, d;
@@ -4647,6 +4647,9 @@ var NgwMap = (function (exports) {
                 if (this.options.route) {
                     this.routeStr = this.options.route;
                 }
+                if (this.options.requestTransform) {
+                    this.requestTransform = this.options.requestTransform;
+                }
                 this.resources = new ResourcesControl(this);
                 addConnector(this);
             }
@@ -4654,6 +4657,9 @@ var NgwMap = (function (exports) {
         NgwConnector.create = function (options) {
             return new this(options);
         };
+        NgwConnector.prototype.setRequestTransform = function (requestTransform) {
+            this.requestTransform = requestTransform;
+        };
         /**
          * Fast way to specify the connection address to NextGIS Web.
          * The current connection will be severed.
@@ -4913,9 +4919,8 @@ var NgwMap = (function (exports) {
                 if (params) {
                     url = template(url, params);
                 }
-                // remove double slash
-                url = fixUrlStr(url);
-                return this._loadData(encodeURI(url), options);
+                url = encodeURI(fixUrlStr(url));
+                return this._loadData(url, options);
             }
             else {
                 throw new Error('Empty `url` not allowed');
@@ -5008,6 +5013,11 @@ var NgwMap = (function (exports) {
                     // options.withCredentials = true;
                     options.headers = __assign(__assign({}, _this.getAuthorizationHeaders()), options.headers);
                 }
+                if (_this.requestTransform) {
+                    var _a = _this.requestTransform(url, options), transUrl = _a[0], transOptions = _a[1];
+                    url = transUrl;
+                    options = transOptions;
+                }
                 loadData(url, resolve, options, reject, onCancel);
             })
                 .then(function (resp) {
@@ -5032,6 +5042,7 @@ var NgwMap = (function (exports) {
                 typeof options.signal.addEventListener === 'function') {
                 options.signal.addEventListener('abort', function () {
                     request.cancel();
+                    _this._cleanActiveRequests(request);
                 });
             }
             this.activeRequests.push(request);
@@ -5898,7 +5909,7 @@ var NgwMap = (function (exports) {
                         '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,
@@ -5977,29 +5988,13 @@ var NgwMap = (function (exports) {
                                         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;
                                 }
@@ -7803,10 +7798,8 @@ var NgwMap = (function (exports) {
         var A = /** @class */ (function (_super) {
             __extends(A, _super);
             function A(map, options) {
-                var _this = this;
                 options = __assign(__assign({}, opt), options);
-                _this = _super.call(this, map, options) || this;
-                return _this;
+                return _super.call(this, map, options) || this;
             }
             return A;
         }(NgwWebmapLayerAdapter));
@@ -8670,13 +8663,14 @@ var NgwMap = (function (exports) {
             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);
                     }
                 };
@@ -8687,8 +8681,10 @@ var NgwMap = (function (exports) {
         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;
             }
         };
@@ -8844,7 +8840,11 @@ var NgwMap = (function (exports) {
         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) {
@@ -8874,10 +8874,10 @@ var NgwMap = (function (exports) {
         };
         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 = [];
@@ -8901,13 +8901,14 @@ var NgwMap = (function (exports) {
                             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*/];
@@ -8947,6 +8948,9 @@ var NgwMap = (function (exports) {
             };
             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;