Modified filters to include the ogc:Filter tag in the output

DamonOehlman · Jul 2, 2012 · 30211ac · 30211ac
1 parent d4fb866
commit 30211ac
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 24 deletions.
diff --git a/pkg/amd/ogc.js b/pkg/amd/ogc.js
@@ -63,7 +63,7 @@ define('ogc', ['./geofilter', 'formatter', 'underscore'], function(geofilter, fo
           output = '<ogc:And>' + output + '</ogc:And>';
       }
 
-      return output;
+      return '<ogc:Filter>' + output + '</ogc:Filter>';
   });
 
   // initialise the templates

diff --git a/pkg/cjs/ogc.js b/pkg/cjs/ogc.js
@@ -66,7 +66,7 @@ geofilter.registerConverter('ogc', function(rules, opts) {
         output = '<ogc:And>' + output + '</ogc:And>';
     }
 
-    return output;
+    return '<ogc:Filter>' + output + '</ogc:Filter>';
 });
 
 // initialise the templates

diff --git a/pkg/iife/ogc.js b/pkg/iife/ogc.js
@@ -65,7 +65,7 @@
           output = '<ogc:And>' + output + '</ogc:And>';
       }
 
-      return output;
+      return '<ogc:Filter>' + output + '</ogc:Filter>';
   });
 
   // initialise the templates

diff --git a/pkg/oldschool/ogc.js b/pkg/oldschool/ogc.js
@@ -65,7 +65,7 @@
           output = '<ogc:And>' + output + '</ogc:And>';
       }
 
-      return output;
+      return '<ogc:Filter>' + output + '</ogc:Filter>';
   });
 
   // initialise the templates

diff --git a/pkg/raw/ogc.js b/pkg/raw/ogc.js
@@ -63,7 +63,7 @@ geofilter.registerConverter('ogc', function(rules, opts) {
         output = '<ogc:And>' + output + '</ogc:And>';
     }
 
-    return output;
+    return '<ogc:Filter>' + output + '</ogc:Filter>';
 });
 
 // initialise the templates

diff --git a/src/converters/ogc.js b/src/converters/ogc.js
@@ -59,7 +59,7 @@ geofilter.registerConverter('ogc', function(rules, opts) {
         output = '<ogc:And>' + output + '</ogc:And>';
     }
 
-    return output;
+    return '<ogc:Filter>' + output + '</ogc:Filter>';
 });
 
 // initialise the templates

diff --git a/test/comparisons/ogc/heavierThan20.xml b/test/comparisons/ogc/heavierThan20.xml
@@ -1,4 +1,6 @@
-<ogc:PropertyIsGreaterThan>
-    <ogc:PropertyName>WEIGHT</ogc:PropertyName>
-    <ogc:Literal>20</ogc:Literal>
-</ogc:PropertyIsGreaterThan>
+<ogc:Filter>
+    <ogc:PropertyIsGreaterThan>
+        <ogc:PropertyName>WEIGHT</ogc:PropertyName>
+        <ogc:Literal>20</ogc:Literal>
+    </ogc:PropertyIsGreaterThan>
+</ogc:Filter>
diff --git a/test/comparisons/ogc/likeSand.xml b/test/comparisons/ogc/likeSand.xml
@@ -1,4 +1,6 @@
-<ogc:PropertyIsLike wildCard="*" singleChar="?" escapeChar="\\" matchCase="false">
-    <ogc:PropertyName>SEDCLASS</ogc:PropertyName>
-    <ogc:Literal>sand*</ogc:Literal>
-</ogc:PropertyIsLike>
+<ogc:Filter>
+    <ogc:PropertyIsLike wildCard="*" singleChar="?" escapeChar="\\" matchCase="false">
+        <ogc:PropertyName>SEDCLASS</ogc:PropertyName>
+        <ogc:Literal>sand*</ogc:Literal>
+    </ogc:PropertyIsLike>
+</ogc:Filter>
diff --git a/test/comparisons/ogc/sandyAndHeavy.xml b/test/comparisons/ogc/sandyAndHeavy.xml
@@ -1,10 +1,12 @@
-<ogc:And>
-    <ogc:PropertyIsGreaterThan>
-        <ogc:PropertyName>WEIGHT</ogc:PropertyName>
-        <ogc:Literal>20</ogc:Literal>
-    </ogc:PropertyIsGreaterThan>
-    <ogc:PropertyIsLike wildCard="*" singleChar="?" escapeChar="\\" matchCase="false">
-        <ogc:PropertyName>SEDCLASS</ogc:PropertyName>
-        <ogc:Literal>sand*</ogc:Literal>
-    </ogc:PropertyIsLike>
-</ogc:And>
+<ogc:Filter>
+    <ogc:And>
+        <ogc:PropertyIsGreaterThan>
+            <ogc:PropertyName>WEIGHT</ogc:PropertyName>
+            <ogc:Literal>20</ogc:Literal>
+        </ogc:PropertyIsGreaterThan>
+        <ogc:PropertyIsLike wildCard="*" singleChar="?" escapeChar="\\" matchCase="false">
+            <ogc:PropertyName>SEDCLASS</ogc:PropertyName>
+            <ogc:Literal>sand*</ogc:Literal>
+        </ogc:PropertyIsLike>
+    </ogc:And>
+</ogc:Filter>