Merge pull request #189 from KaiVolland/force-casting

Introduces forceCasting flag
geostyler · Apr 25, 2019 · 233ba17 · 233ba17
2 parents b862bc1 + 976eba5
commit 233ba17
Show file tree

Hide file tree

Showing 12 changed files with 143 additions and 92 deletions.
diff --git a/data/slds/line_graphicStroke.sld b/data/slds/line_graphicStroke.sld
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0"
-    xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
-    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">
+<StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
+  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">
   <NamedLayer>
     <Name>Simple Line</Name>
     <UserStyle>
@@ -31,7 +30,7 @@
               <CssParameter name="stroke-linejoin">mitre</CssParameter>
             </Stroke>
           </LineSymbolizer>
-       	</Rule>
+        </Rule>
       </FeatureTypeStyle>
     </UserStyle>
   </NamedLayer>

diff --git a/data/slds/line_simpleline.sld b/data/slds/line_simpleline.sld
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0"
-    xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
-    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">
+<StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
+  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">
   <NamedLayer>
     <Name>Simple Line</Name>
     <UserStyle>
@@ -21,7 +20,7 @@
               <CssParameter name="stroke-linejoin">mitre</CssParameter>
             </Stroke>
           </LineSymbolizer>
-       	</Rule>
+        </Rule>
       </FeatureTypeStyle>
     </UserStyle>
   </NamedLayer>

diff --git a/data/slds/point_simplecross.sld b/data/slds/point_simplecross.sld
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0"
-    xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
-    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">
+<StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
+  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">
   <NamedLayer>
     <Name>Simple Cross</Name>
     <UserStyle>
@@ -17,11 +16,11 @@
               <Mark>
                 <WellKnownName>cross</WellKnownName>
                 <Fill>
-                   <CssParameter name="fill">#FF0000</CssParameter>
+                  <CssParameter name="fill">#FF0000</CssParameter>
                 </Fill>
                 <Stroke>
-                   <CssParameter name="stroke">#000000</CssParameter>
-                   <CssParameter name="stroke-width">2</CssParameter>
+                  <CssParameter name="stroke">#000000</CssParameter>
+                  <CssParameter name="stroke-width">2</CssParameter>
                 </Stroke>
               </Mark>
               <Size>10</Size>

diff --git a/data/slds/point_simplepoint_filter.sld b/data/slds/point_simplepoint_filter.sld
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0"
-    xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
-    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">
+<StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
+  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">
   <NamedLayer>
     <Name>Simple Point Filter</Name>
     <UserStyle>
@@ -58,11 +57,11 @@
               <Mark>
                 <WellKnownName>circle</WellKnownName>
                 <Fill>
-                   <CssParameter name="fill">#FF0000</CssParameter>
+                  <CssParameter name="fill">#FF0000</CssParameter>
                 </Fill>
                 <Stroke>
-                   <CssParameter name="stroke">#000000</CssParameter>
-                   <CssParameter name="stroke-width">2</CssParameter>
+                  <CssParameter name="stroke">#000000</CssParameter>
+                  <CssParameter name="stroke-width">2</CssParameter>
                 </Stroke>
               </Mark>
               <Size>6</Size>

diff --git a/data/slds/point_simplepoint_nestedLogicalFilters.sld b/data/slds/point_simplepoint_nestedLogicalFilters.sld
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0"
-    xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
-    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">
+<StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
+  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">
   <NamedLayer>
     <Name>Simple Point Filter</Name>
     <UserStyle>
@@ -53,11 +52,11 @@
               <Mark>
                 <WellKnownName>circle</WellKnownName>
                 <Fill>
-                   <CssParameter name="fill">#FF0000</CssParameter>
+                  <CssParameter name="fill">#FF0000</CssParameter>
                 </Fill>
                 <Stroke>
