ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

instead, add a trimWhitespace option to OpenLayers.String.numericIf as discussed with @ahocevar

Browse Source
This commit is contained in:
Bart van den Eijnden
2012-03-19 13:07:49 +01:00
parent 7a769830fe
commit 94bd37031d
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/OpenLayers/BaseTypes.js
View File

@@ -189,12 +189,16 @@ OpenLayers.String = {
*
* Parameters:
* value - {String}
* trimWhitespace - {Boolean}
*
* Returns:
* {Number|String} a Number if the passed value is a number, a String
* otherwise.
*/
numericIf: function(value) {
numericIf: function(value, trimWhitespace) {
if (trimWhitespace === true) {
value = value.replace(/^\s*|\s*$/g, "");
}
return OpenLayers.String.isNumeric(value) ? parseFloat(value) : value;
}

6
lib/OpenLayers/Format/Filter/v1.js
View File

@@ -180,18 +180,18 @@ OpenLayers.Format.Filter.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
},
"Literal": function(node, obj) {
obj.value = OpenLayers.String.numericIf(
this.getChildValue(node).replace(this.regExes.trimSpace, ""));
this.getChildValue(node), true);
},
"PropertyName": function(node, filter) {
filter.property = this.getChildValue(node);
},
"LowerBoundary": function(node, filter) {
filter.lowerBoundary = OpenLayers.String.numericIf(
this.readers.ogc._expression.call(this, node).replace(this.regExes.trimSpace, ""));
this.readers.ogc._expression.call(this, node), true);
},
"UpperBoundary": function(node, filter) {
filter.upperBoundary = OpenLayers.String.numericIf(
this.readers.ogc._expression.call(this, node).replace(this.regExes.trimSpace, ""));
this.readers.ogc._expression.call(this, node), true);
},
"Intersects": function(node, obj) {
this.readSpatial(node, obj, OpenLayers.Filter.Spatial.INTERSECTS);