@nextgis/ngw-map 1.13.2 → 1.13.7

package/lib/ngw-map.cjs.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 */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

package/lib/ngw-map.esm-browser.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 */
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -2825,6 +2825,7 @@ var WebMapLayers = /** @class */ (function (_super) {
     };
     /** 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) {
@@ -4631,6 +4632,7 @@ var NgwConnector$1 = /** @class */ (function () {
         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;
@@ -4716,6 +4718,7 @@ var NgwConnector$1 = /** @class */ (function () {
      * Disconnecting a user. Aborting all current requests
      */
     NgwConnector.prototype.logout = function () {
+        this.abort();
         removeConnector(this);
         this.options.auth = undefined;
         this.user = undefined;
@@ -4768,6 +4771,17 @@ var NgwConnector$1 = /** @class */ (function () {
             }
         }
     };
+    /** 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}
@@ -4989,7 +5003,13 @@ var NgwConnector$1 = /** @class */ (function () {
                 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
@@ -5008,8 +5028,15 @@ var NgwConnector$1 = /** @class */ (function () {
                 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) {
@@ -5834,6 +5861,8 @@ function ngwApiToAdapterOptions(_a) {
             // url = baseUrl + '/api/resource/' + options.resourceId + '/{z}/{x}/{y}.mvt';
             return {
                 url: url,
+                sourceLayer: 'ngw:' + resourceId,
+                featureIdName: '$id',
             };
         }
         if (adapter === 'TERRAIN') {