-                   <CssParameter name="stroke">#000000</CssParameter>
-                   <CssParameter name="stroke-width">2</CssParameter>
+                  <CssParameter name="stroke">#000000</CssParameter>
+                  <CssParameter name="stroke-width">2</CssParameter>
                 </Stroke>
               </Mark>
               <Size>6</Size>

diff --git a/data/slds/point_simpleslash.sld b/data/slds/point_simpleslash.sld
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0"
-    xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
-    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">
+<StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
+  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">
   <NamedLayer>
     <Name>Simple Slash</Name>
     <UserStyle>
@@ -17,11 +16,11 @@
               <Mark>
                 <WellKnownName>shape://slash</WellKnownName>
                 <Fill>
-                   <CssParameter name="fill">#FF0000</CssParameter>
+                  <CssParameter name="fill">#FF0000</CssParameter>
                 </Fill>
                 <Stroke>
-                   <CssParameter name="stroke">#000000</CssParameter>
-                   <CssParameter name="stroke-width">2</CssParameter>
+                  <CssParameter name="stroke">#000000</CssParameter>
+                  <CssParameter name="stroke-width">2</CssParameter>
                 </Stroke>
               </Mark>
               <Size>10</Size>

diff --git a/data/slds/point_simplesquare.sld b/data/slds/point_simplesquare.sld
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0"
-    xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
-    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">
+<StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
+  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">
   <NamedLayer>
     <Name>Simple Square</Name>
     <UserStyle>
@@ -17,11 +16,11 @@
               <Mark>
                 <WellKnownName>square</WellKnownName>
                 <Fill>
-                   <CssParameter name="fill">#FF0000</CssParameter>
+                  <CssParameter name="fill">#FF0000</CssParameter>
                 </Fill>
                 <Stroke>
-                   <CssParameter name="stroke">#000000</CssParameter>
-                   <CssParameter name="stroke-width">2</CssParameter>
+                  <CssParameter name="stroke">#000000</CssParameter>
+                  <CssParameter name="stroke-width">2</CssParameter>
                 </Stroke>
               </Mark>
               <Size>10</Size>

diff --git a/data/slds/point_simplestar.sld b/data/slds/point_simplestar.sld
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0"
-    xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
-    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">
+<StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
+  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">
   <NamedLayer>
     <Name>Simple Star</Name>
     <UserStyle>
@@ -17,11 +16,11 @@
               <Mark>
                 <WellKnownName>star</WellKnownName>
                 <Fill>
-                   <CssParameter name="fill">#FF0000</CssParameter>
+                  <CssParameter name="fill">#FF0000</CssParameter>
                 </Fill>
                 <Stroke>
-                   <CssParameter name="stroke">#000000</CssParameter>
-                   <CssParameter name="stroke-width">2</CssParameter>
+                  <CssParameter name="stroke">#000000</CssParameter>
+                  <CssParameter name="stroke-width">2</CssParameter>
                 </Stroke>
               </Mark>
               <Size>10</Size>

diff --git a/data/slds/point_simpletriangle.sld b/data/slds/point_simpletriangle.sld
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0"
-    xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
-    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">
+<StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
+  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">
   <NamedLayer>
     <Name>Simple Triangle</Name>
     <UserStyle>
@@ -17,11 +16,11 @@
               <Mark>
                 <WellKnownName>triangle</WellKnownName>
                 <Fill>
-                   <CssParameter name="fill">#FF0000</CssParameter>
+                  <CssParameter name="fill">#FF0000</CssParameter>
                 </Fill>
                 <Stroke>
-                   <CssParameter name="stroke">#000000</CssParameter>
-                   <CssParameter name="stroke-width">2</CssParameter>
+                  <CssParameter name="stroke">#000000</CssParameter>
+                  <CssParameter name="stroke-width">2</CssParameter>
                 </Stroke>
               </Mark>
               <Size>10</Size>

