feat: opacity factor (DHIS2-11969) (#435)

dhis2 · Feb 24, 2022 · c50206d · c50206d
1 parent 8634808
commit c50206d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/src/layers/GeoJson.js b/src/layers/GeoJson.js
@@ -20,14 +20,23 @@ class GeoJson extends Layer {
 
     createLayers() {
         const id = this.getId()
+
         const {
             style = {},
             buffer,
             bufferStyle,
             label,
             labelStyle,
         } = this.options
-        const { radius, color, strokeColor, weight: width } = style
+
+        const {
+            radius,
+            color,
+            strokeColor,
+            weight: width,
+            opacityFactor,
+        } = style
+
         const isInteractive = true
 
         if (buffer) {
@@ -37,17 +46,14 @@ class GeoJson extends Layer {
 
         this.addLayer(polygonLayer({ id, color }), {
             isInteractive,
+            opacityFactor,
         })
         this.addLayer(outlineLayer({ id, color: strokeColor, width }))
-        this.addLayer(lineLayer({ id, color, width }), {
-            isInteractive,
-        })
+        this.addLayer(lineLayer({ id, color, width }), { isInteractive })
         this.addLayer(pointLayer({ id, color, strokeColor, width, radius }), {
             isInteractive,
         })
-        this.addLayer(symbolLayer({ id }), {
-            isInteractive,
-        })
+        this.addLayer(symbolLayer({ id }), { isInteractive })
 
         if (label) {
             this.addLayer(labelLayer({ id, label, ...labelStyle }))

diff --git a/src/layers/Layer.js b/src/layers/Layer.js
@@ -188,13 +188,17 @@ class Layer extends Evented {
     }
 
     addLayer(layer, layerOptions = {}) {
-        const { isInteractive } = layerOptions
+        const { isInteractive, opacityFactor } = layerOptions
 
         this._layers.push(layer)
 
         if (isInteractive) {
             this._interactiveIds.push(layer.id)
         }
+
+        if (opacityFactor) {
+            this._opacityFactor = opacityFactor
+        }
     }
 
     getLayers() {
@@ -268,8 +272,11 @@ class Layer extends Evented {
     setOpacity(opacity) {
         const mapgl = this.getMapGL()
 
+        const opacityFactor =
+            this._opacityFactor !== undefined ? this._opacityFactor : 1
+
         if (mapgl) {
-            setLayersOpacity(mapgl, this.getId(), opacity)
+            setLayersOpacity(mapgl, this.getId(), opacity * opacityFactor)
         }
 
         this.options.opacity = opacity