@nextgis/ngw-map 1.8.0 → 1.8.1

package/lib/ngw-map.cjs.js

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.8.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.8.1; author: NextGIS */
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });

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

@@ -1,4 +1,4 @@
-/** Bundle of @nextgis/ngw-map; version: 1.8.0; author: NextGIS */
+/** Bundle of @nextgis/ngw-map; version: 1.8.1; author: NextGIS */
 var events = {exports: {}};
 
 var R = typeof Reflect === 'object' ? Reflect : null;
@@ -5269,6 +5269,9 @@ class BaseProperty {
     getParent() {
         return this.item.tree.getParent();
     }
+    getChildren() {
+        return this.item.tree.getChildren();
+    }
     isGroup() {
         const children = this.item.tree.getDescendants();
         return children.length;
@@ -5383,6 +5386,24 @@ class CheckProperty extends BaseProperty {
                 return property && property.get();
             }));
     }
+    block(options) {
+        this._blocked = true;
+        this._block(options);
+    }
+    unBlock(options) {
+        this._blocked = false;
+        if (this.getValue()) {
+            this._unBlock(options);
+        }
+    }
+    blockChild(options) {
+        this.item.tree
+            .getDescendants()
+            .forEach((x) => this._blockChild(x, options));
+    }
+    unblockChild(options) {
+        this.item.tree.getChildren().forEach((x) => this._unBlockChild(x, options));
+    }
     _prepareValue(value) {
         return value;
     }
@@ -5404,30 +5425,12 @@ class CheckProperty extends BaseProperty {
             this.unblockChild(options);
         }
     }
-    block(options) {
-        this._blocked = true;
-        this._block(options);
-    }
     _block(options) {
         this._turnOff(options);
     }
-    unBlock(options) {
-        this._blocked = false;
-        if (this.getValue()) {
-            this._unBlock(options);
-        }
-    }
     _unBlock(options) {
         this._turnOn(options);
     }
-    blockChild(options) {
-        this.item.tree
-            .getDescendants()
-            .forEach((x) => this._blockChild(x, options));
-    }
-    unblockChild(options) {
-        this.item.tree.getChildren().forEach((x) => this._unBlockChild(x, options));
-    }
     _blockChild(item, options) {
         const prop = item.properties &&
             item.properties.property(this.name);
@@ -5485,22 +5488,22 @@ class ItemProperties {
     }
     _setPropertyHandler(propOpt) {
         const handlers = ItemProperties.handlers;
-        let handler = propOpt.handler;
-        if (!handler && propOpt.type) {
+        let 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) {
             const options = { ...(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);
         }
     }
@@ -5556,6 +5559,55 @@ class Item {
     }
 }
 
+class WebmapLayerOpacityPropertyHandler extends BaseProperty {
+    getProperty() {
+        const layer = this.item.layer;
+        if (layer) {
+            return layer && layer.options && layer.options.opacity !== undefined
+                ? layer.options.opacity
+                : 1;
+        }
+        return 1;
+    }
+    update(value, options) {
+        options = options || {};
+        if (this.isGroup()) {
+            this._value = this._prepareValue(value, options);
+            const children = this.getChildren();
+            for (const child of children) {
+                const property = child.properties.property(this.name);
+                if (property) {
+                    if (options.propagation) {
+                        property.set(value, options);
+                    }
+                    else {
+                        property.update(property.get(), options);
+                    }
+                }
+            }
+        }
+        const layer = this.item.layer;
+        if (layer) {
+            const parents = this.getParents();
+            const coef = parents.reduce((s, x) => {
+                const prop = x.properties.property(this.name);
+                const multiplier = prop ? prop.getValue() : 1;
+                return s * multiplier;
+            }, 1);
+            const val = value * coef;
+            this.item.webMap.setLayerOpacity(layer, this._prepareValue(val));
+        }
+    }
+    _prepareValue(value, options) {
+        if (options && options.propagation && this.isGroup()) {
+            return 1;
+        }
+        // value = Number(value);
+        // return value < 0.1 ? 0.1 : value;
+        return Number(value);
+    }
+}
+
 class NgwWebmapItem extends Item {
     constructor(webMap, item, options, connector, parent, noInit) {
         super({ ...NgwWebmapItem.options, ...options });
@@ -5637,6 +5689,9 @@ class NgwWebmapItem extends Item {
     fit() {
         if (this.item.item_type === 'layer') ;
     }
+    getLayer() {
+        return this.layer;
+    }
     getItemOptions(item) {
         const transparency = item.item_type === 'layer' && item.layer_transparency;
         const opacity = typeof transparency === 'number' ? (100 - transparency) / 100 : undefined;
@@ -5738,6 +5793,10 @@ NgwWebmapItem.options = {
                 }
             },
         },
+        {
+            name: 'opacity',
+            handler: WebmapLayerOpacityPropertyHandler,
+        },
     ],
 };
 
@@ -5924,14 +5983,19 @@ class NgwWebmapLayerAdapter {
         delete this.response;
         delete this._webmapLayersIds;
     }
-    showLayer() {
+    async showLayer() {
+        if (this.layer && this.layer.properties) {
+            return this.layer.properties.property('visibility').set(true);
+        }
+    }
+    async hideLayer() {
         if (this.layer && this.layer.properties) {
-            this.layer.properties.property('visibility').set(true);
+            return this.layer.properties.property('visibility').set(false);
         }
     }
-    hideLayer() {
+    async setOpacity(val) {
         if (this.layer && this.layer.properties) {
-            this.layer.properties.property('visibility').set(false);
+            return this.layer.properties.property('opacity').set(val);
         }
     }
     /** @deprecated use {@link NgwWebmapLayerAdapter.getBounds} instead */