@nextgis/ngw-map 1.13.2 → 1.13.7

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.13.2; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.13.7; author: NextGIS */
 import { EventEmitter } from 'events';
 import CancelablePromise from '@nextgis/cancelable-promise';
 import { deepmerge, isObject, defined, deprecatedWarn } from '@nextgis/utils';

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.13.2; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.13.7; author: NextGIS */
 var NgwMap = (function (exports) {
     'use strict';
 
@@ -2828,6 +2828,7 @@ var NgwMap = (function (exports) {
         };
         /** Shortcut for {@link WebMapLayers.addLayer} to create TileLayer adapter */
         WebMapLayers.prototype.addTileLayer = function (url, options) {
+            if (options === void 0) { options = {}; }
             return this.addLayer('TILE', __assign(__assign({}, options), { url: url }));
         };
         WebMapLayers.prototype.addImageLayer = function (urlOrOptions, options) {
@@ -4634,6 +4635,7 @@ var NgwMap = (function (exports) {
             this.id = ID$1++;
             this.emitter = new events.exports.EventEmitter();
             this.routeStr = '/api/component/pyramid/route';
+            this.activeRequests = [];
             var exist = findConnector(options);
             if (exist) {
                 return exist;
@@ -4719,6 +4721,7 @@ var NgwMap = (function (exports) {
          * Disconnecting a user. Aborting all current requests
          */
         NgwConnector.prototype.logout = function () {
+            this.abort();
             removeConnector(this);
             this.options.auth = undefined;
             this.user = undefined;
@@ -4771,6 +4774,17 @@ var NgwMap = (function (exports) {
                 }
             }
         };
+        /** Stop all api requests */
+        NgwConnector.prototype.abort = function () {
+            for (var _i = 0, _a = this.activeRequests; _i < _a.length; _i++) {
+                var req = _a[_i];
+                req.cancel();
+            }
+            this.activeRequests = [];
+        };
+        NgwConnector.prototype.getActiveApiRequests = function () {
+            return __spreadArray([], this.activeRequests, true);
+        };
         /**
          * Send request to NGW api router.
          * @param name - NGW route name from {@link https://docs.nextgis.com/docs_ngweb_dev/doc/developer/resource.html#routes | routes}
@@ -4992,7 +5006,13 @@ var NgwMap = (function (exports) {
                     options.headers = __assign(__assign({}, _this.getAuthorizationHeaders()), options.headers);
                 }
                 loadData(url, resolve, options, reject, onCancel);
-            }).catch(function (httpError) {
+            })
+                .then(function (resp) {
+                _this._cleanActiveRequests(request);
+                return resp;
+            })
+                .catch(function (httpError) {
+                _this._cleanActiveRequests(request);
                 if (httpError instanceof CancelablePromise.CancelError) ;
                 else {
                     // @ts-ignore
@@ -5011,8 +5031,15 @@ var NgwMap = (function (exports) {
                     request.cancel();
                 });
             }
+            this.activeRequests.push(request);
             return request;
         };
+        NgwConnector.prototype._cleanActiveRequests = function (request) {
+            var activeRequestIndex = this.activeRequests.indexOf(request);
+            if (activeRequestIndex !== -1) {
+                this.activeRequests.splice(activeRequestIndex, 1);
+            }
+        };
         NgwConnector.prototype._handleHttpError = function (er) {
             if (er) {
                 if (er instanceof NgwError) {
@@ -5837,6 +5864,8 @@ var NgwMap = (function (exports) {
                 // url = baseUrl + '/api/resource/' + options.resourceId + '/{z}/{x}/{y}.mvt';
                 return {
                     url: url,
+                    sourceLayer: 'ngw:' + resourceId,
+                    featureIdName: '$id',
                 };
             }
             if (adapter === 'TERRAIN') {