setOpacity handles being called from constructor

maplibre · Feb 1, 2025 · d355854 · d355854
1 parent 081f961
commit d355854
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/src/ui/marker.ts b/src/ui/marker.ts
@@ -168,10 +168,7 @@ export class Marker extends Evented {
         this._rotation = options && options.rotation || 0;
         this._rotationAlignment = options && options.rotationAlignment || 'auto';
         this._pitchAlignment = options && options.pitchAlignment && options.pitchAlignment !== 'auto' ?  options.pitchAlignment : this._rotationAlignment;
-        this.setOpacity(); // set default opacity
-        if (options?.opacity !== undefined || options?.opacityWhenCovered !== undefined) {
-            this.setOpacity(options?.opacity, options?.opacityWhenCovered);
-        }
+        this.setOpacity(options?.opacity, options?.opacityWhenCovered);
 
         if (!options || !options.element) {
             this._defaultMarker = true;
@@ -859,17 +856,19 @@ export class Marker extends Evented {
      * @param opacityWhenCovered - Sets the `opacityWhenCovered` property of the marker.
      */
     setOpacity(opacity?: string, opacityWhenCovered?: string): this {
-        if (opacity === undefined && opacityWhenCovered === undefined) {
+        // Reset opacity when called without params or from constructor
+        if (this._opacity === undefined || (opacity === undefined && opacityWhenCovered === undefined)) {
             this._opacity = '1';
             this._opacityWhenCovered = '0.2';
-        } else {
-            if (opacity !== undefined) {
-                this._opacity = opacity;
-            }
-            if (opacityWhenCovered !== undefined) {
-                this._opacityWhenCovered = opacityWhenCovered;
-            }
         }
+
+        if (opacity !== undefined) {
+            this._opacity = opacity;
+        }
+        if (opacityWhenCovered !== undefined) {
+            this._opacityWhenCovered = opacityWhenCovered;
+        }
+
         if (this._map) {
             this._updateOpacity(true);
         }