@nextgis/ngw-map 1.6.0 → 1.8.2

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.6.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.8.2; author: NextGIS */
 var NgwMap = (function (exports) {
     'use strict';
 
@@ -2416,13 +2416,14 @@ var NgwMap = (function (exports) {
          */
         WebMapLayers.prototype.fitLayer = function (layerDef, options) {
             return __awaiter(this, void 0, void 0, function () {
-                var layer, extent;
+                var layer, getBounds, extent;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             layer = this.getLayer(layerDef);
-                            if (!(layer && layer.getExtent)) return [3 /*break*/, 2];
-                            return [4 /*yield*/, layer.getExtent()];
+                            getBounds = layer && (layer.getBounds || layer.getExtent);
+                            if (!getBounds) return [3 /*break*/, 2];
+                            return [4 /*yield*/, getBounds.call(layer)];
                         case 1:
                             extent = _a.sent();
                             if (extent) {
@@ -2546,7 +2547,7 @@ var NgwMap = (function (exports) {
             var _a, _b;
             if (options === void 0) { options = {}; }
             return __awaiter(this, void 0, void 0, function () {
-                var id, _order, adapterEngine, geoJsonOptions, _c, maxZoom, minZoom, visibility, modified, _adapter, layerId, layer, opacity, extent;
+                var id, _order, adapterEngine, geoJsonOptions, _c, maxZoom, minZoom, visibility, modified, _adapter, layerId, layer, opacity, getBounds, extent;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -2649,8 +2650,9 @@ var NgwMap = (function (exports) {
                             if (opacity !== undefined && opacity <= 1) {
                                 this.setLayerOpacity(_adapter, opacity);
                             }
-                            if (!(options.fit && _adapter.getExtent)) return [3 /*break*/, 11];
-                            return [4 /*yield*/, _adapter.getExtent()];
+                            getBounds = layer && (_adapter.getBounds || _adapter.getExtent);
+                            if (!(options.fit && getBounds)) return [3 /*break*/, 11];
+                            return [4 /*yield*/, getBounds.call(_adapter)];
                         case 9:
                             extent = _d.sent();
                             if (!extent) return [3 /*break*/, 11];
@@ -2838,7 +2840,7 @@ var NgwMap = (function (exports) {
             var toStatus = status !== undefined ? status : !onMap;
             var silent = options.silent !== undefined ? options.silent : false;
             var action = function (l) { return __awaiter(_this, void 0, void 0, function () {
-                var id, preEventName, eventName, order, anotherVisibleLayerBaseLayer;
+                var id, preEventName, eventName, order, anotherVisibleBaselayers, _i, anotherVisibleBaselayers_1, bl;
                 var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -2850,18 +2852,25 @@ var NgwMap = (function (exports) {
                                 this._emitLayerEvent(preEventName, id, l);
                                 this._emitLayerEvent('layer:pretoggle', id, l);
                             }
-                            if (!(toStatus && this.mapAdapter)) return [3 /*break*/, 3];
+                            if (!(toStatus && this.mapAdapter)) return [3 /*break*/, 5];
                             order = l.options.baselayer ? 0 : l.options.order;
-                            if (!(l.options.baselayer && this._baselayers.length)) return [3 /*break*/, 2];
-                            anotherVisibleLayerBaseLayer = this._baselayers.find(function (x) {
+                            if (!(l.options.baselayer && this._baselayers.length)) return [3 /*break*/, 4];
+                            anotherVisibleBaselayers = this._baselayers.filter(function (x) {
                                 return x !== l.id && _this.isLayerVisible(x);
                             });
-                            if (!anotherVisibleLayerBaseLayer) return [3 /*break*/, 2];
-                            return [4 /*yield*/, this.hideLayer(anotherVisibleLayerBaseLayer)];
+                            _i = 0, anotherVisibleBaselayers_1 = anotherVisibleBaselayers;
+                            _a.label = 1;
                         case 1:
-                            _a.sent();
-                            _a.label = 2;
+                            if (!(_i < anotherVisibleBaselayers_1.length)) return [3 /*break*/, 4];
+                            bl = anotherVisibleBaselayers_1[_i];
+                            return [4 /*yield*/, this.hideLayer(bl)];
                         case 2:
+                            _a.sent();
+                            _a.label = 3;
+                        case 3:
+                            _i++;
+                            return [3 /*break*/, 1];
+                        case 4:
                             if (l.showLayer) {
                                 l.showLayer.call(l, l.layer);
                             }
@@ -2871,16 +2880,16 @@ var NgwMap = (function (exports) {
                             if (order !== undefined) {
                                 this.mapAdapter.setLayerOrder(l.layer, order, this._layers);
                             }
-                            return [3 /*break*/, 4];
-                        case 3:
+                            return [3 /*break*/, 6];
+                        case 5:
                             if (l.hideLayer) {
                                 l.hideLayer.call(l, l.layer);
                             }
                             else if (l.layer !== undefined) {
                                 this.mapAdapter.hideLayer(l.layer);
                             }
-                            _a.label = 4;
-                        case 4:
+                            _a.label = 6;
+                        case 6:
                             if (!silent) {
                                 this._emitLayerEvent(eventName, id, l);
                                 this._emitLayerEvent('layer:toggle', id, l);
@@ -2896,16 +2905,19 @@ var NgwMap = (function (exports) {
             return Promise.resolve();
         };
         WebMapLayers.prototype.updateLayer = function (layerDef) {
+            var _this = this;
             var layer = this.getLayer(layerDef);
             if (layer) {
                 if (layer.updateLayer) {
-                    layer.updateLayer();
+                    return Promise.resolve(layer.updateLayer());
                 }
                 else if (this.isLayerVisible(layer)) {
-                    this.hideLayer(layer, { silent: true });
-                    this.showLayer(layer, { silent: true });
+                    return this.hideLayer(layer, { silent: true }).then(function () {
+                        return _this.showLayer(layer, { silent: true });
+                    });
                 }
             }
+            return Promise.resolve();
         };
         /**
          * Set transparency for a given layer by number from 0 to 1
@@ -4861,6 +4873,18 @@ var NgwMap = (function (exports) {
             }
         });
     }
+    function fetchNgwLayerItemExtent(_a) {
+        var resourceId = _a.resourceId, featureId = _a.featureId, connector = _a.connector, _b = _a.cache, cache = _b === void 0 ? true : _b;
+        return connector
+            .get('feature_layer.feature.item_extent', { cache: cache }, { id: resourceId, fid: featureId })
+            .then(function (resp) {
+            if (resp) {
+                var _a = resp.extent, maxLat = _a.maxLat, maxLon = _a.maxLon, minLat = _a.minLat, minLon = _a.minLon;
+                var extentArray = [minLon, minLat, maxLon, maxLat];
+                return extentArray;
+            }
+        });
+    }
     function fetchNgwResourceExtent(item, connector) {
         if (item.webmap) {
             return CancelablePromise.resolve(getNgwWebmapExtent(item.webmap));
@@ -4973,7 +4997,7 @@ var NgwMap = (function (exports) {
         if (logic === 'any') {
             filters_.forEach(function (f) {
                 if (checkIfPropertyFilter(f)) {
-                    _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams), [createParam(f)]) })));
+                    _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), [createParam(f)]) })));
                 }
                 else {
                     createFeatureFieldFilterQueries(__assign(__assign({}, opt), { filters: f }), _queries, __spreadArray([], _parentAllParams));
@@ -4995,11 +5019,11 @@ var NgwMap = (function (exports) {
             if (propertiesFilterList.length) {
                 for (var _a = 0, propertiesFilterList_1 = propertiesFilterList; _a < propertiesFilterList_1.length; _a++) {
                     var x = propertiesFilterList_1[_a];
-                    createFeatureFieldFilterQueries(__assign(__assign({}, opt), { filters: x }), _queries, __spreadArray(__spreadArray([], _parentAllParams), filters_2));
+                    createFeatureFieldFilterQueries(__assign(__assign({}, opt), { filters: x }), _queries, __spreadArray(__spreadArray([], _parentAllParams, true), filters_2));
                 }
             }
             else {
-                _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams), filters_2) })));
+                _queries.push(fetchNgwLayerItemsRequest(__assign(__assign({}, opt), { paramList: __spreadArray(__spreadArray([], _parentAllParams, true), filters_2) })));
             }
         }
         return CancelablePromise.all(_queries).then(function (itemsParts) {
@@ -5222,16 +5246,26 @@ var NgwMap = (function (exports) {
                                     });
                                 });
                             };
+                            /** @deprecated use {@link NgwGeoJsonAdapter.getBounds} instead */
                             NgwGeoJsonAdapter.prototype.getExtent = function () {
-                                var hasData = this.getLayers && this.getLayers().length;
-                                if (this.options.strategy === 'BBOX' || hasData) {
-                                    return fetchNgwResourceExtent(item, connector);
-                                }
-                                else {
-                                    if (_super.prototype.getExtent) {
-                                        return _super.prototype.getExtent.call(this);
-                                    }
-                                }
+                                return this.getBounds();
+                            };
+                            NgwGeoJsonAdapter.prototype.getBounds = function () {
+                                return __awaiter(this, void 0, void 0, function () {
+                                    var hasData;
+                                    return __generator(this, function (_a) {
+                                        hasData = this.getLayers && this.getLayers().length;
+                                        if (this.options.strategy === 'BBOX' || hasData) {
+                                            return [2 /*return*/, fetchNgwResourceExtent(item, connector)];
+                                        }
+                                        else {
+                                            if (_super.prototype.getBounds) {
+                                                return [2 /*return*/, _super.prototype.getBounds.call(this)];
+                                            }
+                                        }
+                                        return [2 /*return*/];
+                                    });
+                                });
                             };
                             NgwGeoJsonAdapter.prototype.beforeRemove = function () {
                                 removed = true;
@@ -5772,6 +5806,9 @@ var NgwMap = (function (exports) {
         BaseProperty.prototype.getParent = function () {
             return this.item.tree.getParent();
         };
+        BaseProperty.prototype.getChildren = function () {
+            return this.item.tree.getChildren();
+        };
         BaseProperty.prototype.isGroup = function () {
             var children = this.item.tree.getDescendants();
             return children.length;
@@ -5892,6 +5929,26 @@ var NgwMap = (function (exports) {
                     return property && property.get();
                 }));
         };
+        CheckProperty.prototype.block = function (options) {
+            this._blocked = true;
+            this._block(options);
+        };
+        CheckProperty.prototype.unBlock = function (options) {
+            this._blocked = false;
+            if (this.getValue()) {
+                this._unBlock(options);
+            }
+        };
+        CheckProperty.prototype.blockChild = function (options) {
+            var _this = this;
+            this.item.tree
+                .getDescendants()
+                .forEach(function (x) { return _this._blockChild(x, options); });
+        };
+        CheckProperty.prototype.unblockChild = function (options) {
+            var _this = this;
+            this.item.tree.getChildren().forEach(function (x) { return _this._unBlockChild(x, options); });
+        };
         CheckProperty.prototype._prepareValue = function (value) {
             return value;
         };
@@ -5913,32 +5970,12 @@ var NgwMap = (function (exports) {
                 this.unblockChild(options);
             }
         };
-        CheckProperty.prototype.block = function (options) {
-            this._blocked = true;
-            this._block(options);
-        };
         CheckProperty.prototype._block = function (options) {
             this._turnOff(options);
         };
-        CheckProperty.prototype.unBlock = function (options) {
-            this._blocked = false;
-            if (this.getValue()) {
-                this._unBlock(options);
-            }
-        };
         CheckProperty.prototype._unBlock = function (options) {
             this._turnOn(options);
         };
-        CheckProperty.prototype.blockChild = function (options) {
-            var _this = this;
-            this.item.tree
-                .getDescendants()
-                .forEach(function (x) { return _this._blockChild(x, options); });
-        };
-        CheckProperty.prototype.unblockChild = function (options) {
-            var _this = this;
-            this.item.tree.getChildren().forEach(function (x) { return _this._unBlockChild(x, options); });
-        };
         CheckProperty.prototype._blockChild = function (item, options) {
             var prop = item.properties &&
                 item.properties.property(this.name);
@@ -5994,22 +6031,22 @@ var NgwMap = (function (exports) {
         };
         ItemProperties.prototype._setPropertyHandler = function (propOpt) {
             var handlers = ItemProperties.handlers;
-            var handler = propOpt.handler;
-            if (!handler && propOpt.type) {
+            var Handler = propOpt.handler;
+            if (!Handler && propOpt.type) {
                 switch (propOpt.type) {
                     case 'boolean':
-                        handler = handlers.CheckProperty;
+                        Handler = handlers.CheckProperty;
                         break;
                     case 'string':
-                        handler = handlers.BaseProperty;
+                        Handler = handlers.BaseProperty;
                         break;
                     default:
-                        handler = handlers.BaseProperty;
+                        Handler = handlers.BaseProperty;
                 }
             }
-            if (handler && propOpt.name) {
+            if (Handler && propOpt.name) {
                 var options = __assign({}, (propOpt || {}));
-                this._properties[propOpt.name] = new handler(propOpt.name, this.item, options);
+                this._properties[propOpt.name] = new Handler(propOpt.name, this.item, options);
                 this._propertiesList.push(propOpt.name);
             }
         };
@@ -6068,6 +6105,62 @@ var NgwMap = (function (exports) {
         return Item;
     }());
 
+    var WebmapLayerOpacityPropertyHandler = /** @class */ (function (_super) {
+        __extends(WebmapLayerOpacityPropertyHandler, _super);
+        function WebmapLayerOpacityPropertyHandler() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        WebmapLayerOpacityPropertyHandler.prototype.getProperty = function () {
+            var layer = this.item.layer;
+            if (layer) {
+                return layer && layer.options && layer.options.opacity !== undefined
+                    ? layer.options.opacity
+                    : 1;
+            }
+            return 1;
+        };
+        WebmapLayerOpacityPropertyHandler.prototype.update = function (value, options) {
+            var _this = this;
+            options = options || {};
+            if (this.isGroup()) {
+                this._value = this._prepareValue(value, options);
+                var children = this.getChildren();
+                for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
+                    var child = children_1[_i];
+                    var property = child.properties.property(this.name);
+                    if (property) {
+                        if (options.propagation) {
+                            property.set(value, options);
+                        }
+                        else {
+                            property.update(property.get(), options);
+                        }
+                    }
+                }
+            }
+            var layer = this.item.layer;
+            if (layer) {
+                var parents = this.getParents();
+                var coef = parents.reduce(function (s, x) {
+                    var prop = x.properties.property(_this.name);
+                    var multiplier = prop ? prop.getValue() : 1;
+                    return s * multiplier;
+                }, 1);
+                var val = value * coef;
+                this.item.webMap.setLayerOpacity(layer, this._prepareValue(val));
+            }
+        };
+        WebmapLayerOpacityPropertyHandler.prototype._prepareValue = function (value, options) {
+            if (options && options.propagation && this.isGroup()) {
+                return 1;
+            }
+            // value = Number(value);
+            // return value < 0.1 ? 0.1 : value;
+            return Number(value);
+        };
+        return WebmapLayerOpacityPropertyHandler;
+    }(BaseProperty));
+
     var NgwWebmapItem = /** @class */ (function (_super) {
         __extends(NgwWebmapItem, _super);
         function NgwWebmapItem(webMap, item, options, connector, parent, noInit) {
@@ -6162,6 +6255,9 @@ var NgwMap = (function (exports) {
         NgwWebmapItem.prototype.fit = function () {
             if (this.item.item_type === 'layer') ;
         };
+        NgwWebmapItem.prototype.getLayer = function () {
+            return this.layer;
+        };
         NgwWebmapItem.prototype.getItemOptions = function (item) {
             var transparency = item.item_type === 'layer' && item.layer_transparency;
             var opacity = typeof transparency === 'number' ? (100 - transparency) / 100 : undefined;
@@ -6265,6 +6361,10 @@ var NgwMap = (function (exports) {
                         }
                     },
                 },
+                {
+                    name: 'opacity',
+                    handler: WebmapLayerOpacityPropertyHandler,
+                },
             ],
         };
         return NgwWebmapItem;
@@ -6493,16 +6593,40 @@ var NgwMap = (function (exports) {
             delete this._webmapLayersIds;
         };
         NgwWebmapLayerAdapter.prototype.showLayer = function () {
-            if (this.layer && this.layer.properties) {
-                this.layer.properties.property('visibility').set(true);
-            }
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    if (this.layer && this.layer.properties) {
+                        return [2 /*return*/, this.layer.properties.property('visibility').set(true)];
+                    }
+                    return [2 /*return*/];
+                });
+            });
         };
         NgwWebmapLayerAdapter.prototype.hideLayer = function () {
-            if (this.layer && this.layer.properties) {
-                this.layer.properties.property('visibility').set(false);
-            }
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    if (this.layer && this.layer.properties) {
+                        return [2 /*return*/, this.layer.properties.property('visibility').set(false)];
+                    }
+                    return [2 /*return*/];
+                });
+            });
         };
+        NgwWebmapLayerAdapter.prototype.setOpacity = function (val) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    if (this.layer && this.layer.properties) {
+                        return [2 /*return*/, this.layer.properties.property('opacity').set(val)];
+                    }
+                    return [2 /*return*/];
+                });
+            });
+        };
+        /** @deprecated use {@link NgwWebmapLayerAdapter.getBounds} instead */
         NgwWebmapLayerAdapter.prototype.getExtent = function () {
+            return this.getBounds();
+        };
+        NgwWebmapLayerAdapter.prototype.getBounds = function () {
             var webmap = this.response && this.response.webmap;
             if (webmap) {
                 return getNgwWebmapExtent(webmap);
@@ -6782,7 +6906,15 @@ var NgwMap = (function (exports) {
     var NgwResource = /** @class */ (function () {
         function NgwResource() {
         }
+        /** @deprecated use {@link NgwResource.getBounds} instead */
         NgwResource.prototype.getExtent = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    return [2 /*return*/, this.getBounds()];
+                });
+            });
+        };
+        NgwResource.prototype.getBounds = function () {
             return __awaiter(this, void 0, void 0, function () {
                 var _a;
                 return __generator(this, function (_b) {
@@ -6793,7 +6925,7 @@ var NgwMap = (function (exports) {
                             }
                             if (!this.item) return [3 /*break*/, 2];
                             _a = this;
-                            return [4 /*yield*/, fetchNgwResourceExtent(this.item, this.connector).then()];
+                            return [4 /*yield*/, fetchNgwResourceExtent(this.item, this.connector)];
                         case 1:
                             _a._extent = _b.sent();
                             return [2 /*return*/, this._extent];
@@ -7300,11 +7432,11 @@ var NgwMap = (function (exports) {
         function IdentifyItem(options) {
             var f = options.feature;
             this.id = f.id;
+            this.geom = f.geom;
             this.label = f.label;
-            this.layerId = f.layerId;
             this.parent = f.parent;
             this.fields = f.fields;
-            this.geom = f.geom;
+            this.layerId = f.layerId;
             this.connector = options.connector;
         }
         IdentifyItem.prototype.identify = function (options) {
@@ -7330,6 +7462,16 @@ var NgwMap = (function (exports) {
                 return _this._resource.feature_layer;
             });
         };
+        IdentifyItem.prototype.getBounds = function () {
+            if (this._extent) {
+                return CancelablePromise.resolve(this._extent);
+            }
+            return fetchNgwLayerItemExtent({
+                connector: this.connector,
+                featureId: this.id,
+                resourceId: this.layerId,
+            });
+        };
         IdentifyItem.prototype.geojson = function () {
             var _this = this;
             if (this._geojson) {
@@ -7933,7 +8075,7 @@ var NgwMap = (function (exports) {
          */
         NgwMap.prototype.fitLayer = function (layerDef, options) {
             return __awaiter(this, void 0, void 0, function () {
-                var id, ngwLayer, extent, item, resourceId;
+                var id, ngwLayer, bounds, item, resourceId;
                 var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -7946,12 +8088,12 @@ var NgwMap = (function (exports) {
                             }
                             ngwLayer = id && this._ngwLayers[id];
                             if (!ngwLayer) return [3 /*break*/, 7];
-                            if (!ngwLayer.layer.getExtent) return [3 /*break*/, 2];
-                            return [4 /*yield*/, ngwLayer.layer.getExtent()];
+                            if (!ngwLayer.layer.getBounds) return [3 /*break*/, 2];
+                            return [4 /*yield*/, ngwLayer.layer.getBounds()];
                         case 1:
-                            extent = _a.sent();
-                            if (extent) {
-                                this.fitBounds(extent, options);
+                            bounds = _a.sent();
+                            if (bounds) {
+                                this.fitBounds(bounds, options);
                             }
                             return [3 /*break*/, 6];
                         case 2: