From 65d394704503a88a24755bfcef528a1d38d6598e Mon Sep 17 00:00:00 2001
From: Paul Spencer <pspencer@dmsolutions.ca>
Date: Fri, 19 Oct 2007 18:34:00 +0000
Subject: [PATCH] remove local scope variables from global namespace.

git-svn-id: http://svn.openlayers.org/trunk/openlayers@5028 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
---
 lib/OpenLayers/Ajax.js                 | 2 +-
 lib/OpenLayers/Control/MouseToolbar.js | 2 +-
 lib/OpenLayers/Control/PanZoomBar.js   | 2 +-
 lib/OpenLayers/Format/GML.js           | 2 +-
 lib/OpenLayers/Format/KML.js           | 6 +++---
 lib/OpenLayers/Geometry/Polygon.js     | 2 +-
 lib/OpenLayers/Layer/EventPane.js      | 4 ++--
 lib/OpenLayers/Layer/GeoRSS.js         | 4 ++--
 lib/OpenLayers/Layer/Markers.js        | 2 +-
 lib/OpenLayers/Layer/Text.js           | 2 +-
 lib/OpenLayers/Map.js                  | 2 +-
 lib/OpenLayers/Tile.js                 | 2 +-
 lib/OpenLayers/Util.js                 | 6 +++---
 13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/OpenLayers/Ajax.js b/lib/OpenLayers/Ajax.js
