@nextgis/ngw-leaflet 1.13.2 → 1.13.7

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 1.13.2; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.13.7; author: NextGIS */
 import 'leaflet/dist/leaflet.css';
 import { Icon } from 'leaflet';
 import { NgwMap } from '@nextgis/ngw-map';

package/lib/ngw-leaflet.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 1.13.2; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.13.7; author: NextGIS */
 var NgwLeaflet = (function () {
     'use strict';
 
@@ -16919,6 +16919,7 @@ var NgwLeaflet = (function () {
         };
         /** 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) {
@@ -18707,6 +18708,7 @@ var NgwLeaflet = (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;
@@ -18792,6 +18794,7 @@ var NgwLeaflet = (function () {
          * Disconnecting a user. Aborting all current requests
          */
         NgwConnector.prototype.logout = function () {
+            this.abort();
             removeConnector(this);
             this.options.auth = undefined;
             this.user = undefined;
@@ -18844,6 +18847,17 @@ var NgwLeaflet = (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}
@@ -19065,7 +19079,13 @@ var NgwLeaflet = (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
@@ -19084,8 +19104,15 @@ var NgwLeaflet = (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) {
@@ -19898,6 +19925,8 @@ var NgwLeaflet = (function () {
                 // url = baseUrl + '/api/resource/' + options.resourceId + '/{z}/{x}/{y}.mvt';
                 return {
                     url: url,
+                    sourceLayer: 'ngw:' + resourceId,
+                    featureIdName: '$id',
                 };
             }
             if (adapter === 'TERRAIN') {