remove local scope variables from global namespace.

git-svn-id: http://svn.openlayers.org/trunk/openlayers@5028 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Paul Spencer
2007-10-19 18:34:00 +00:00
parent 4bafcddff1
commit 65d3947045
13 changed files with 19 additions and 19 deletions

View File

@@ -526,6 +526,6 @@ OpenLayers.Ajax.getElementsByTagNameNS = function(parentnode, nsuri,
*/ */
OpenLayers.Ajax.serializeXMLToString = function(xmldom) { OpenLayers.Ajax.serializeXMLToString = function(xmldom) {
var serializer = new XMLSerializer(); var serializer = new XMLSerializer();
data = serializer.serializeToString(xmldom); var data = serializer.serializeToString(xmldom);
return data; return data;
}; };

View File

@@ -206,7 +206,7 @@ OpenLayers.Control.MouseToolbar = OpenLayers.Class(
case "measure": case "measure":
var distance = ""; var distance = "";
if (this.measureStart) { if (this.measureStart) {
measureEnd = this.map.getLonLatFromViewPortPx(this.mouseDragStart); var measureEnd = this.map.getLonLatFromViewPortPx(this.mouseDragStart);
distance = OpenLayers.Util.distVincenty(this.measureStart, measureEnd); distance = OpenLayers.Util.distVincenty(this.measureStart, measureEnd);
distance = Math.round(distance * 100) / 100; distance = Math.round(distance * 100) / 100;
distance = distance + "km"; distance = distance + "km";

View File

@@ -152,7 +152,7 @@ OpenLayers.Control.PanZoomBar = OpenLayers.Class(OpenLayers.Control.PanZoom, {
this.sliderEvents.register("dblclick", this, this.doubleClick); this.sliderEvents.register("dblclick", this, this.doubleClick);
this.sliderEvents.register("click", this, this.doubleClick); this.sliderEvents.register("click", this, this.doubleClick);
sz = new OpenLayers.Size(); var sz = new OpenLayers.Size();
sz.h = this.zoomStopHeight * this.map.getNumZoomLevels(); sz.h = this.zoomStopHeight * this.map.getNumZoomLevels();
sz.w = this.zoomStopWidth; sz.w = this.zoomStopWidth;
var div = null; var div = null;

View File

@@ -203,7 +203,7 @@ OpenLayers.Format.GML = OpenLayers.Class(OpenLayers.Format.XML, {
// look for <gml:pos> // look for <gml:pos>
var nodeList = this.getElementsByTagNameNS(node, this.gmlns, "pos"); var nodeList = this.getElementsByTagNameNS(node, this.gmlns, "pos");
if(nodeList.length > 0) { if(nodeList.length > 0) {
coordString = nodeList[0].firstChild.nodeValue; var coordString = nodeList[0].firstChild.nodeValue;
coordString = coordString.replace(this.regExes.trimSpace, ""); coordString = coordString.replace(this.regExes.trimSpace, "");
coords = coordString.split(this.regExes.splitSpace); coords = coordString.split(this.regExes.splitSpace);
} }

View File

@@ -302,7 +302,7 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
for(var i=0; i<children.length; ++i ) { for(var i=0; i<children.length; ++i ) {
child = children[i]; child = children[i];
if(child.nodeType == 1) { if(child.nodeType == 1) {
type = (child.prefix) ? var type = (child.prefix) ?
child.nodeName.split(":")[1] : child.nodeName.split(":")[1] :
child.nodeName; child.nodeName;
var parser = this.parseGeometry[type.toLowerCase()]; var parser = this.parseGeometry[type.toLowerCase()];
@@ -337,10 +337,10 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
if(grandchildren.length == 1) { if(grandchildren.length == 1) {
grandchild = grandchildren[0]; grandchild = grandchildren[0];
if(grandchild.nodeType == 3 || grandchild.nodeType == 4) { if(grandchild.nodeType == 3 || grandchild.nodeType == 4) {
name = (child.prefix) ? var name = (child.prefix) ?
child.nodeName.split(":")[1] : child.nodeName.split(":")[1] :
child.nodeName; child.nodeName;
value = grandchild.nodeValue.replace( var value = grandchild.nodeValue.replace(
this.regExes.trimSpace, ""); this.regExes.trimSpace, "");
attributes[name] = value; attributes[name] = value;
} }

View File

@@ -79,7 +79,7 @@ OpenLayers.Geometry.Polygon.createRegularPolygon = function(origin, radius, side
var rotateAngle, x, y; var rotateAngle, x, y;
var points = []; var points = [];
for(var i=0; i<sides; ++i) { for(var i=0; i<sides; ++i) {
rotatedAngle = angle + (i * 2 * Math.PI / sides); var rotatedAngle = angle + (i * 2 * Math.PI / sides);
x = origin.x + (radius * Math.cos(rotatedAngle)); x = origin.x + (radius * Math.cos(rotatedAngle));
y = origin.y + (radius * Math.sin(rotatedAngle)); y = origin.y + (radius * Math.sin(rotatedAngle));
points.push(new OpenLayers.Geometry.Point(x, y)); points.push(new OpenLayers.Geometry.Point(x, y));

View File

@@ -136,8 +136,8 @@ OpenLayers.Layer.EventPane = OpenLayers.Class(OpenLayers.Layer, {
var viewSize = this.map.getSize(); var viewSize = this.map.getSize();
msgW = Math.min(viewSize.w, 300); var msgW = Math.min(viewSize.w, 300);
msgH = Math.min(viewSize.h, 200); var msgH = Math.min(viewSize.h, 200);
var size = new OpenLayers.Size(msgW, msgH); var size = new OpenLayers.Size(msgW, msgH);
var centerPx = new OpenLayers.Pixel(viewSize.w/2, viewSize.h/2); var centerPx = new OpenLayers.Pixel(viewSize.w/2, viewSize.h/2);

View File

@@ -193,7 +193,7 @@ OpenLayers.Layer.GeoRSS = OpenLayers.Class(OpenLayers.Layer.Markers, {
data.popupSize = this.popupSize ? this.popupSize.clone() : new OpenLayers.Size(250, 120); data.popupSize = this.popupSize ? this.popupSize.clone() : new OpenLayers.Size(250, 120);
if ((title != null) && (description != null)) { if ((title != null) && (description != null)) {
contentHTML = '<div class="olLayerGeoRSSClose">[x]</div>'; var contentHTML = '<div class="olLayerGeoRSSClose">[x]</div>';
contentHTML += '<div class="olLayerGeoRSSTitle">'; contentHTML += '<div class="olLayerGeoRSSTitle">';
if (link) { if (link) {
contentHTML += '<a class="link" href="'+link+'" target="_blank">'; contentHTML += '<a class="link" href="'+link+'" target="_blank">';
@@ -224,7 +224,7 @@ OpenLayers.Layer.GeoRSS = OpenLayers.Class(OpenLayers.Layer.Markers, {
* evt - {Event} * evt - {Event}
*/ */
markerClick: function(evt) { markerClick: function(evt) {
sameMarkerClicked = (this == this.layer.selectedFeature); var sameMarkerClicked = (this == this.layer.selectedFeature);
this.layer.selectedFeature = (!sameMarkerClicked) ? this : null; this.layer.selectedFeature = (!sameMarkerClicked) ? this : null;
for(var i=0; i < this.layer.map.popups.length; i++) { for(var i=0; i < this.layer.map.popups.length; i++) {
this.layer.map.removePopup(this.layer.map.popups[i]); this.layer.map.removePopup(this.layer.map.popups[i]);

View File

@@ -70,7 +70,7 @@ OpenLayers.Layer.Markers = OpenLayers.Class(OpenLayers.Layer, {
OpenLayers.Layer.prototype.moveTo.apply(this, arguments); OpenLayers.Layer.prototype.moveTo.apply(this, arguments);
if (zoomChanged || !this.drawn) { if (zoomChanged || !this.drawn) {
for(i=0; i < this.markers.length; i++) { for(var i=0; i < this.markers.length; i++) {
this.drawMarker(this.markers[i]); this.drawMarker(this.markers[i]);
} }
this.drawn = true; this.drawn = true;

View File

@@ -90,7 +90,7 @@ OpenLayers.Layer.Text = OpenLayers.Class(OpenLayers.Layer.Markers, {
} else { } else {
var vals = currLine.split('\t'); var vals = currLine.split('\t');
var location = new OpenLayers.LonLat(0,0); var location = new OpenLayers.LonLat(0,0);
var title; var url; var title, url, description;
var icon, iconSize, iconOffset, overflow; var icon, iconSize, iconOffset, overflow;
var set = false; var set = false;
for (var valIndex = 0; valIndex < vals.length; valIndex++) { for (var valIndex = 0; valIndex < vals.length; valIndex++) {

View File

@@ -591,7 +591,7 @@ OpenLayers.Map = OpenLayers.Class({
// if we removed the base layer, need to set a new one // if we removed the base layer, need to set a new one
if (setNewBaseLayer && (this.baseLayer == layer)) { if (setNewBaseLayer && (this.baseLayer == layer)) {
this.baseLayer = null; this.baseLayer = null;
for(i=0; i < this.layers.length; i++) { for(var i=0; i < this.layers.length; i++) {
var iLayer = this.layers[i]; var iLayer = this.layers[i];
if (iLayer.isBaseLayer) { if (iLayer.isBaseLayer) {
this.setBaseLayer(iLayer); this.setBaseLayer(iLayer);

View File

@@ -208,7 +208,7 @@ OpenLayers.Tile = OpenLayers.Class({
bottomRight.lon = 180+bottomRight.lon+180; bottomRight.lon = 180+bottomRight.lon+180;
} }
} }
bounds = new OpenLayers.Bounds(topLeft.lon, var bounds = new OpenLayers.Bounds(topLeft.lon,
bottomRight.lat, bottomRight.lat,
bottomRight.lon, bottomRight.lon,
topLeft.lat); topLeft.lat);

View File

@@ -520,7 +520,7 @@ OpenLayers.Util.applyDefaults = function (to, from) {
* of being URL escaped (foo%3Abar). * of being URL escaped (foo%3Abar).
*/ */
OpenLayers.Util.getParameterString = function(params) { OpenLayers.Util.getParameterString = function(params) {
paramsArray = []; var paramsArray = [];
for (var key in params) { for (var key in params) {
var value = params[key]; var value = params[key];
@@ -1070,8 +1070,8 @@ OpenLayers.Util.isEquivalentUrl = function(url1, url2, options) {
ignoreHash: true ignoreHash: true
}); });
urlObj1 = OpenLayers.Util.createUrlObject(url1, options); var urlObj1 = OpenLayers.Util.createUrlObject(url1, options);
urlObj2 = OpenLayers.Util.createUrlObject(url2, options); var urlObj2 = OpenLayers.Util.createUrlObject(url2, options);
//compare all keys (host, port, etc) //compare all keys (host, port, etc)
for(var key in urlObj1) { for(var key in urlObj1) {