index da2fde9967..d22443f9e5 100644
--- a/lib/OpenLayers/Ajax.js
+++ b/lib/OpenLayers/Ajax.js
@@ -526,6 +526,6 @@ OpenLayers.Ajax.getElementsByTagNameNS  = function(parentnode, nsuri,
  */
 OpenLayers.Ajax.serializeXMLToString = function(xmldom) {
     var serializer = new XMLSerializer();
-    data = serializer.serializeToString(xmldom);
+    var data = serializer.serializeToString(xmldom);
     return data;
 };
diff --git a/lib/OpenLayers/Control/MouseToolbar.js b/lib/OpenLayers/Control/MouseToolbar.js
index a355fe84ee..4cae7fb6fd 100644
--- a/lib/OpenLayers/Control/MouseToolbar.js
+++ b/lib/OpenLayers/Control/MouseToolbar.js
@@ -206,7 +206,7 @@ OpenLayers.Control.MouseToolbar = OpenLayers.Class(
             case "measure":
                 var distance = "";
                 if (this.measureStart) {
-                    measureEnd = this.map.getLonLatFromViewPortPx(this.mouseDragStart);
+                    var measureEnd = this.map.getLonLatFromViewPortPx(this.mouseDragStart);
                     distance = OpenLayers.Util.distVincenty(this.measureStart, measureEnd);
                     distance = Math.round(distance * 100) / 100;
                     distance = distance + "km";
diff --git a/lib/OpenLayers/Control/PanZoomBar.js b/lib/OpenLayers/Control/PanZoomBar.js
index f5f4b14455..ba4d2ccf3c 100644
--- a/lib/OpenLayers/Control/PanZoomBar.js
+++ b/lib/OpenLayers/Control/PanZoomBar.js
@@ -152,7 +152,7 @@ OpenLayers.Control.PanZoomBar = OpenLayers.Class(OpenLayers.Control.PanZoom, {
         this.sliderEvents.register("dblclick", 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.w = this.zoomStopWidth;
         var div = null;
diff --git a/lib/OpenLayers/Format/GML.js b/lib/OpenLayers/Format/GML.js
index 83c74bf5fc..5b22f68033 100644
--- a/lib/OpenLayers/Format/GML.js
+++ b/lib/OpenLayers/Format/GML.js
@@ -203,7 +203,7 @@ OpenLayers.Format.GML = OpenLayers.Class(OpenLayers.Format.XML, {
             // look for <gml:pos>
             var nodeList = this.getElementsByTagNameNS(node, this.gmlns, "pos");
             if(nodeList.length > 0) {
-                coordString = nodeList[0].firstChild.nodeValue;
+                var coordString = nodeList[0].firstChild.nodeValue;
                 coordString = coordString.replace(this.regExes.trimSpace, "");
                 coords = coordString.split(this.regExes.splitSpace);
             }
diff --git a/lib/OpenLayers/Format/KML.js b/lib/OpenLayers/Format/KML.js
index 5943ba7a43..d559109e7e 100644
--- a/lib/OpenLayers/Format/KML.js
+++ b/lib/OpenLayers/Format/KML.js
@@ -302,7 +302,7 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
             for(var i=0; i<children.length; ++i ) {
                 child = children[i];
                 if(child.nodeType == 1) {
-                    type = (child.prefix) ?
+                    var type = (child.prefix) ?
                             child.nodeName.split(":")[1] :
                             child.nodeName;
                     var parser = this.parseGeometry[type.toLowerCase()];
@@ -337,10 +337,10 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, {
                 if(grandchildren.length == 1) {
                     grandchild = grandchildren[0];
                     if(grandchild.nodeType == 3 || grandchild.nodeType == 4) {
-                        name = (child.prefix) ?
+                        var name = (child.prefix) ?
                                 child.nodeName.split(":")[1] :
                                 child.nodeName;
-                        value = grandchild.nodeValue.replace(
+                        var value = grandchild.nodeValue.replace(
                                                 this.regExes.trimSpace, "");
                         attributes[name] = value;
                     }
diff --git a/lib/OpenLayers/Geometry/Polygon.js b/lib/OpenLayers/Geometry/Polygon.js
index 15b6ffdf00..199f3aa95e 100644
--- a/lib/OpenLayers/Geometry/Polygon.js
+++ b/lib/OpenLayers/Geometry/Polygon.js
@@ -79,7 +79,7 @@ OpenLayers.Geometry.Polygon.createRegularPolygon = function(origin, radius, side
     var rotateAngle, x, y;
     var points = [];
     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));
         y = origin.y + (radius * Math.sin(rotatedAngle));
         points.push(new OpenLayers.Geometry.Point(x, y));
diff --git a/lib/OpenLayers/Layer/EventPane.js b/lib/OpenLayers/Layer/EventPane.js
index ba93b63d25..3c8a75cd07 100644
--- a/lib/OpenLayers/Layer/EventPane.js
+++ b/lib/OpenLayers/Layer/EventPane.js
@@ -136,8 +136,8 @@ OpenLayers.Layer.EventPane = OpenLayers.Class(OpenLayers.Layer, {
 
         var viewSize = this.map.getSize();
         
-        msgW = Math.min(viewSize.w, 300);
-        msgH = Math.min(viewSize.h, 200);
+        var msgW = Math.min(viewSize.w, 300);
+        var msgH = Math.min(viewSize.h, 200);
         var size = new OpenLayers.Size(msgW, msgH);
 
         var centerPx = new OpenLayers.Pixel(viewSize.w/2, viewSize.h/2);
diff --git a/lib/OpenLayers/Layer/GeoRSS.js b/lib/OpenLayers/Layer/GeoRSS.js
index a3db84f227..12514e1884 100644
--- a/lib/OpenLayers/Layer/GeoRSS.js
+++ b/lib/OpenLayers/Layer/GeoRSS.js
@@ -193,7 +193,7 @@ OpenLayers.Layer.GeoRSS = OpenLayers.Class(OpenLayers.Layer.Markers, {
             
             data.popupSize = this.popupSize ? this.popupSize.clone() : new OpenLayers.Size(250, 120);
             if ((title != null) && (description != null)) {
-                contentHTML = '<div class="olLayerGeoRSSClose">[x]</div>'; 
+                var contentHTML = '<div class="olLayerGeoRSSClose">[x]</div>'; 
                 contentHTML += '<div class="olLayerGeoRSSTitle">';
                 if (link) {
                     contentHTML += '<a class="link" href="'+link+'" target="_blank">';
@@ -224,7 +224,7 @@ OpenLayers.Layer.GeoRSS = OpenLayers.Class(OpenLayers.Layer.Markers, {
      * evt - {Event} 
      */
     markerClick: function(evt) {
-        sameMarkerClicked = (this == this.layer.selectedFeature);
+        var sameMarkerClicked = (this == this.layer.selectedFeature);
         this.layer.selectedFeature = (!sameMarkerClicked) ? this : null;
         for(var i=0; i < this.layer.map.popups.length; i++) {
             this.layer.map.removePopup(this.layer.map.popups[i]);
diff --git a/lib/OpenLayers/Layer/Markers.js b/lib/OpenLayers/Layer/Markers.js
index 64a44563d4..ba5b30592b 100644
--- a/lib/OpenLayers/Layer/Markers.js
+++ b/lib/OpenLayers/Layer/Markers.js
@@ -70,7 +70,7 @@ OpenLayers.Layer.Markers = OpenLayers.Class(OpenLayers.Layer, {
         OpenLayers.Layer.prototype.moveTo.apply(this, arguments);
 
         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.drawn = true;
diff --git a/lib/OpenLayers/Layer/Text.js b/lib/OpenLayers/Layer/Text.js
index 67757637eb..3a7d2f6d95 100644
--- a/lib/OpenLayers/Layer/Text.js
+++ b/lib/OpenLayers/Layer/Text.js
@@ -90,7 +90,7 @@ OpenLayers.Layer.Text = OpenLayers.Class(OpenLayers.Layer.Markers, {
                 } else {
                     var vals = currLine.split('\t');
                     var location = new OpenLayers.LonLat(0,0);
-                    var title; var url;
+                    var title, url, description;
                     var icon, iconSize, iconOffset, overflow;
                     var set = false;
                     for (var valIndex = 0; valIndex < vals.length; valIndex++) {
diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js
index b4317aeeba..ba1c0c9779 100644
--- a/lib/OpenLayers/Map.js
+++ b/lib/OpenLayers/Map.js
@@ -591,7 +591,7 @@ OpenLayers.Map = OpenLayers.Class({
         // if we removed the base layer, need to set a new one
         if (setNewBaseLayer && (this.baseLayer == layer)) {
             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];
                 if (iLayer.isBaseLayer) {
                     this.setBaseLayer(iLayer);
diff --git a/lib/OpenLayers/Tile.js b/lib/OpenLayers/Tile.js
index a368edcd87..77569bfeef 100644
--- a/lib/OpenLayers/Tile.js
+++ b/lib/OpenLayers/Tile.js
@@ -208,7 +208,7 @@ OpenLayers.Tile = OpenLayers.Class({
                 bottomRight.lon = 180+bottomRight.lon+180;
             }        
         }
-        bounds = new OpenLayers.Bounds(topLeft.lon, 
+        var bounds = new OpenLayers.Bounds(topLeft.lon, 
                                        bottomRight.lat, 
                                        bottomRight.lon, 
                                        topLeft.lat);  
diff --git a/lib/OpenLayers/Util.js b/lib/OpenLayers/Util.js
index a883415105..121d99f769 100644
--- a/lib/OpenLayers/Util.js
+++ b/lib/OpenLayers/Util.js
@@ -520,7 +520,7 @@ OpenLayers.Util.applyDefaults = function (to, from) {
  *          of being URL escaped (foo%3Abar). 
  */
 OpenLayers.Util.getParameterString = function(params) {
-    paramsArray = [];
+    var paramsArray = [];
     
     for (var key in params) {
       var value = params[key];
@@ -1070,8 +1070,8 @@ OpenLayers.Util.isEquivalentUrl = function(url1, url2, options) {
         ignoreHash: true
     });
 
-    urlObj1 = OpenLayers.Util.createUrlObject(url1, options);
-    urlObj2 = OpenLayers.Util.createUrlObject(url2, options);
+    var urlObj1 = OpenLayers.Util.createUrlObject(url1, options);
+    var urlObj2 = OpenLayers.Util.createUrlObject(url2, options);
 
     //compare all keys (host, port, etc)
     for(var key in urlObj1) {