@nextgis/ngw-map 1.18.12 → 1.18.21

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.18.12; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.18.21; author: NextGIS */
 var events = {exports: {}};
 
 var R = typeof Reflect === 'object' ? Reflect : null;
@@ -1074,20 +1074,6 @@ function getIdentifyRadius(center, zoom, pixelRadius) {
     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, ...sources) {
-    for (const source of sources) {
-        for (const prop of Object.getOwnPropertyNames(source)) {
-            target[prop] = source[prop];
-        }
-    }
-}
-
 function isEqual(a, b, o, p) {
     if (a instanceof Array) {
         if (!(b instanceof Array))
@@ -6722,48 +6708,12 @@ class NgwWebmapItem extends Item {
         return ngwWebmapItem;
     }
     initItem(item) {
-        const i = item;
-        const options = this.getItemOptions(item);
-        const setNewLayer = (l) => {
-            i._layer = l;
-            this.layer = l;
-            const 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) {
-                const children = this.getChildren(item);
-                for (const x of children) {
-                    const children = new this.constructor(this.webMap, x, this.options, this.connector, this);
-                    this.tree.addChild(children);
-                }
-            }
-            return Promise.resolve();
+            return this.initGroupItem(item);
         }
         else {
-            let adapter;
-            if (item.item_type === 'layer') {
-                adapter = item.adapter || item.layer_adapter.toUpperCase();
-            }
-            else if (NgwWebmapItem.GetAdapterFromLayerType[item.item_type]) {
-                const getAdapter = NgwWebmapItem.GetAdapterFromLayerType[item.item_type];
-                adapter = getAdapter(item, options, this.webMap, this.connector);
-            }
-            if (adapter) {
-                return this.webMap.addLayer(adapter, options).then((newLayer) => {
-                    setNewLayer(newLayer);
-                });
-            }
-        }
-        if (item._layer) {
-            return Promise.resolve(setNewLayer(item._layer));
+            return this.initLayerItem(item);
         }
-        return Promise.reject('No layer added');
     }
     bringToFront() {
         //
@@ -6798,7 +6748,7 @@ class NgwWebmapItem extends Item {
         }
         if (item.item_type === 'layer') {
             const { maxZoom, minZoom } = this._getZoomRange(item);
-            objectAssign(options, {
+            Object.assign(options, {
                 updateWmsParams: item.updateWmsParams,
                 url: item.url,
                 headers: this.options.headers,
@@ -6807,6 +6757,7 @@ class NgwWebmapItem extends Item {
                 minZoom,
                 minScale: item.layer_min_scale_denom,
                 maxScale: item.layer_max_scale_denom,
+                interactive: item.layer_identifiable,
             });
         }
         if (opacity !== undefined) {
@@ -6820,6 +6771,47 @@ class NgwWebmapItem extends Item {
     _mapScaleToZoomLevel(scale) {
         return setScaleRatio(scale);
     }
+    initGroupItem(group) {
+        if (group.children && group.children.length) {
+            const children = this.getChildren(group);
+            for (const child of children) {
+                const childItem = new this.constructor(this.webMap, child, this.options, this.connector, this);
+                this.tree.addChild(childItem);
+            }
+        }
+        return Promise.resolve();
+    }
+    initLayerItem(layer) {
+        const options = this.getItemOptions(layer);
+        const setNewLayer = (l) => {
+            layer._layer = l;
+            this.layer = l;
+            const enabled = this.properties.get('visibility');
+            if (enabled) {
+                this.properties.set('visibility', true);
+            }
+            if (options.opacity !== undefined) {
+                this.webMap.setLayerOpacity(l, options.opacity);
+            }
+        };
+        let adapter;
+        if (layer.item_type === 'layer') {
+            adapter = layer.adapter || layer.layer_adapter.toUpperCase();
+        }
+        else if (NgwWebmapItem.GetAdapterFromLayerType[layer.item_type]) {
+            const getAdapter = NgwWebmapItem.GetAdapterFromLayerType[layer.item_type];
+            adapter = getAdapter(layer, options, this.webMap, this.connector);
+        }
+        if (adapter) {
+            return this.webMap.addLayer(adapter, options).then((newLayer) => {
+                setNewLayer(newLayer);
+            });
+        }
+        if (layer._layer) {
+            return Promise.resolve(setNewLayer(layer._layer));
+        }
+        return Promise.reject('No layer added');
+    }
     _getZoomRange(item) {
         const minZoomWebmap = this.options.minZoom;
         const maxZoomWebmap = this.options.maxZoom;
@@ -7177,7 +7169,9 @@ class NgwWebmapLayerAdapter {
             deps.forEach((x) => {
                 const item = x.item;
                 const parentId = item.parentId;
-                if (parentId !== undefined && item.item_type === 'layer') {
+                if (parentId !== undefined &&
+                    item.item_type === 'layer' &&
+                    item.layer_identifiable) {
                     const visible = x.properties.property('visibility');
                     const isVisible = visible.get() && !visible.isBlocked();
                     if (isVisible) {
@@ -8588,6 +8582,7 @@ class NgwMap extends WebMap {
         });
     }
     async selectFromNgwRaster(ev) {
+        var _a;
         this._emitStatusEvent('ngw:preselect');
         const promises = [];
         const layers = Object.values(this._ngwLayers);
@@ -8602,7 +8597,11 @@ class NgwMap extends WebMap {
             const identFunc = typeof layer.getIdentificationIds === 'function'
                 ? layer.getIdentificationIds
                 : false;
-            if (identFunc && layer.options.selectable && this.isLayerVisible(layer)) {
+            const 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));
             }
         }