Sets default values for opacity

geostyler · May 17, 2021 · 7f60cfb · 7f60cfb
1 parent 20fe693
commit 7f60cfb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/data/styles/polygon_simple_polygon.ts b/data/styles/polygon_simple_polygon.ts
@@ -7,7 +7,9 @@ const polygonStyle: Style = {
     symbolizers: [{
       kind: 'Fill',
       color: '#00FF00',
-      outlineColor: '#555555'
+      fillOpacity: 1,
+      outlineColor: '#555555',
+      outlineOpacity: 1
     }]
   }]
 };

diff --git a/data/styles/polygon_simple_polygon_outline.ts b/data/styles/polygon_simple_polygon_outline.ts
@@ -6,12 +6,13 @@ const polygonStyle: Style = {
     {
       name: '',
       symbolizers: [
-        { kind: 'Fill', outlineOpacity: 0, color: '#00FF00' },
+        { kind: 'Fill', outlineOpacity: 0, color: '#00FF00', fillOpacity: 1 },
         {
           kind: 'Fill',
           outlineColor: '#555555',
           fillOpacity: 0,
-          outlineWidth: 0.1
+          outlineWidth: 0.1,
+          outlineOpacity: 1
         }
       ]
     }

diff --git a/src/MapfileStyleParser.ts b/src/MapfileStyleParser.ts
@@ -624,11 +624,16 @@ export class MapfileStyleParser implements StyleParser {
       fillSymbolizer.graphicFill = this.getPointSymbolizerFromMapfileStyle(mapfileStyle);
     }
 
-    if (mapfileStyle.color && !mapfileStyle.outlinecolor) {
-      fillSymbolizer.outlineOpacity = 0;
+    if (mapfileStyle.color) {
+      fillSymbolizer.fillOpacity = mapfileStyle.opacity / 100 || 1;
+
+      if (!mapfileStyle.outlinecolor) {
+        fillSymbolizer.outlineOpacity = 0;
+      }
     }
 
     if (mapfileStyle.outlinecolor) {
+      fillSymbolizer.outlineOpacity =  mapfileStyle.opacity / 100 || 1;
       fillSymbolizer.outlineColor = isHex(mapfileStyle.outlinecolor)
         ? mapfileStyle.outlinecolor
         : rgbToHex(mapfileStyle.outlinecolor);
@@ -838,7 +843,6 @@ export class MapfileStyleParser implements StyleParser {
         this.checkWarnDropRule('MAXSCALEDENOM', 'LABEL', mapfileLabel.maxscaledenom);
       });
     }
-
     return symbolizers;
   }