missing var's, p=jorix (thx), r=me (closes #2960)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@10951 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Éric Lemoine
2010-12-06 20:15:15 +00:00
parent b125e045d1
commit 831420aac2
6 changed files with 11 additions and 11 deletions
+2 -2
View File
@@ -162,10 +162,10 @@ OpenLayers.Format.GPX = OpenLayers.Class(OpenLayers.Format.XML, {
// node is either a wpt, trk or rte // node is either a wpt, trk or rte
// attributes are children of the form <attr>value</attr> // attributes are children of the form <attr>value</attr>
var attributes = {}; var attributes = {};
var attrNode = node.firstChild; var attrNode = node.firstChild, value, name;
while(attrNode) { while(attrNode) {
if(attrNode.nodeType == 1) { if(attrNode.nodeType == 1) {
var value = attrNode.firstChild; value = attrNode.firstChild;
if(value.nodeType == 3 || value.nodeType == 4) { if(value.nodeType == 3 || value.nodeType == 4) {
name = (attrNode.prefix) ? name = (attrNode.prefix) ?
attrNode.nodeName.split(":")[1] : attrNode.nodeName.split(":")[1] :
+2 -3
View File
@@ -353,11 +353,10 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
var types = ["LineStyle", "PolyStyle", "IconStyle", "BalloonStyle", var types = ["LineStyle", "PolyStyle", "IconStyle", "BalloonStyle",
"LabelStyle"]; "LabelStyle"];
var type, nodeList, geometry, parser; var type, styleTypeNode, nodeList, geometry, parser;
for(var i=0, len=types.length; i<len; ++i) { for(var i=0, len=types.length; i<len; ++i) {
type = types[i]; type = types[i];
styleTypeNode = this.getElementsByTagNameNS(node, styleTypeNode = this.getElementsByTagNameNS(node, "*", type)[0];
"*", type)[0];
if(!styleTypeNode) { if(!styleTypeNode) {
continue; continue;
} }
+3 -2
View File
@@ -374,13 +374,14 @@ OpenLayers.Format.OSM = OpenLayers.Class(OpenLayers.Format.XML, {
return already_exists ? [] : [node]; return already_exists ? [] : [node];
}, },
linestring: function(feature) { linestring: function(feature) {
var id;
var nodes = []; var nodes = [];
var geometry = feature.geometry; var geometry = feature.geometry;
if (feature.osm_id) { if (feature.osm_id) {
id = feature.osm_id; id = feature.osm_id;
} else { } else {
id = -this.osm_id; id = -this.osm_id;
this.osm_id++; this.osm_id++;
} }
var way = this.createElementNS(null, "way"); var way = this.createElementNS(null, "way");
way.setAttribute("id", id); way.setAttribute("id", id);
+1 -1
View File
@@ -162,7 +162,7 @@ OpenLayers.Handler.Polygon = OpenLayers.Class(OpenLayers.Handler.Path, {
// ensure that new ring doesn't contain any other rings // ensure that new ring doesn't contain any other rings
var target; var target;
outer: for (var i=rings.length-2; i>0; --i) { outer: for (var i=rings.length-2; i>0; --i) {
points = rings[i].components; var points = rings[i].components;
for (var j=0, jj=points.length; j<jj; ++j) { for (var j=0, jj=points.length; j<jj; ++j) {
if (ring.containsPoint(points[j])) { if (ring.containsPoint(points[j])) {
modified = false; modified = false;
+1 -1
View File
@@ -219,7 +219,7 @@ OpenLayers.Layer.Zoomify = OpenLayers.Class(OpenLayers.Layer.Grid, {
*/ */
getImageSize: function() { getImageSize: function() {
if (arguments.length > 0) { if (arguments.length > 0) {
bounds = this.adjustBounds(arguments[0]); var bounds = this.adjustBounds(arguments[0]);
var res = this.map.getResolution(); var res = this.map.getResolution();
var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tileSize.w)); var x = Math.round((bounds.left - this.tileOrigin.lon) / (res * this.tileSize.w));
var y = Math.round((this.tileOrigin.lat - bounds.top) / (res * this.tileSize.h)); var y = Math.round((this.tileOrigin.lat - bounds.top) / (res * this.tileSize.h));
+2 -2
View File
@@ -181,8 +181,8 @@ OpenLayers.Renderer = OpenLayers.Class({
if(style.display != "none" && style.label && rendered !== false) { if(style.display != "none" && style.label && rendered !== false) {
var location = feature.geometry.getCentroid(); var location = feature.geometry.getCentroid();
if(style.labelXOffset || style.labelYOffset) { if(style.labelXOffset || style.labelYOffset) {
xOffset = isNaN(style.labelXOffset) ? 0 : style.labelXOffset; var xOffset = isNaN(style.labelXOffset) ? 0 : style.labelXOffset;
yOffset = isNaN(style.labelYOffset) ? 0 : style.labelYOffset; var yOffset = isNaN(style.labelYOffset) ? 0 : style.labelYOffset;
var res = this.getResolution(); var res = this.getResolution();
location.move(xOffset*res, yOffset*res); location.move(xOffset*res, yOffset*res);
} }