diff --git a/data/slds/point_simplex.sld b/data/slds/point_simplex.sld
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<StyledLayerDescriptor version="1.0.0"
-    xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
-    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">
+<StyledLayerDescriptor version="1.0.0" xsi:schemaLocation="http://www.opengis.net/sld StyledLayerDescriptor.xsd"
+  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">
   <NamedLayer>
     <Name>Simple X</Name>
     <UserStyle>
@@ -17,11 +16,11 @@
               <Mark>
                 <WellKnownName>x</WellKnownName>
                 <Fill>
-                   <CssParameter name="fill">#FF0000</CssParameter>
+                  <CssParameter name="fill">#FF0000</CssParameter>
                 </Fill>
                 <Stroke>
-                   <CssParameter name="stroke">#000000</CssParameter>
-                   <CssParameter name="stroke-width">2</CssParameter>
+                  <CssParameter name="stroke">#000000</CssParameter>
+                  <CssParameter name="stroke-width">2</CssParameter>
                 </Stroke>
               </Mark>
               <Size>10</Size>

diff --git a/src/SldStyleParser.spec.ts b/src/SldStyleParser.spec.ts
@@ -619,7 +619,7 @@ describe('SldStyleParser implements StyleParser', () => {
             .then(readStyle => {
               expect(readStyle).toEqual(raster_simpleraster);
             });
-        })
+        });
     });
     it('can write a complex SLD RasterSymbolizer', () => {
       expect.assertions(2);
@@ -632,7 +632,7 @@ describe('SldStyleParser implements StyleParser', () => {
             .then(readStyle => {
               expect(readStyle).toEqual(raster_complexraster);
             });
-        })
+        });
     });
     it('can write a SLD style with a filter', () => {
       expect.assertions(2);
@@ -662,6 +662,20 @@ describe('SldStyleParser implements StyleParser', () => {
             });
         });
     });
+    it('can write a SLD style with a filter and force cast of numeric fields (forceCasting)', () => {
+      expect.assertions(2);
+      styleParser.forceCasting = true;
+      return styleParser.writeStyle(point_simplepoint_filter_forceNumerics)
+        .then((sldString: string) => {
+          expect(sldString).toBeDefined();
+          // As string comparison between to XML-Strings is awkward and nonesens
+          // we read it again and compare the json input with the parser output
+          return styleParser.readStyle(sldString)
+            .then(readStyle => {
+              expect(readStyle).toEqual(point_simplepoint_filter_forceNumerics);
+            });
+        });
+    });
     it('can write a SLD style with a filter and force cast of boolean fields', () => {
       expect.assertions(2);
       // force fields beeing casted to boolean data type
@@ -677,6 +691,21 @@ describe('SldStyleParser implements StyleParser', () => {
             });
         });
     });
+    it('can write a SLD style with a filter and force cast of boolean fields (forceCasting)', () => {
+      expect.assertions(2);
+      // force fields beeing casted to boolean data type
+      styleParser.forceCasting = true;
+      return styleParser.writeStyle(point_simplepoint_filter_forceBools)
+        .then((sldString: string) => {
+          expect(sldString).toBeDefined();
+          // As string comparison between to XML-Strings is awkward and nonesens
+          // we read it again and compare the json input with the parser output
+          return styleParser.readStyle(sldString)
+            .then(readStyle => {
+              expect(readStyle).toEqual(point_simplepoint_filter_forceBools);
+            });
+        });
+    });
     it('can write a SLD style with nested logical filters', () => {
       expect.assertions(2);
       return styleParser.writeStyle(point_simplepoint_nestedLogicalFilters)
@@ -762,7 +791,7 @@ describe('SldStyleParser implements StyleParser', () => {
     describe('#getSldRasterSymbolizerFromRasterSymbolizer', () => {
       it('is defined', () => {
         expect(styleParser.getSldRasterSymbolizerFromRasterSymbolizer).toBeDefined();
-      })
+      });
     });
 
     describe('#getSldComparisonFilterFromComparisonFilte', () => {