From b01783d60af29afd00538155e3bcf3ad531321ed Mon Sep 17 00:00:00 2001
From: Benjamin Gerber <benjamin.gerber@camptocamp.com>
Date: Tue, 25 Feb 2025 12:54:23 +0100
Subject: [PATCH] fix: support only spaces as separator in vendor-option
 graphic-margin

---
 data/slds/geoserver/pattern_polygon.sld       |  2 +-
 .../pattern_polygon_alternative_margin.sld    | 37 -------------------
 src/SldStyleParser.geoserver.spec.ts          |  6 ---
 src/SldStyleParser.ts                         |  2 +-
 4 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 data/slds/geoserver/pattern_polygon_alternative_margin.sld

diff --git a/data/slds/geoserver/pattern_polygon.sld b/data/slds/geoserver/pattern_polygon.sld
index 9ccea0f4..329d93bb 100644
--- a/data/slds/geoserver/pattern_polygon.sld
+++ b/data/slds/geoserver/pattern_polygon.sld
@@ -15,7 +15,7 @@
           <Name>Polygon with spaced purple circle symbols</Name>
           <Abstract>Polygon with spaced purple circle symbols</Abstract>
           <PolygonSymbolizer>
-            <VendorOption name="graphic-margin">4,6,2,3</VendorOption>
+            <VendorOption name="graphic-margin">4 6 2 3</VendorOption>
             <Fill>
               <GraphicFill>
                 <Graphic>
diff --git a/data/slds/geoserver/pattern_polygon_alternative_margin.sld b/data/slds/geoserver/pattern_polygon_alternative_margin.sld
deleted file mode 100644
index 329d93bb..00000000
--- a/data/slds/geoserver/pattern_polygon_alternative_margin.sld
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<StyledLayerDescriptor version="1.0.0" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc"
-  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd">
-  <NamedLayer>
-
-    <Name>Pattern polygon</Name>
-
-    <UserStyle>
-      <Name>pattern_polygon</Name>
-      <Title>Pattern polygon</Title>
-      <Abstract>Polygon with spaced purple circle symbols</Abstract>
-      <FeatureTypeStyle>
-        <Rule>
-          <Name>Polygon with spaced purple circle symbols</Name>
-          <Abstract>Polygon with spaced purple circle symbols</Abstract>
-          <PolygonSymbolizer>
-            <VendorOption name="graphic-margin">4 6 2 3</VendorOption>
-            <Fill>
-              <GraphicFill>
-                <Graphic>
-                  <Mark>
-                    <WellKnownName>circle</WellKnownName>
-                    <Fill>
-                      <CssParameter name="fill">#880088</CssParameter>
-                    </Fill>
-                  </Mark>
-                  <Size>6</Size>
-                </Graphic>
-              </GraphicFill>
-            </Fill>
-          </PolygonSymbolizer>
-        </Rule>
-      </FeatureTypeStyle>
-    </UserStyle>
-  </NamedLayer>
-</StyledLayerDescriptor>
diff --git a/src/SldStyleParser.geoserver.spec.ts b/src/SldStyleParser.geoserver.spec.ts
index 67f2a4f5..e611580d 100644
--- a/src/SldStyleParser.geoserver.spec.ts
+++ b/src/SldStyleParser.geoserver.spec.ts
@@ -185,12 +185,6 @@ describe('SldStyleParser implements StyleParser', () => {
       expect(geoStylerStyle).toBeDefined();
       expect(geoStylerStyle).toEqual(pattern_polygon);
     });
-    it('can read the geoserver pattern_polygon_alternative_margin.sld', async () => {
-      const sld = fs.readFileSync('./data/slds/geoserver/pattern_polygon_alternative_margin.sld', 'utf8');
-      const { output: geoStylerStyle } = await styleParser.readStyle(sld);
-      expect(geoStylerStyle).toBeDefined();
-      expect(geoStylerStyle).toEqual(pattern_polygon);
-    });
   });
 
   describe('#writeStyle', () => {
diff --git a/src/SldStyleParser.ts b/src/SldStyleParser.ts
index 9b5089e5..21c42ac7 100644
--- a/src/SldStyleParser.ts
+++ b/src/SldStyleParser.ts
@@ -1001,7 +1001,7 @@ export class SldStyleParser implements StyleParser<string> {
     if (this.withGeoServerVendorOption) {
       const graphicFillPadding = getVendorOptionValue(sldSymbolizer, 'graphic-margin');
       if (!isNil(graphicFillPadding)) {
-        fillSymbolizer.graphicFillPadding = graphicFillPadding.split(/[,\s]/).map(numberExpression);
+        fillSymbolizer.graphicFillPadding = graphicFillPadding.split(/\s/).map(numberExpression);
       }
     }
     if (!isNil(color)) {