fix: test if opacity is realy undefined

geostyler · Oct 4, 2024 · 5d11f43 · 5d11f43
1 parent ff7268b
commit 5d11f43
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/SldStyleParser.ts b/src/SldStyleParser.ts
@@ -162,7 +162,11 @@ export const defaultTranslations: SldStyleParserTranslations = {
 
   },
 } as const;
-const isNil = (val: unknown) => val === undefined || val === null;
+
+/**
+ * @returns true if the provided value is null or undefined. Returns false otherwise.
+ */
+const isNil = (val: unknown): boolean => val === undefined || val === null;
 
 /**
  * This parser can be used with the GeoStyler.
@@ -808,7 +812,7 @@ export class SldStyleParser implements StyleParser<string> {
     }
 
     textSymbolizer.color = color ? color : '#000000';
-    textSymbolizer.opacity = opacity ? numberExpression(opacity) : 1;
+    textSymbolizer.opacity = isNil(opacity) ? 1 : numberExpression(opacity);
 
     const haloRadius = get(sldSymbolizer, 'Halo.Radius.#text');
     if (!isNil(haloRadius)) {
@@ -1181,7 +1185,7 @@ export class SldStyleParser implements StyleParser<string> {
         }
         const label = getAttribute(cm, 'label');
         let opacity = getAttribute(cm, 'opacity');
-        if (opacity) {
+        if (!isNil(opacity)) {
           opacity = numberExpression(opacity);
         }
         return {
@@ -1687,7 +1691,7 @@ export class SldStyleParser implements StyleParser<string> {
       }]
     }];
 
-    if (markSymbolizer.color || markSymbolizer.fillOpacity) {
+    if (markSymbolizer.color || !isNil(markSymbolizer.fillOpacity)) {
       const fillCssParamaters = [];
       if (markSymbolizer.color) {
         if (isGeoStylerFunction(markSymbolizer.color)) {
@@ -1709,7 +1713,7 @@ export class SldStyleParser implements StyleParser<string> {
           });
         }
       }
-      if (markSymbolizer.fillOpacity) {
+      if (!isNil(markSymbolizer.fillOpacity)) {
         if (isGeoStylerFunction(markSymbolizer.fillOpacity)) {
           const children = geoStylerFunctionToSldFunction(markSymbolizer.fillOpacity);
           fillCssParamaters.push({
@@ -1779,7 +1783,7 @@ export class SldStyleParser implements StyleParser<string> {
           });
         }
       }
-      if (markSymbolizer.strokeOpacity) {
+      if (!isNil(markSymbolizer.strokeOpacity)) {
         if (isGeoStylerFunction(markSymbolizer.strokeOpacity)) {
           const children = geoStylerFunctionToSldFunction(markSymbolizer.strokeOpacity);
           strokeCssParameters.push({
@@ -1808,10 +1812,10 @@ export class SldStyleParser implements StyleParser<string> {
       [Mark]: mark
     }];
 
-    if (markSymbolizer.opacity) {
+    if (!isNil(markSymbolizer.opacity)) {
       graphic.push({
         [Opacity]: [{
-          '#text': markSymbolizer.opacity.toString()
+          '#text': markSymbolizer.opacity!.toString()
         }]
       });
     }
@@ -1907,7 +1911,7 @@ export class SldStyleParser implements StyleParser<string> {
       }
     }
 
-    if (iconSymbolizer.opacity) {
+    if (!isNil(iconSymbolizer.opacity)) {
       graphic.push({
         [Opacity]: [{
           '#text': iconSymbolizer.opacity