Use Case Insensitive Filters for SLD Output (#5980)

Fixes #5526 Also fixes memory leak in msSLDParseLogicalExpression()
MapServer · Jan 24, 2020 · 84274205449bca0377dd50d840ec1542416134a2 · 8427420
1 parent cca2744
commit 84274205449bca0377dd50d840ec1542416134a2
Show file tree

Hide file tree

Showing 14 changed files with 538 additions and 72 deletions.
diff --git a/mapogcsld.c b/mapogcsld.c
diff --git a/msautotest/wxs/expected/wms_getstyles_expressions1.xml b/msautotest/wxs/expected/wms_getstyles_expressions1.xml
@@ -0,0 +1,24 @@
+<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<NamedLayer>
+<se:Name>Test1</se:Name>
+<UserStyle>
+<se:FeatureTypeStyle>
+<se:Rule>
+<ogc:Filter><ogc:And><ogc:PropertyIsGreaterThan><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>1</ogc:Literal></ogc:PropertyIsGreaterThan><ogc:PropertyIsLessThanOrEqualTo><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>10 </ogc:Literal></ogc:PropertyIsLessThanOrEqualTo></ogc:And></ogc:Filter>
+<se:PointSymbolizer>
+<se:Graphic>
+<se:Mark>
+<se:WellKnownName>square</se:WellKnownName>
+<se:Fill>
+<se:SvgParameter name="fill">#dc0000</se:SvgParameter>
+</se:Fill>
+</se:Mark>
+<se:Size>1</se:Size>
+</se:Graphic>
+</se:PointSymbolizer>
+</se:Rule>
+</se:FeatureTypeStyle>
+</UserStyle>
+</NamedLayer>
+</StyledLayerDescriptor>
+
diff --git a/msautotest/wxs/expected/wms_getstyles_expressions10.xml b/msautotest/wxs/expected/wms_getstyles_expressions10.xml
@@ -0,0 +1,24 @@
+<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<NamedLayer>
+<se:Name>Test10</se:Name>
+<UserStyle>
+<se:FeatureTypeStyle>
+<se:Rule>
+<ogc:Filter><ogc:And><ogc:PropertyIsGreaterThan><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>1</ogc:Literal></ogc:PropertyIsGreaterThan><ogc:PropertyIsLessThanOrEqualTo><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>10</ogc:Literal></ogc:PropertyIsLessThanOrEqualTo></ogc:And></ogc:Filter>
+<se:PointSymbolizer>
+<se:Graphic>
+<se:Mark>
+<se:WellKnownName>square</se:WellKnownName>
+<se:Fill>
+<se:SvgParameter name="fill">#dc0000</se:SvgParameter>
+</se:Fill>
+</se:Mark>
+<se:Size>1</se:Size>
+</se:Graphic>
+</se:PointSymbolizer>
+</se:Rule>
+</se:FeatureTypeStyle>
+</UserStyle>
+</NamedLayer>
+</StyledLayerDescriptor>
+
diff --git a/msautotest/wxs/expected/wms_getstyles_expressions11.xml b/msautotest/wxs/expected/wms_getstyles_expressions11.xml
@@ -0,0 +1,24 @@
+<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<NamedLayer>
+<se:Name>Test11</se:Name>
+<UserStyle>
+<se:FeatureTypeStyle>
+<se:Rule>
+<ogc:Filter><ogc:Or><ogc:PropertyIsEqualTo><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>1</ogc:Literal></ogc:PropertyIsEqualTo><ogc:PropertyIsEqualTo><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>10</ogc:Literal></ogc:PropertyIsEqualTo></ogc:Or></ogc:Filter>
+<se:PointSymbolizer>
+<se:Graphic>
+<se:Mark>
+<se:WellKnownName>square</se:WellKnownName>
+<se:Fill>
+<se:SvgParameter name="fill">#dc0000</se:SvgParameter>
+</se:Fill>
+</se:Mark>
+<se:Size>1</se:Size>
+</se:Graphic>
+</se:PointSymbolizer>
+</se:Rule>
+</se:FeatureTypeStyle>
+</UserStyle>
+</NamedLayer>
+</StyledLayerDescriptor>
+
diff --git a/msautotest/wxs/expected/wms_getstyles_expressions12.xml b/msautotest/wxs/expected/wms_getstyles_expressions12.xml
@@ -0,0 +1,24 @@
+<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<NamedLayer>
+<se:Name>Test12</se:Name>
+<UserStyle>
+<se:FeatureTypeStyle>
+<se:Rule>
+<ogc:Filter><ogc:Not><ogc:PropertyIsEqualTo><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>1</ogc:Literal></ogc:PropertyIsEqualTo></ogc:Not></ogc:Filter>
+<se:PointSymbolizer>
+<se:Graphic>
+<se:Mark>
+<se:WellKnownName>square</se:WellKnownName>
+<se:Fill>
+<se:SvgParameter name="fill">#dc0000</se:SvgParameter>
+</se:Fill>
+</se:Mark>
+<se:Size>1</se:Size>
+</se:Graphic>
+</se:PointSymbolizer>
+</se:Rule>
+</se:FeatureTypeStyle>
+</UserStyle>
+</NamedLayer>
+</StyledLayerDescriptor>
+
diff --git a/msautotest/wxs/expected/wms_getstyles_expressions2.xml b/msautotest/wxs/expected/wms_getstyles_expressions2.xml
@@ -0,0 +1,24 @@
+<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<NamedLayer>
+<se:Name>Test2</se:Name>
+<UserStyle>
+<se:FeatureTypeStyle>
+<se:Rule>
+<ogc:Filter><ogc:And><ogc:PropertyIsGreaterThan><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>1</ogc:Literal></ogc:PropertyIsGreaterThan><ogc:PropertyIsLessThanOrEqualTo><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>10 </ogc:Literal></ogc:PropertyIsLessThanOrEqualTo></ogc:And></ogc:Filter>
+<se:PointSymbolizer>
+<se:Graphic>
+<se:Mark>
+<se:WellKnownName>square</se:WellKnownName>
+<se:Fill>
+<se:SvgParameter name="fill">#dc0000</se:SvgParameter>
+</se:Fill>
+</se:Mark>
+<se:Size>1</se:Size>
+</se:Graphic>
+</se:PointSymbolizer>
+</se:Rule>
+</se:FeatureTypeStyle>
+</UserStyle>
+</NamedLayer>
+</StyledLayerDescriptor>
+
diff --git a/msautotest/wxs/expected/wms_getstyles_expressions3.xml b/msautotest/wxs/expected/wms_getstyles_expressions3.xml
@@ -0,0 +1,24 @@
+<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<NamedLayer>
+<se:Name>Test3</se:Name>
+<UserStyle>
+<se:FeatureTypeStyle>
+<se:Rule>
+<ogc:Filter><ogc:And><ogc:PropertyIsGreaterThan><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>1</ogc:Literal></ogc:PropertyIsGreaterThan><ogc:PropertyIsLessThanOrEqualTo><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>10 </ogc:Literal></ogc:PropertyIsLessThanOrEqualTo></ogc:And></ogc:Filter>
+<se:PointSymbolizer>
+<se:Graphic>
+<se:Mark>
+<se:WellKnownName>square</se:WellKnownName>
+<se:Fill>
+<se:SvgParameter name="fill">#dc0000</se:SvgParameter>
+</se:Fill>
+</se:Mark>
+<se:Size>1</se:Size>
+</se:Graphic>
+</se:PointSymbolizer>
+</se:Rule>
+</se:FeatureTypeStyle>
+</UserStyle>
+</NamedLayer>
+</StyledLayerDescriptor>
+
diff --git a/msautotest/wxs/expected/wms_getstyles_expressions4.xml b/msautotest/wxs/expected/wms_getstyles_expressions4.xml
@@ -0,0 +1,24 @@
+<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<NamedLayer>
+<se:Name>Test4</se:Name>
+<UserStyle>
+<se:FeatureTypeStyle>
+<se:Rule>
+<ogc:Filter><ogc:Or><ogc:PropertyIsEqualTo><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>1</ogc:Literal></ogc:PropertyIsEqualTo><ogc:PropertyIsEqualTo><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>10 </ogc:Literal></ogc:PropertyIsEqualTo></ogc:Or></ogc:Filter>
+<se:PointSymbolizer>
+<se:Graphic>
+<se:Mark>
+<se:WellKnownName>square</se:WellKnownName>
+<se:Fill>
+<se:SvgParameter name="fill">#dc0000</se:SvgParameter>
+</se:Fill>
+</se:Mark>
+<se:Size>1</se:Size>
+</se:Graphic>
+</se:PointSymbolizer>
+</se:Rule>
+</se:FeatureTypeStyle>
+</UserStyle>
+</NamedLayer>
+</StyledLayerDescriptor>
+
diff --git a/msautotest/wxs/expected/wms_getstyles_expressions5.xml b/msautotest/wxs/expected/wms_getstyles_expressions5.xml
@@ -0,0 +1,24 @@
+<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<NamedLayer>
+<se:Name>Test5</se:Name>
+<UserStyle>
+<se:FeatureTypeStyle>
+<se:Rule>
+<ogc:Filter><ogc:Or><ogc:PropertyIsEqualTo><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>1</ogc:Literal></ogc:PropertyIsEqualTo><ogc:PropertyIsEqualTo><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>10 </ogc:Literal></ogc:PropertyIsEqualTo></ogc:Or></ogc:Filter>
+<se:PointSymbolizer>
+<se:Graphic>
+<se:Mark>
+<se:WellKnownName>square</se:WellKnownName>
+<se:Fill>
+<se:SvgParameter name="fill">#dc0000</se:SvgParameter>
+</se:Fill>
+</se:Mark>
+<se:Size>1</se:Size>
+</se:Graphic>
+</se:PointSymbolizer>
+</se:Rule>
+</se:FeatureTypeStyle>
+</UserStyle>
+</NamedLayer>
+</StyledLayerDescriptor>
+
diff --git a/msautotest/wxs/expected/wms_getstyles_expressions6.xml b/msautotest/wxs/expected/wms_getstyles_expressions6.xml
@@ -0,0 +1,24 @@
+<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<NamedLayer>
+<se:Name>Test6</se:Name>
+<UserStyle>
+<se:FeatureTypeStyle>
+<se:Rule>
+<ogc:Filter><ogc:Or><ogc:PropertyIsEqualTo><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>1</ogc:Literal></ogc:PropertyIsEqualTo><ogc:PropertyIsEqualTo><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>10 </ogc:Literal></ogc:PropertyIsEqualTo></ogc:Or></ogc:Filter>
+<se:PointSymbolizer>
+<se:Graphic>
+<se:Mark>
+<se:WellKnownName>square</se:WellKnownName>
+<se:Fill>
+<se:SvgParameter name="fill">#dc0000</se:SvgParameter>
+</se:Fill>
+</se:Mark>
+<se:Size>1</se:Size>
+</se:Graphic>
+</se:PointSymbolizer>
+</se:Rule>
+</se:FeatureTypeStyle>
+</UserStyle>
+</NamedLayer>
+</StyledLayerDescriptor>
+
diff --git a/msautotest/wxs/expected/wms_getstyles_expressions7.xml b/msautotest/wxs/expected/wms_getstyles_expressions7.xml
@@ -0,0 +1,24 @@
+<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<NamedLayer>
+<se:Name>Test7</se:Name>
+<UserStyle>
+<se:FeatureTypeStyle>
+<se:Rule>
+<ogc:Filter><ogc:Not><ogc:PropertyIsEqualTo><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>1</ogc:Literal></ogc:PropertyIsEqualTo></ogc:Not></ogc:Filter>
+<se:PointSymbolizer>
+<se:Graphic>
+<se:Mark>
+<se:WellKnownName>square</se:WellKnownName>
+<se:Fill>
+<se:SvgParameter name="fill">#dc0000</se:SvgParameter>
+</se:Fill>
+</se:Mark>
+<se:Size>1</se:Size>
+</se:Graphic>
+</se:PointSymbolizer>
+</se:Rule>
+</se:FeatureTypeStyle>
+</UserStyle>
+</NamedLayer>
+</StyledLayerDescriptor>
+
diff --git a/msautotest/wxs/expected/wms_getstyles_expressions8.xml b/msautotest/wxs/expected/wms_getstyles_expressions8.xml
@@ -0,0 +1,24 @@
+<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<NamedLayer>
+<se:Name>Test8</se:Name>
+<UserStyle>
+<se:FeatureTypeStyle>
+<se:Rule>
+<ogc:Filter><ogc:Not><ogc:PropertyIsEqualTo><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>1</ogc:Literal></ogc:PropertyIsEqualTo></ogc:Not></ogc:Filter>
+<se:PointSymbolizer>
+<se:Graphic>
+<se:Mark>
+<se:WellKnownName>square</se:WellKnownName>
+<se:Fill>
+<se:SvgParameter name="fill">#dc0000</se:SvgParameter>
+</se:Fill>
+</se:Mark>
+<se:Size>1</se:Size>
+</se:Graphic>
+</se:PointSymbolizer>
+</se:Rule>
+</se:FeatureTypeStyle>
+</UserStyle>
+</NamedLayer>
+</StyledLayerDescriptor>
+
diff --git a/msautotest/wxs/expected/wms_getstyles_expressions9.xml b/msautotest/wxs/expected/wms_getstyles_expressions9.xml
@@ -0,0 +1,24 @@
+<StyledLayerDescriptor version="1.1.0" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<NamedLayer>
+<se:Name>Test9</se:Name>
+<UserStyle>
+<se:FeatureTypeStyle>
+<se:Rule>
+<ogc:Filter><ogc:Not><ogc:PropertyIsEqualTo><ogc:PropertyName>FID</ogc:PropertyName><ogc:Literal>1</ogc:Literal></ogc:PropertyIsEqualTo></ogc:Not></ogc:Filter>
+<se:PointSymbolizer>
+<se:Graphic>
+<se:Mark>
+<se:WellKnownName>square</se:WellKnownName>
+<se:Fill>
+<se:SvgParameter name="fill">#dc0000</se:SvgParameter>
+</se:Fill>
+</se:Mark>
+<se:Size>1</se:Size>
+</se:Graphic>
+</se:PointSymbolizer>
+</se:Rule>
+</se:FeatureTypeStyle>
+</UserStyle>
+</NamedLayer>
+</StyledLayerDescriptor>
+