@nextgis/ngw-map 1.14.0 → 1.16.0

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

@@ -1,5 +1,5 @@
-/** Bundle of @nextgis/ngw-map; version: 1.14.0; author: NextGIS */
-/*! *****************************************************************************
+/** Bundle of @nextgis/ngw-map; version: 1.16.0; author: NextGIS */
+/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -1522,6 +1522,24 @@ function createPropertiesPaint(propertiesPaint) {
         return mask;
     };
 }
+function expressionCallback(paint, defaultPaint, getPaintFunctions) {
+    var expressionCallback = createExpressionCallback(paint);
+    if (expressionCallback) {
+        var expressionPaintCb = function (feature) {
+            return preparePaint(expressionCallback(feature), defaultPaint, getPaintFunctions);
+        };
+        expressionPaintCb.paint = paint;
+        return expressionPaintCb;
+    }
+    var newPaint = __assign({}, defaultPaint);
+    newPaint = __assign(__assign({}, newPaint), paint);
+    newPaint.fill = newPaint.fill !== undefined ? newPaint.fill : true;
+    newPaint.stroke =
+        newPaint.stroke !== undefined
+            ? newPaint.stroke
+            : !newPaint.fill || !!(newPaint.strokeColor || newPaint.strokeOpacity);
+    return newPaint;
+}
 function preparePaint(paint, defaultPaint, getPaintFunctions) {
     if (!paint) {
         throw new Error('paint is empty');
@@ -1551,20 +1569,7 @@ function preparePaint(paint, defaultPaint, getPaintFunctions) {
         return paint;
     }
     else {
-        var expressionCallback_1 = createExpressionCallback(paint);
-        if (expressionCallback_1) {
-            var expressionPaintCb = function (feature) {
-                return preparePaint(expressionCallback_1(feature), defaultPaint, getPaintFunctions);
-            };
-            expressionPaintCb.paint = paint;
-            return expressionPaintCb;
-        }
-        newPaint = __assign(__assign({}, newPaint), paint);
-        newPaint.fill = newPaint.fill !== undefined ? newPaint.fill : true;
-        newPaint.stroke =
-            newPaint.stroke !== undefined
-                ? newPaint.stroke
-                : !newPaint.fill || !!(newPaint.strokeColor || newPaint.strokeOpacity);
+        newPaint = expressionCallback(paint, defaultPaint, getPaintFunctions);
     }
     if (isPaintCallback(newPaint)) {
         return newPaint;
@@ -4437,6 +4442,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 +4492,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 +4649,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 +4659,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 +4921,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 +5015,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 +5044,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);
@@ -6631,10 +6647,12 @@ var NgwWebmapItem = /** @class */ (function (_super) {
         };
         if (item.item_type === 'group' || item.item_type === 'root') {
             if (item.children && item.children.length) {
-                this.getChildren(item).forEach(function (x) {
-                    var children = new NgwWebmapItem(_this.webMap, x, _this.options, _this.connector, _this);
-                    _this.tree.addChild(children);
-                });
+                var children = this.getChildren(item);
+                for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
+                    var x = children_1[_i];
+                    var children_2 = new this.constructor(this.webMap, x, this.options, this.connector, this);
+                    this.tree.addChild(children_2);
+                }
             }
             return Promise.resolve();
         }
@@ -6675,7 +6693,7 @@ var NgwWebmapItem = /** @class */ (function (_super) {
             headers: this.options.headers,
             crossOrigin: this.options.crossOrigin,
             setViewDelay: this.options.setViewDelay,
-            params: { resource: this.item.resourceId },
+            params: { resource: this.item.resourceId, item: this.item },
         };
         if (this.options.order) {
             var subOrder = this.options.drawOrderEnabled && 'draw_order_position' in item
@@ -6686,6 +6704,9 @@ var NgwWebmapItem = /** @class */ (function (_super) {
             var subLevel = String(subOrder).padStart(4, '0');
             options.order = Number((this.options.order | 0) + '.' + subLevel);
         }
+        if (this.options.popupOptions) {
+            options.popupOptions = this.options.popupOptions;
+        }
         if (item.item_type === 'layer') {
             var _a = this._getZoomRange(item), maxZoom = _a.maxZoom, minZoom = _a.minZoom;
             objectAssign(options, {
@@ -6733,8 +6754,8 @@ var NgwWebmapItem = /** @class */ (function (_super) {
     };
     NgwWebmapItem.prototype._sumUp = function (children, totalValue) {
         if (totalValue === void 0) { totalValue = 0; }
-        for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
-            var child = children_1[_i];
+        for (var _i = 0, children_3 = children; _i < children_3.length; _i++) {
+            var child = children_3[_i];
             if (child.item_type === 'layer') {
                 totalValue += 1;
                 child.draw_order_position = child.draw_order_position || totalValue;
@@ -7041,8 +7062,6 @@ var NgwWebmapLayerAdapter = /** @class */ (function () {
                             this._extent &&
                             extentConstrained) {
                             this.options.webMap.setView({ maxBounds: this._extent });
-                            // @ts-ignore
-                            window.webmap = this.options.webMap;
                         }
                         return [2 /*return*/, this.layer];
                 }
@@ -7215,6 +7234,7 @@ var NgwWebmapLayerAdapter = /** @class */ (function () {
                                     options.minZoom = _this.options.minZoom;
                                     options.maxZoom = _this.options.maxZoom;
                                     options.drawOrderEnabled = webmap_1.draw_order_enabled;
+                                    options.popupOptions = _this.options.popupOptions;
                                     var layer = new _this.NgwWebmapItem(_this.options.webMap, webmap_1.root_item, options, _this.options.connector);
                                     layer.emitter.on('init', function () { return resolve(layer); });
                                 })];
@@ -7345,30 +7365,34 @@ var NgwWebmapLayerAdapter = /** @class */ (function () {
     };
     NgwWebmapLayerAdapter.prototype._getWebMapIds = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var webMapItem, layers, promises_1, ids;
-            var _this = this;
+            var webMapItem, layers, promises, _loop_2, this_2, _i, layers_1, x, ids;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         webMapItem = this.layer;
                         if (!(webMapItem && webMapItem.item.item_type === 'root')) return [3 /*break*/, 2];
                         layers = webMapItem.tree.getDescendants();
-                        promises_1 = [];
-                        layers.forEach(function (x) {
+                        promises = [];
+                        _loop_2 = function (x) {
                             var item = x.item;
                             if (item.item_type === 'layer') {
                                 var id = item.layer_style_id;
-                                var promise = _this.options.connector.getResource(id).then(function (y) {
+                                var promise = this_2.options.connector.getResource(id).then(function (y) {
                                     if (y) {
                                         var parentId = Number(y.resource.parent.id);
                                         item.parentId = parentId;
                                         return parentId;
                                     }
                                 });
-                                promises_1.push(promise);
+                                promises.push(promise);
                             }
-                        });
-                        return [4 /*yield*/, Promise.all(promises_1)];
+                        };
+                        this_2 = this;
+                        for (_i = 0, layers_1 = layers; _i < layers_1.length; _i++) {
+                            x = layers_1[_i];
+                            _loop_2(x);
+                        }
+                        return [4 /*yield*/, Promise.all(promises)];
                     case 1:
                         ids = _a.sent();
                         return [2 /*return*/, ids.filter(function (x) { return x !== undefined; })];
@@ -7784,10 +7808,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));