fix: test if opacity is really undefined (#968)

* fix!: test if opacity is really undefined BREAKING CHANGE: opacity will no longer be set to 1 on text symbolizer if opacity was not explicitly set.
geostyler · Oct 8, 2024 · 858b42b · 858b42b
1 parent ff7268b
commit 858b42b
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 28 deletions.
diff --git a/data/styles/geoserver/poi.ts b/data/styles/geoserver/poi.ts
@@ -32,7 +32,6 @@ const style: Style = {
           kind: 'Text',
           label: '{{NAME}}',
           color: '#000000',
-          opacity: 1,
           haloWidth: 2,
           haloColor: '#FFFFFF',
           offset: [

diff --git a/data/styles/geoserver/poly_landmarks.ts b/data/styles/geoserver/poly_landmarks.ts
@@ -146,7 +146,6 @@ const style: Style = {
           kind: 'Text',
           label: '{{LANAME}}',
           color: '#000000',
-          opacity: 1,
           haloWidth: 2,
           haloColor: '#FDE5A5',
           haloOpacity: 0.75,

diff --git a/data/styles/geoserver/pophatch.ts b/data/styles/geoserver/pophatch.ts
@@ -71,7 +71,6 @@ const style: Style = {
           kind: 'Text',
           label: '{{STATE_ABBR}}',
           color: '#000000',
-          opacity: 1,
           haloWidth: 2,
           haloColor: '#FFFFFF',
           font: [

diff --git a/data/styles/geoserver/popshade.ts b/data/styles/geoserver/popshade.ts
@@ -60,7 +60,6 @@ const style: Style = {
           kind: 'Text',
           label: '{{STATE_ABBR}}',
           color: '#000000',
-          opacity: 1,
           font: [
             'Times New Roman'
           ],

diff --git a/data/styles/geoserver/tiger_roads.ts b/data/styles/geoserver/tiger_roads.ts
@@ -52,7 +52,6 @@ const style: Style = {
           kind: 'Text',
           label: '{{NAME}}',
           color: '#000000',
-          opacity: 1,
           haloWidth: 2,
           haloColor: '#FFFFFF',
           haloOpacity: 0.85,

diff --git a/data/styles/multi_simplelineLabel.ts b/data/styles/multi_simplelineLabel.ts
@@ -12,7 +12,6 @@ const multiSimplelineLabel: Style = {
     }, {
       kind: 'Text',
       color: '#000000',
-      opacity: 1,
       label: '{{name}}',
       font: ['Arial'],
       size: 12,

diff --git a/data/styles/point_simpleLabel.ts b/data/styles/point_simpleLabel.ts
@@ -6,7 +6,6 @@ const pointStyledLabel: Style = {
     name: '',
     symbolizers: [{
       color: '#000000',
-      opacity: 1,
       kind: 'Text',
       label: 'myText'
     }]

diff --git a/data/styles/point_styledLabel_literalPlaceholder.ts b/data/styles/point_styledLabel_literalPlaceholder.ts
@@ -14,7 +14,6 @@ const pointStyledLabel: Style = {
       haloColor: '#000000',
       haloWidth: 5,
       haloOpacity: 1,
-      opacity: 1,
       rotate: 45,
       fontStyle: 'normal',
       fontWeight: 'bold',

diff --git a/data/styles/point_styledlabel.ts b/data/styles/point_styledlabel.ts
@@ -7,7 +7,6 @@ const pointStyledLabel: Style = {
     symbolizers: [{
       kind: 'Text',
       color: '#000000',
-      opacity: 1,
       label: '{{name}}',
       font: ['Arial'],
       size: 12,

diff --git a/data/styles/text_lineplacement.ts b/data/styles/text_lineplacement.ts
@@ -6,7 +6,6 @@ const pointStyledLabel: Style = {
     name: '',
     symbolizers: [{
       color: '#000000',
-      opacity: 1,
       kind: 'Text',
       label: 'myText',
       placement: 'line'

diff --git a/data/styles/text_pointplacement.ts b/data/styles/text_pointplacement.ts
@@ -6,7 +6,6 @@ const pointStyledLabel: Style = {
     name: '',
     symbolizers: [{
       color: '#000000',
-      opacity: 1,
       kind: 'Text',
       label: 'myText',
       placement: 'point'

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,10 @@ export class SldStyleParser implements StyleParser<string> {
     }
 
     textSymbolizer.color = color ? color : '#000000';
-    textSymbolizer.opacity = opacity ? numberExpression(opacity) : 1;
+
+    if (!isNil(opacity)) {
+      textSymbolizer.opacity = numberExpression(opacity);
+    }
 
     const haloRadius = get(sldSymbolizer, 'Halo.Radius.#text');
     if (!isNil(haloRadius)) {
@@ -1181,7 +1188,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 +1694,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 +1716,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 +1786,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 +1815,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 +1914,7 @@ export class SldStyleParser implements StyleParser<string> {
       }
     }
 
-    if (iconSymbolizer.opacity) {
+    if (!isNil(iconSymbolizer.opacity)) {
       graphic.push({
         [Opacity]: [{
           '#text': iconSymbolizer.opacity
@@ -2095,15 +2102,17 @@ export class SldStyleParser implements StyleParser<string> {
         ':@': {
           '@_name': 'fill'
         }
-      },
-      {
-        [CssParameter]: [{
-          '#text': Number.isFinite(textSymbolizer.opacity) ? textSymbolizer.opacity : '1',
-        }],
-        ':@': {
-          '@_name': 'fill-opacity'
-        }
       }];
+      if (Number.isFinite(textSymbolizer.opacity)) {
+        fill.push({
+          [CssParameter]: [{
+            '#text': `${textSymbolizer.opacity}`,
+          }],
+          ':@': {
+            '@_name': 'fill-opacity'
+          },
+        });
+      }
       sldTextSymbolizer.push({
         [Fill]: fill
       });