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

Merge pull request #8 from fredj/unneeded-cast

Browse Source 
remove unneeded cast to float
This commit is contained in:
Éric Lemoine
2011-10-07 13:27:40 -07:00
parent 4ad80fc6c0 ef1feac748
commit 8786504c9f
5 changed files with 16 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/BaseTypes/Bounds.js
+2 -8
View File
@@ -637,14 +637,8 @@ OpenLayers.Bounds.fromString = function(str, reverseAxisOrder) {
*/ */
OpenLayers.Bounds.fromArray = function(bbox, reverseAxisOrder) { OpenLayers.Bounds.fromArray = function(bbox, reverseAxisOrder) {
return reverseAxisOrder === true ? return reverseAxisOrder === true ?
new OpenLayers.Bounds(parseFloat(bbox[1]), new OpenLayers.Bounds(bbox[1], bbox[0], bbox[3], bbox[2]) :
parseFloat(bbox[0]), new OpenLayers.Bounds(bbox[0], bbox[1], bbox[2], bbox[3]);
parseFloat(bbox[3]),
parseFloat(bbox[2])) :
new OpenLayers.Bounds(parseFloat(bbox[0]),
parseFloat(bbox[1]),
parseFloat(bbox[2]),
parseFloat(bbox[3]));
}; };
/** /**
lib/OpenLayers/Format/ArcXML.js
+1 -1
View File
@@ -885,7 +885,7 @@ OpenLayers.Format.ArcXML = OpenLayers.Class(OpenLayers.Format.XML, {
coordArr = coordArr.split(/;/); coordArr = coordArr.split(/;/);
for (var cn = 0; cn < coordArr.length; cn++) { for (var cn = 0; cn < coordArr.length; cn++) {
var coordItems = coordArr[cn].split(/ /); var coordItems = coordArr[cn].split(/ /);
ringPoints.push(new OpenLayers.Geometry.Point(parseFloat(coordItems[0]), parseFloat(coordItems[1]))); ringPoints.push(new OpenLayers.Geometry.Point(coordItems[0], coordItems[1]));
} }
coords = null; coords = null;
} else { } else {
lib/OpenLayers/Format/Atom.js
+3 -14
View File
@@ -607,12 +607,7 @@ OpenLayers.Format.Atom = OpenLayers.Class(OpenLayers.Format.XML, {
point[i].firstChild.nodeValue point[i].firstChild.nodeValue
).split(/\s*,\s*/); ).split(/\s*,\s*/);
} }
components.push( components.push(new OpenLayers.Geometry.Point(xy[1], xy[0]));
new OpenLayers.Geometry.Point(
parseFloat(xy[1]),
parseFloat(xy[0])
)
);
} }
} }
@@ -627,10 +622,7 @@ OpenLayers.Format.Atom = OpenLayers.Class(OpenLayers.Format.XML, {
).split(/\s+/); ).split(/\s+/);
points = []; points = [];
for (var j=0, jj=coords.length; j<jj; j+=2) { for (var j=0, jj=coords.length; j<jj; j+=2) {
p = new OpenLayers.Geometry.Point( p = new OpenLayers.Geometry.Point(coords[j+1], coords[j]);
parseFloat(coords[j+1]),
parseFloat(coords[j])
);
points.push(p); points.push(p);
} }
components.push( components.push(
@@ -650,10 +642,7 @@ OpenLayers.Format.Atom = OpenLayers.Class(OpenLayers.Format.XML, {
).split(/\s+/); ).split(/\s+/);
points = []; points = [];
for (var j=0, jj=coords.length; j<jj; j+=2) { for (var j=0, jj=coords.length; j<jj; j+=2) {
p = new OpenLayers.Geometry.Point( p = new OpenLayers.Geometry.Point(coords[j+1], coords[j]);
parseFloat(coords[j+1]),
parseFloat(coords[j])
);
points.push(p); points.push(p);
} }
components.push( components.push(
lib/OpenLayers/Format/GeoRSS.js
+8 -16
View File
@@ -126,16 +126,14 @@ OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format.XML, {
parseFloat(lon[0].firstChild.nodeValue)]; parseFloat(lon[0].firstChild.nodeValue)];
} }
var geometry = new OpenLayers.Geometry.Point(parseFloat(location[1]), var geometry = new OpenLayers.Geometry.Point(location[1], location[0]);
parseFloat(location[0]));
} else if (line.length > 0) { } else if (line.length > 0) {
var coords = OpenLayers.String.trim(this.concatChildValues(line[0])).split(/\s+/); var coords = OpenLayers.String.trim(this.concatChildValues(line[0])).split(/\s+/);
var components = []; var components = [];
var point; var point;
for (var i=0, len=coords.length; i<len; i+=2) { for (var i=0, len=coords.length; i<len; i+=2) {
point = new OpenLayers.Geometry.Point(parseFloat(coords[i+1]), point = new OpenLayers.Geometry.Point(coords[i+1], coords[i]);
parseFloat(coords[i]));
components.push(point); components.push(point);
} }
geometry = new OpenLayers.Geometry.LineString(components); geometry = new OpenLayers.Geometry.LineString(components);
@@ -144,8 +142,7 @@ OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format.XML, {
var components = []; var components = [];
var point; var point;
for (var i=0, len=coords.length; i<len; i+=2) { for (var i=0, len=coords.length; i<len; i+=2) {
point = new OpenLayers.Geometry.Point(parseFloat(coords[i+1]), point = new OpenLayers.Geometry.Point(coords[i+1], coords[i]);
parseFloat(coords[i]));
components.push(point); components.push(point);
} }
geometry = new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(components)]); geometry = new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(components)]);
@@ -160,20 +157,15 @@ OpenLayers.Format.GeoRSS = OpenLayers.Class(OpenLayers.Format.XML, {
var components = []; var components = [];
var point; var point;
if (coords.length > 3) { if (coords.length > 3) {
point = new OpenLayers.Geometry.Point(parseFloat(coords[1]), point = new OpenLayers.Geometry.Point(coords[1], coords[0]);
parseFloat(coords[0]));
components.push(point); components.push(point);
point = new OpenLayers.Geometry.Point(parseFloat(coords[1]), point = new OpenLayers.Geometry.Point(coords[1], coords[2]);
parseFloat(coords[2]));
components.push(point); components.push(point);
point = new OpenLayers.Geometry.Point(parseFloat(coords[3]), point = new OpenLayers.Geometry.Point(coords[3], coords[2]);
parseFloat(coords[2]));
components.push(point); components.push(point);
point = new OpenLayers.Geometry.Point(parseFloat(coords[3]), point = new OpenLayers.Geometry.Point(coords[3], coords[0]);
parseFloat(coords[0]));
components.push(point); components.push(point);
point = new OpenLayers.Geometry.Point(parseFloat(coords[1]), point = new OpenLayers.Geometry.Point(coords[1], coords[0]);
parseFloat(coords[0]));
components.push(point); components.push(point);
} }
geometry = new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(components)]); geometry = new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(components)]);
lib/OpenLayers/Format/WMC/v1.js
+2 -4
View File
@@ -147,10 +147,8 @@ OpenLayers.Format.WMC.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
read_wmc_BoundingBox: function(context, node) { read_wmc_BoundingBox: function(context, node) {
context.projection = node.getAttribute("SRS"); context.projection = node.getAttribute("SRS");
context.bounds = new OpenLayers.Bounds( context.bounds = new OpenLayers.Bounds(
parseFloat(node.getAttribute("minx")), node.getAttribute("minx"), node.getAttribute("miny"),
parseFloat(node.getAttribute("miny")), node.getAttribute("maxx"), node.getAttribute("maxy")
parseFloat(node.getAttribute("maxx")),
parseFloat(node.getAttribute("maxy"))
); );
}, },