fix(OlFlatStyleParser): set fillOpacity on circle styles (#905)

Author: jansule

data/olFlatStyles/point_opaquepoint.ts

@@ -0,0 +1,9 @@
+import { FlatStyle } from 'ol/style/flat';
+
+const pointOpaquePoint: FlatStyle = {
+  'circle-stroke-color': '#FF0000FF',
+  'circle-fill-color': '#00FF0000',
+  'circle-radius': 6
+};
+
+export default pointOpaquePoint;

data/styles/point_opaquepoint.ts

@@ -0,0 +1,21 @@
+import { Style } from 'geostyler-style';
+
+const pointOpaquePoint: Style = {
+  name: 'OL Style',
+  rules: [
+    {
+      name: 'OL Style Rule 0',
+      symbolizers: [{
+        kind: 'Mark',
+        wellKnownName: 'circle',
+        strokeColor: '#FF0000',
+        strokeOpacity: 1,
+        color: '#00FF00',
+        fillOpacity: 0,
+        radius: 6
+      }]
+    }
+  ]
+};
+
+export default pointOpaquePoint;

src/OlFlatStyleParser.spec.ts

@@ -7,6 +7,7 @@ import lineSimpleLine from '../data/styles/line_simpleline';
 import textPlacementLine from '../data/styles/text_placement_line';
 import pointIconSimple from '../data/styles/point_icon_simple';
 import pointSimplePoint from '../data/styles/point_simplepoint';
+import pointOpaquePoint from '../data/styles/point_opaquepoint';
 import multiTwoRulesSimplepoint from '../data/styles/multi_twoRulesSimplepoint';
 import filterSimpleFilter from '../data/styles/filter_simpleFilter';
 import filterNestedFilter from '../data/styles/filter_nestedFilter';
@@ -16,6 +17,7 @@ import ol_line_simpleline from '../data/olFlatStyles/line_simpleline';
 import ol_text_placement_line from '../data/olFlatStyles/text_placement_line';
 import ol_point_icon_simple from '../data/olFlatStyles/point_icon_simple';
 import ol_point_simplepoint from '../data/olFlatStyles/point_simplepoint';
+import ol_point_opaquepoint from '../data/olFlatStyles/point_opaquepoint';
 import ol_multi_twoRulesSimplepoint from '../data/olFlatStyles/multi_twoRulesSimplepoint';
 import ol_filter_simpleFilter from '../data/olFlatStyles/filter_simpleFilter';
 import ol_filter_nestedFilter from '../data/olFlatStyles/filter_nestedFilter';
@@ -66,6 +68,12 @@ describe('OlFlatStyleParser implements StyleParser', () => {
       expect(geostylerStyle).toEqual(pointSimplePoint);
     });
 
+    it('reads a FlatCircle style with fill and stroke opacity', async () => {
+      const { output: geostylerStyle } = await styleParser.readStyle(ol_point_opaquepoint);
+      expect(geostylerStyle).toBeDefined();
+      expect(geostylerStyle).toEqual(pointOpaquePoint);
+    });
+
     it('reads a style from a FlatStyleArray', async () => {
       const { output: geostylerStyle } = await styleParser.readStyle(ol_multi_twoRulesSimplepoint);
       expect(geostylerStyle).toBeDefined();

src/OlFlatStyleParser.ts

@@ -276,7 +276,7 @@ export class OlFlatStyleParser implements StyleParser<FlatStyleLike> {
       wellKnownName: 'circle',
       radius: OlFlatStyleUtil.olExpressionToGsExpression<number>(flatStyle['circle-radius']),
       color: fillColor,
-      opacity: fillOpacity,
+      fillOpacity,
       strokeColor,
       strokeOpacity,
       strokeWidth: OlFlatStyleUtil.olExpressionToGsExpression<number>(flatStyle['circle-stroke-width']),