fix: don't force opacity to be assigned

geostyler · Oct 8, 2024 · e90d898 · e90d898
1 parent 5d11f43
commit e90d898
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 20 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
@@ -812,7 +812,10 @@ export class SldStyleParser implements StyleParser<string> {
     }
 
     textSymbolizer.color = color ? color : '#000000';
-    textSymbolizer.opacity = isNil(opacity) ? 1 : numberExpression(opacity);
+
+    if (!isNil(opacity)) {
+      textSymbolizer.opacity = numberExpression(opacity);
+    }
 
     const haloRadius = get(sldSymbolizer, 'Halo.Radius.#text');
     if (!isNil(haloRadius)) {
@@ -2099,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
       });