@nextgis/ngw-map 1.18.15 → 1.18.21

package/lib/ngw-map.global.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.18.15; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.18.21; author: NextGIS */
 var NgwMap = (function (exports) {
     'use strict';
 
@@ -1241,26 +1241,6 @@ var NgwMap = (function (exports) {
         return radius;
     }
 
-    /**
-     * Copy the values of all of the enumerable own properties from one or more source objects to a
-     * target object. Returns the target object.
-     * @param target - The target object to copy to.
-     * @param sources - One or more source objects from which to copy properties
-     */
-    function objectAssign(target) {
-        var sources = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            sources[_i - 1] = arguments[_i];
-        }
-        for (var _a = 0, sources_1 = sources; _a < sources_1.length; _a++) {
-            var source = sources_1[_a];
-            for (var _b = 0, _c = Object.getOwnPropertyNames(source); _b < _c.length; _b++) {
-                var prop = _c[_b];
-                target[prop] = source[prop];
-            }
-        }
-    }
-
     function isEqual(a, b, o, p) {
         if (a instanceof Array) {
             if (!(b instanceof Array))
@@ -7373,50 +7353,12 @@ var NgwMap = (function (exports) {
             });
         };
         NgwWebmapItem.prototype.initItem = function (item) {
-            var _this = this;
-            var i = item;
-            var options = this.getItemOptions(item);
-            var setNewLayer = function (l) {
-                i._layer = l;
-                _this.layer = l;
-                var enabled = _this.properties.get('visibility');
-                if (enabled) {
-                    _this.properties.set('visibility', true);
-                }
-                if (options.opacity !== undefined) {
-                    _this.webMap.setLayerOpacity(l, options.opacity);
-                }
-            };
             if (item.item_type === 'group' || item.item_type === 'root') {
-                if (item.children && item.children.length) {
-                    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();
+                return this.initGroupItem(item);
             }
             else {
-                var adapter = void 0;
-                if (item.item_type === 'layer') {
-                    adapter = item.adapter || item.layer_adapter.toUpperCase();
-                }
-                else if (NgwWebmapItem.GetAdapterFromLayerType[item.item_type]) {
-                    var getAdapter = NgwWebmapItem.GetAdapterFromLayerType[item.item_type];
-                    adapter = getAdapter(item, options, this.webMap, this.connector);
-                }
-                if (adapter) {
-                    return this.webMap.addLayer(adapter, options).then(function (newLayer) {
-                        setNewLayer(newLayer);
-                    });
-                }
-            }
-            if (item._layer) {
-                return Promise.resolve(setNewLayer(item._layer));
+                return this.initLayerItem(item);
             }
-            return Promise.reject('No layer added');
         };
         NgwWebmapItem.prototype.bringToFront = function () {
             //
@@ -7452,7 +7394,7 @@ var NgwMap = (function (exports) {
             }
             if (item.item_type === 'layer') {
                 var maxZoom = (_a = this._getZoomRange(item), _a.maxZoom), minZoom = _a.minZoom;
-                objectAssign(options, {
+                Object.assign(options, {
                     updateWmsParams: item.updateWmsParams,
                     url: item.url,
                     headers: this.options.headers,
@@ -7461,6 +7403,7 @@ var NgwMap = (function (exports) {
                     minZoom: minZoom,
                     minScale: item.layer_min_scale_denom,
                     maxScale: item.layer_max_scale_denom,
+                    interactive: item.layer_identifiable,
                 });
             }
             if (opacity !== undefined) {
@@ -7474,6 +7417,49 @@ var NgwMap = (function (exports) {
         NgwWebmapItem.prototype._mapScaleToZoomLevel = function (scale) {
             return setScaleRatio(scale);
         };
+        NgwWebmapItem.prototype.initGroupItem = function (group) {
+            if (group.children && group.children.length) {
+                var children = this.getChildren(group);
+                for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
+                    var child = children_1[_i];
+                    var childItem = new this.constructor(this.webMap, child, this.options, this.connector, this);
+                    this.tree.addChild(childItem);
+                }
+            }
+            return Promise.resolve();
+        };
+        NgwWebmapItem.prototype.initLayerItem = function (layer) {
+            var _this = this;
+            var options = this.getItemOptions(layer);
+            var setNewLayer = function (l) {
+                layer._layer = l;
+                _this.layer = l;
+                var enabled = _this.properties.get('visibility');
+                if (enabled) {
+                    _this.properties.set('visibility', true);
+                }
+                if (options.opacity !== undefined) {
+                    _this.webMap.setLayerOpacity(l, options.opacity);
+                }
+            };
+            var adapter;
+            if (layer.item_type === 'layer') {
+                adapter = layer.adapter || layer.layer_adapter.toUpperCase();
+            }
+            else if (NgwWebmapItem.GetAdapterFromLayerType[layer.item_type]) {
+                var getAdapter = NgwWebmapItem.GetAdapterFromLayerType[layer.item_type];
+                adapter = getAdapter(layer, options, this.webMap, this.connector);
+            }
+            if (adapter) {
+                return this.webMap.addLayer(adapter, options).then(function (newLayer) {
+                    setNewLayer(newLayer);
+                });
+            }
+            if (layer._layer) {
+                return Promise.resolve(setNewLayer(layer._layer));
+            }
+            return Promise.reject('No layer added');
+        };
         NgwWebmapItem.prototype._getZoomRange = function (item) {
             var minZoomWebmap = this.options.minZoom;
             var maxZoomWebmap = this.options.maxZoom;
@@ -7497,8 +7483,8 @@ var NgwMap = (function (exports) {
         };
         NgwWebmapItem.prototype._sumUp = function (children, totalValue) {
             if (totalValue === void 0) { totalValue = 0; }
-            for (var _i = 0, children_3 = children; _i < children_3.length; _i++) {
-                var child = children_3[_i];
+            for (var _i = 0, children_2 = children; _i < children_2.length; _i++) {
+                var child = children_2[_i];
                 if (child.item_type === 'layer') {
                     totalValue += 1;
                     child.draw_order_position = child.draw_order_position || totalValue;
@@ -7936,7 +7922,9 @@ var NgwMap = (function (exports) {
                                 deps.forEach(function (x) {
                                     var item = x.item;
                                     var parentId = item.parentId;
-                                    if (parentId !== undefined && item.item_type === 'layer') {
+                                    if (parentId !== undefined &&
+                                        item.item_type === 'layer' &&
+                                        item.layer_identifiable) {
                                         var visible = x.properties.property('visibility');
                                         var isVisible = visible.get() && !visible.isBlocked();
                                         if (isVisible) {
@@ -9520,11 +9508,12 @@ var NgwMap = (function (exports) {
             });
         };
         NgwMap.prototype.selectFromNgwRaster = function (ev) {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var promises, layers, _i, layers_1, l, layer, identFunc, getIdsPromise, getIds, ids, _a, getIds_1, x, pixelRadius, center, zoom, radius, selectPromise;
+                var promises, layers, _i, layers_1, l, layer, identFunc, interactive, getIdsPromise, getIds, ids, _b, getIds_1, x, pixelRadius, center, zoom, radius, selectPromise;
                 var _this = this;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
                         case 0:
                             this._emitStatusEvent('ngw:preselect');
                             promises = [];
@@ -9541,17 +9530,21 @@ var NgwMap = (function (exports) {
                                 identFunc = typeof layer.getIdentificationIds === 'function'
                                     ? layer.getIdentificationIds
                                     : false;
-                                if (identFunc && layer.options.selectable && this.isLayerVisible(layer)) {
+                                interactive = (_a = layer.options.interactive) !== null && _a !== void 0 ? _a : true;
+                                if (identFunc &&
+                                    layer.options.selectable &&
+                                    interactive &&
+                                    this.isLayerVisible(layer)) {
                                     promises.push(identFunc.call(layer));
                                 }
                             }
                             getIdsPromise = Promise.all(promises);
                             return [4 /*yield*/, getIdsPromise];
                         case 1:
-                            getIds = _b.sent();
+                            getIds = _c.sent();
                             ids = [];
-                            for (_a = 0, getIds_1 = getIds; _a < getIds_1.length; _a++) {
-                                x = getIds_1[_a];
+                            for (_b = 0, getIds_1 = getIds; _b < getIds_1.length; _b++) {
+                                x = getIds_1[_b];
                                 if (x) {
                                     ids.push.apply(ids, x);
                                 }