@nextgis/ngw-leaflet 1.12.1 → 1.13.5

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-leaflet; version: 1.12.1; author: NextGIS */
+/** Bundle of @nextgis/ngw-leaflet; version: 1.13.5; author: NextGIS */
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -18116,31 +18116,31 @@ var Cache = /** @class */ (function () {
 /**
  * Thrown when...
  */
-var NgwError = /** @class */ (function (_super) {
-    __extends(NgwError, _super);
-    function NgwError(er) {
+var NetworkError = /** @class */ (function (_super) {
+    __extends(NetworkError, _super);
+    function NetworkError(url) {
         var _this = _super.call(this) || this;
-        _this.name = 'NgwError';
-        Object.assign(_this, er);
-        Object.setPrototypeOf(_this, NgwError.prototype);
+        _this.name = 'NetworkError';
+        Object.setPrototypeOf(_this, NetworkError.prototype);
+        _this.message = "Unable to request ".concat(url, ".\n    Possibly invalid NGW URL entered or CORS not configured to get request from ").concat(location.origin); // /control-panel/cors
         return _this;
     }
-    return NgwError;
+    return NetworkError;
 }(Error));
 
 /**
  * Thrown when...
  */
-var NetworkError = /** @class */ (function (_super) {
-    __extends(NetworkError, _super);
-    function NetworkError(url) {
+var NgwError = /** @class */ (function (_super) {
+    __extends(NgwError, _super);
+    function NgwError(er) {
         var _this = _super.call(this) || this;
-        _this.name = 'NetworkError';
-        Object.setPrototypeOf(_this, NetworkError.prototype);
-        _this.message = "Unable to request ".concat(url, ".\n    Possibly invalid NGW URL entered or CORS not configured to get request from ").concat(location.origin); // /control-panel/cors
+        _this.name = 'NgwError';
+        Object.assign(_this, er);
+        Object.setPrototypeOf(_this, NgwError.prototype);
         return _this;
     }
-    return NetworkError;
+    return NgwError;
 }(Error));
 
 function isObject(val) {
@@ -18254,11 +18254,6 @@ var loadData;
                 xhr.abort();
             });
         }
-        if (options.signal) {
-            options.signal.addEventListener('abort', function () {
-                xhr.abort();
-            });
-        }
         xhr.send(data);
     };
 }
@@ -18709,6 +18704,7 @@ var NgwConnector = /** @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;
@@ -18794,6 +18790,7 @@ var NgwConnector = /** @class */ (function () {
      * Disconnecting a user. Aborting all current requests
      */
     NgwConnector.prototype.logout = function () {
+        this.abort();
         removeConnector(this);
         this.options.auth = undefined;
         this.user = undefined;
@@ -18846,6 +18843,17 @@ var NgwConnector = /** @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}
@@ -19060,14 +19068,20 @@ var NgwConnector = /** @class */ (function () {
     NgwConnector.prototype._loadData = function (url, options) {
         var _this = this;
         options.responseType = options.responseType || 'json';
-        return new CancelablePromise(function (resolve, reject, onCancel) {
+        var request = new CancelablePromise(function (resolve, reject, onCancel) {
             if (_this.user) {
                 options = options || {};
                 // options.withCredentials = true;
                 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
@@ -19080,6 +19094,20 @@ var NgwConnector = /** @class */ (function () {
                 }
             }
         });
+        if (options.signal &&
+            typeof options.signal.addEventListener === 'function') {
+            options.signal.addEventListener('abort', 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) {
@@ -19189,12 +19217,12 @@ function fetchNgwLayerItemExtent(_a) {
 function fetchNgwExtent(options) {
     return options.connector.getResource(options.resourceId).then(function (resource) {
         if (resource) {
-            return fetchNgwResourceExtent(resource, options.connector);
+            return fetchNgwResourceExtent(resource, options.connector, options);
         }
     });
 }
 /** @deprecated use {@link fetchNgwExtent} instead */
-function fetchNgwResourceExtent(item, connector) {
+function fetchNgwResourceExtent(item, connector, options) {
     if (item.webmap) {
         return CancelablePromise.resolve(getNgwWebmapExtent(item.webmap));
     }
@@ -19203,15 +19231,12 @@ function fetchNgwResourceExtent(item, connector) {
         if (resource.cls && resource.cls.indexOf('style') !== -1) {
             return connector.getResource(resource.parent.id).then(function (res) {
                 if (res) {
-                    return fetchNgwLayerExtent({
-                        resourceId: res.resource.id,
-                        connector: connector,
-                    });
+                    return fetchNgwLayerExtent(__assign(__assign({}, options), { resourceId: res.resource.id, connector: connector }));
                 }
             });
         }
         else {
-            return fetchNgwLayerExtent({ resourceId: resource.id, connector: connector });
+            return fetchNgwLayerExtent(__assign(__assign({}, options), { resourceId: resource.id, connector: connector }));
         }
     }
 }
@@ -19382,7 +19407,7 @@ function createWktFromCoordArray(coord) {
 }
 function fetchNgwLayerItemsRequest(options) {
     var params = __assign({}, FEATURE_REQUEST_PARAMS);
-    var limit = options.limit, offset = options.offset, orderBy = options.orderBy, paramList = options.paramList, connector = options.connector, intersects = options.intersects, resourceId = options.resourceId;
+    var limit = options.limit, cache = options.cache, signal = options.signal, offset = options.offset, orderBy = options.orderBy, paramList = options.paramList, connector = options.connector, intersects = options.intersects, resourceId = options.resourceId;
     if (limit) {
         if (limit !== Number.POSITIVE_INFINITY) {
             params.limit = limit;
@@ -19412,11 +19437,10 @@ function fetchNgwLayerItemsRequest(options) {
         params.paramList = paramList;
     }
     var reqParams = __assign({ id: resourceId }, params);
-    return connector.get('feature_layer.feature.collection', { cache: options.cache }, reqParams);
+    return connector.get('feature_layer.feature.collection', { cache: cache, signal: signal }, reqParams);
 }
 
 function prepareNgwFieldsToPropertiesFilter(fields) {
-    console.log(fields);
     var f;
     var _loop_1 = function () {
         var field = fields[f];
@@ -21425,7 +21449,7 @@ var NgwResource = /** @class */ (function () {
             });
         });
     };
-    NgwResource.prototype.getBounds = function () {
+    NgwResource.prototype.getBounds = function (options) {
         return __awaiter(this, void 0, void 0, function () {
             var _a;
             return __generator(this, function (_b) {
@@ -21436,7 +21460,7 @@ var NgwResource = /** @class */ (function () {
                         }
                         if (!this.item) return [3 /*break*/, 2];
                         _a = this;
-                        return [4 /*yield*/, fetchNgwResourceExtent(this.item, this.connector)];
+                        return [4 /*yield*/, fetchNgwResourceExtent(this.item, this.connector, options)];
                     case 1:
                         _a._extent = _b.sent();
                         return [2 /*return*/, this._extent];
@@ -22078,7 +22102,7 @@ function createParamsFromFeatures(features, resourceId, multiple) {
     return featureParams;
 }
 function fetchIdentifyGeoJson(options) {
-    var connector = options.connector, identify = options.identify;
+    var connector = options.connector, identify = options.identify, requestOptions = options.requestOptions;
     for (var l in identify) {
         var id = Number(l);
         if (!isNaN(id)) {
@@ -22094,7 +22118,7 @@ function fetchIdentifyGeoJson(options) {
     }
     var params = getIdentifyItems(identify);
     if (params && params.length) {
-        return fetchNgwLayerFeature(__assign({ connector: connector }, params[0]));
+        return fetchNgwLayerFeature(__assign(__assign(__assign({}, requestOptions), { connector: connector }), params[0]));
     }
     return CancelablePromise.resolve(undefined);
 }
@@ -22107,21 +22131,25 @@ function fetchIdentifyItem(options) {
     return CancelablePromise.resolve(undefined);
 }
 function featureLayerIdentify(options) {
-    var g = options.geom;
-    var geom = [];
-    if (Array.isArray(g)) {
-        geom = g;
+    var geom = options.geom, signal = options.signal, cache = options.cache;
+    var geom_ = [];
+    if (Array.isArray(geom)) {
+        geom_ = geom;
     }
     else {
-        var polygon = g.type === 'Feature' ? g.geometry : g.type === 'Polygon' ? g : false;
+        var polygon = geom.type === 'Feature'
+            ? geom.geometry
+            : geom.type === 'Polygon'
+                ? geom
+                : false;
         if (polygon) {
-            geom = polygon.coordinates[0];
+            geom_ = polygon.coordinates[0];
         }
     }
-    if (geom) {
+    if (geom_) {
         // create wkt string
         var polygonStr = [];
-        for (var _i = 0, geom_1 = geom; _i < geom_1.length; _i++) {
+        for (var _i = 0, geom_1 = geom_; _i < geom_1.length; _i++) {
             var _a = geom_1[_i], lng = _a[0], lat = _a[1];
             var _b = degrees2meters(lng, lat), x = _b[0], y = _b[1];
             polygonStr.push(x + ' ' + y);
@@ -22133,18 +22161,22 @@ function featureLayerIdentify(options) {
             srs: 3857,
             layers: layers,
         };
-        return options.connector.post('feature_layer.identify', { data: data });
+        return options.connector.post('feature_layer.identify', {
+            data: data,
+            signal: signal,
+            cache: cache,
+        });
     }
     else {
         throw new Error('Not valid geometry format to make intersection');
     }
 }
 function sendIdentifyRequest(ev, options) {
-    var _a;
     deprecatedMapClick(ev);
-    var _b = ev.lngLat, lng = _b[0], lat = _b[1];
-    var geom = (_a = options.geom) !== null && _a !== void 0 ? _a : getCirclePolygonCoordinates(lng, lat, options.radius);
-    return featureLayerIdentify(__assign(__assign({}, options), { geom: geom }));
+    var _a = ev.lngLat, lng = _a[0], lat = _a[1];
+    var geom = options.geom, radius = options.radius, signal = options.signal, cache = options.cache;
+    var geom_ = geom !== null && geom !== void 0 ? geom : getCirclePolygonCoordinates(lng, lat, radius);
+    return featureLayerIdentify(__assign(__assign({}, options), { geom: geom_, signal: signal, cache: cache }));
 }
 function createIdentifyItem(opt) {
     return new IdentifyItem(opt);
@@ -24320,7 +24352,9 @@ var LeafletMapAdapter = /** @class */ (function () {
         this.options = __assign({}, options);
         if (this.options.target) {
             var _a = this.options, zoom = _a.zoom, center = _a.center, maxZoom = _a.maxZoom, minZoom = _a.minZoom, mb = _a.maxBounds, mapAdapterOptions = _a.mapAdapterOptions;
-            this.map = new leafletSrc.exports.Map(this.options.target, __assign({ attributionControl: false, zoomControl: false, maxBounds: mb ? arrayToBoundsExpression(mb) : undefined, maxZoom: maxZoom, minZoom: minZoom, center: center && [center[1], center[0]], zoom: zoom }, mapAdapterOptions));
+            this.map =
+                this.options.map ||
+                    new leafletSrc.exports.Map(this.options.target, __assign({ attributionControl: false, zoomControl: false, maxBounds: mb ? arrayToBoundsExpression(mb) : undefined, maxZoom: maxZoom, minZoom: minZoom, center: center && [center[1], center[0]], zoom: zoom }, mapAdapterOptions));
             // create default pane
             var defPane = this.map.createPane('order-0');
             this.map._addUnselectCb = function (def) {