Merge pull request #723 from miccoh1994/master

feat: support symbolizer visibility
geostyler · Jun 16, 2023 · c7206f5 · c7206f5
2 parents 71583bf + c4d9535
commit c7206f5
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/src/OlStyleParser.ts b/src/OlStyleParser.ts
@@ -5,6 +5,7 @@ import {
   FillSymbolizer,
   Filter,
   IconSymbolizer,
+  isGeoStylerBooleanFunction,
   isGeoStylerFunction,
   isGeoStylerStringFunction,
   isIconSymbolizer,
@@ -71,16 +72,14 @@ export class OlStyleParser implements StyleParser<OlStyleLike> {
         blur: 'none',
         offsetAnchor: 'none',
         pitchAlignment: 'none',
-        pitchScale: 'none',
-        visibility: 'none'
+        pitchScale: 'none'
       },
       FillSymbolizer: {
         antialias: 'none',
         fillOpacity: {
           support: 'none',
           info: 'Use opacity instead.'
-        },
-        visibility: 'none'
+        }
       },
       IconSymbolizer: {
         allowOverlap: 'none',
@@ -101,8 +100,7 @@ export class OlStyleParser implements StyleParser<OlStyleLike> {
         pitchAlignment: 'none',
         rotationAlignment: 'none',
         textFit: 'none',
-        textFitPadding: 'none',
-        visibility: 'none'
+        textFitPadding: 'none'
       },
       LineSymbolizer: {
         blur: 'none',
@@ -111,7 +109,6 @@ export class OlStyleParser implements StyleParser<OlStyleLike> {
         miterLimit: 'none',
         roundLimit: 'none',
         spacing: 'none',
-        visibility: 'none',
         graphicFill: 'none',
         graphicStroke: 'none',
         perpendicularOffset: 'none'
@@ -761,8 +758,18 @@ export class OlStyleParser implements StyleParser<OlStyleLike> {
 
         if (isWithinScale && matchesFilter) {
           rule.symbolizers.forEach((symb: Symbolizer) => {
-            const olSymbolizer: any = this.getOlSymbolizerFromSymbolizer(symb, feature);
+            if (symb.visibility === false) {
+              return null;
+            }
 
+            if (isGeoStylerBooleanFunction(symb.visibility)) {
+              const visibility = OlStyleUtil.evaluateBooleanFunction(symb.visibility);
+              if (!visibility) {
+                return null;
+              }
+            }
+
+            const olSymbolizer: any = this.getOlSymbolizerFromSymbolizer(symb, feature);
             // either an OlStyle or an ol.StyleFunction. OpenLayers only accepts an array
             // of OlStyles, not ol.StyleFunctions.
             // So we have to check it and in case of an ol.StyleFunction call that function