Merge pull request openlayers#1477 from ahocevar/fix-cql

Fix value RegExp for CQL filter

Author: ahocevar

lib/OpenLayers/Format/CQL.js

@@ -12,15 +12,15 @@
 
 /**
  * Class: OpenLayers.Format.CQL
- * Read CQL strings to get <OpenLayers.Filter> objects.  Write 
- *     <OpenLayers.Filter> objects to get CQL strings. Create a new parser with 
+ * Read CQL strings to get <OpenLayers.Filter> objects.  Write
+ *     <OpenLayers.Filter> objects to get CQL strings. Create a new parser with
  *     the <OpenLayers.Format.CQL> constructor.
  *
  * Inherits from:
  *  - <OpenLayers.Format>
  */
 OpenLayers.Format.CQL = (function() {
-    
+
     var tokens = [
         "PROPERTY", "COMPARISON", "VALUE", "LOGICAL"
     ],
@@ -31,7 +31,7 @@ OpenLayers.Format.CQL = (function() {
         IS_NULL: /^IS NULL/i,
         COMMA: /^,/,
         LOGICAL: /^(AND|OR)/i,
-        VALUE: /^('([^']|'')*'|^-?\d*(\.\d+)?)/,
+        VALUE: /^('([^']|'')*'|-?\d+(\.\d*)?|\.\d+)/,
         LPAREN: /^\(/,
         RPAREN: /^\)/,
         SPATIAL: /^(BBOX|INTERSECTS|DWITHIN|WITHIN|CONTAINS)/i,
@@ -355,7 +355,7 @@ OpenLayers.Format.CQL = (function() {
          * Returns:
          * {<OpenLayers.Filter>} A filter based on the CQL text.
          */
-        read: function(text) { 
+        read: function(text) {
             var result = buildAst(tokenize(text));
             if (this.keepData) {
                 this.data = result;
@@ -407,7 +407,7 @@ OpenLayers.Format.CQL = (function() {
                     }
                 case "OpenLayers.Filter.Logical":
                     if (filter.type == OpenLayers.Filter.Logical.NOT) {
-                        // TODO: deal with precedence of logical operators to 
+                        // TODO: deal with precedence of logical operators to
                         // avoid extra parentheses (not urgent)
                         return "NOT (" + this.write(filter.filters[0]) + ")";
                     } else {
@@ -425,12 +425,12 @@ OpenLayers.Format.CQL = (function() {
                     }
                 case "OpenLayers.Filter.Comparison":
                     if (filter.type == OpenLayers.Filter.Comparison.BETWEEN) {
-                        return filter.property + " BETWEEN " + 
-                            this.write(filter.lowerBoundary) + " AND " + 
+                        return filter.property + " BETWEEN " +
+                            this.write(filter.lowerBoundary) + " AND " +
                             this.write(filter.upperBoundary);
                     } else {
                         return (filter.value !== null) ? filter.property +
-                            " " + operatorReverse[filter.type] + " " + 
+                            " " + operatorReverse[filter.type] + " " +
                             this.write(filter.value) : filter.property +
                             " " + operatorReverse[filter.type];
                     }
@@ -449,4 +449,3 @@ OpenLayers.Format.CQL = (function() {
 
     });
 })();
-

tests/Format/CQL.html

@@ -30,8 +30,8 @@
          "Property extracted from CQL text");
     t.eq(filter.value, 'B',
          "Value extracted from CQL text");
-         
-         
+
+
     t.eq(format.write(filter), test_cql, "write returned test cql");
 }
 
@@ -112,8 +112,8 @@
          "Property extracted from CQL text");
     t.eq(filter.value, 10,
          "Value extracted from CQL text");
-         
-         
+
+
     t.eq(format.write(filter), test_cql, "write returned test cql");
 }
 
@@ -212,7 +212,7 @@
 }
 
 function test_BBOX(t) {
-    t.plan(5);
+    t.plan(6);
     var format = new OpenLayers.Format.CQL(),
         cql = "BBOX(the_geom,1,2,3,4)",
         filter = format.read(cql);
@@ -224,9 +224,12 @@
          "Property name is as specified in CQL");
     t.eq(filter.value.toBBOX(), "1,2,3,4",
          "Value is as specified in CQL");
-
     t.eq(format.write(filter), cql, "write returned test cql");
 
+    var negCql = "BBOX(the_geom,-1,-2,3,4)"
+    filter = format.read(negCql)
+    t.eq(filter.value.toBBOX(), "-1,-2,3,4",
+         "Negative value is as specified in CQL");
 }
 
 function test_INTERSECTS(t) {
@@ -242,7 +245,7 @@
          "Property name is as specified in CQL");
     t.ok(filter.value instanceof OpenLayers.Geometry,
          "Value is a geometry");
-    
+
     t.eq(format.write(filter), cql, "write returned test cql");
 
 }