@nextgis/ngw-map 1.13.8 → 1.15.1

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

@@ -1,5 +1,5 @@
-/** Bundle of @nextgis/ngw-map; version: 1.13.8; author: NextGIS */
-/*! *****************************************************************************
+/** Bundle of @nextgis/ngw-map; version: 1.15.1; author: NextGIS */
+/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -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,
@@ -4437,6 +4437,29 @@ var ResourcesControl = /** @class */ (function () {
             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 = []; }
@@ -4464,29 +4487,6 @@ var ResourcesControl = /** @class */ (function () {
             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;
@@ -4644,6 +4644,9 @@ var NgwConnector$1 = /** @class */ (function () {
             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);
         }
@@ -4651,6 +4654,9 @@ var NgwConnector$1 = /** @class */ (function () {
     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.
@@ -4910,9 +4916,8 @@ var NgwConnector$1 = /** @class */ (function () {
             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');
@@ -5005,6 +5010,11 @@ var NgwConnector$1 = /** @class */ (function () {
                 // 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) {
@@ -5029,6 +5039,7 @@ var NgwConnector$1 = /** @class */ (function () {
             typeof options.signal.addEventListener === 'function') {
             options.signal.addEventListener('abort', function () {
                 request.cancel();
+                _this._cleanActiveRequests(request);
             });
         }
         this.activeRequests.push(request);
@@ -5895,7 +5906,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 +5985,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;
                             }
@@ -7800,10 +7795,8 @@ function extendNgwWebmapLayerAdapter(opt) {
     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));
@@ -8667,13 +8660,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 +8678,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 +8837,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 +8871,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 +8898,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 +8945,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;