Merge pull request #915 from jansule/filter-namespace

fix: remove unnecessary ogc: prefix from filter
geostyler · Feb 12, 2024 · 84d1de4 · 84d1de4
2 parents 794ac90 + 450ee8f
commit 84d1de4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/data/slds/1.0/function_filter.sld b/data/slds/1.0/function_filter.sld
@@ -8,7 +8,7 @@
       <FeatureTypeStyle>
         <Rule>
           <Name>Function Property Rule 0</Name>
-          <Filter>
+          <Filter xmlns="http://www.opengis.net/ogc">
             <Function name="equalTo">
               <Function name="between">
                 <PropertyName>testprop</PropertyName>

diff --git a/data/slds/1.1/point_simplepoint_filter.sld b/data/slds/1.1/point_simplepoint_filter.sld
@@ -7,7 +7,7 @@
       <se:FeatureTypeStyle>
         <se:Rule>
           <se:Name>Small populated New Yorks</se:Name>
-          <ogc:Filter xmlns="http://www.opengis.net/ogc">
+          <Filter xmlns="http://www.opengis.net/ogc">
             <And>
               <PropertyIsEqualTo>
                 <PropertyName>NAME</PropertyName>
@@ -54,7 +54,7 @@
                 </UpperBoundary>
               </PropertyIsBetween>
             </And>
-          </ogc:Filter>
+          </Filter>
           <se:MinScaleDenominator>10000</se:MinScaleDenominator>
           <se:MaxScaleDenominator>20000</se:MaxScaleDenominator>
           <se:PointSymbolizer uom="http://www.opengeospatial.org/se/units/pixel">

diff --git a/data/slds/1.1/point_simplepoint_functionfilter.sld b/data/slds/1.1/point_simplepoint_functionfilter.sld
@@ -7,15 +7,15 @@
       <se:FeatureTypeStyle>
         <se:Rule>
           <se:Name>Small populated New Yorks</se:Name>
-          <ogc:Filter xmlns="http://www.opengis.net/ogc">
+          <Filter xmlns="http://www.opengis.net/ogc">
             <PropertyIsLike wildCard="*" singleChar="." escapeChar="!">
               <Function name="strMatches">
                 <PropertyName>year</PropertyName>
                 <Literal>^( )??2019,.*</Literal>
               </Function>
               <Literal>true</Literal>
             </PropertyIsLike>
-          </ogc:Filter>
+          </Filter>
           <se:MinScaleDenominator>10000</se:MinScaleDenominator>
           <se:MaxScaleDenominator>20000</se:MaxScaleDenominator>
           <se:PointSymbolizer uom="http://www.opengeospatial.org/se/units/pixel">

diff --git a/data/slds/1.1/point_simplepoint_nestedLogicalFilters.sld b/data/slds/1.1/point_simplepoint_nestedLogicalFilters.sld
@@ -7,7 +7,7 @@
       <se:FeatureTypeStyle>
         <se:Rule>
           <se:Name>Test</se:Name>
-          <ogc:Filter xmlns="http://www.opengis.net/ogc">
+          <Filter xmlns="http://www.opengis.net/ogc">
             <And>
               <Or>
                 <PropertyIsEqualTo>
@@ -40,7 +40,7 @@
                 </And>
               </Or>
             </And>
-          </ogc:Filter>
+          </Filter>
           <se:MinScaleDenominator>10000</se:MinScaleDenominator>
           <se:MaxScaleDenominator>20000</se:MaxScaleDenominator>
           <se:PointSymbolizer uom="http://www.opengeospatial.org/se/units/pixel">

diff --git a/src/SldStyleParser.ts b/src/SldStyleParser.ts
@@ -1174,10 +1174,6 @@ export class SldStyleParser implements StyleParser<string> {
    * @returns The tagName as used by the configured sldVersion
    */
   getTagName(tagName: string): string {
-    const ogcList = ['Filter'];
-    if (ogcList.includes(tagName)) {
-      return this.sldVersion === '1.1.0' ? `ogc:${tagName}` : tagName;
-    }
     if (tagName === 'CssParameter') {
       return this.sldVersion === '1.1.0' ? 'se:SvgParameter' : 'CssParameter';
     }