Changeset 192

Timestamp:

Oct 26, 2006, 9:56:28 PM (14 years ago)

Author:

David Sheldon

Message:

Tidy up some code. Remove some unneeded variables.

File:

• trunk/npemap.org.uk/static/tiles/mapTiles.js (modified) (7 diffs)

trunk/npemap.org.uk/static/tiles/mapTiles.js

@@ -49 +49 @@
 
 var mapContainerElement;
-var mapElement;
 var markerElement;
 var postcodeFormElement;
-var locationElement;
 var mainPageElement;
 var spinnerElement;
@@ -116 +114 @@
       YAHOO.util.Dom.setXY(postcodeFormElement, [Math.max(0, (x-50)), (y-180) < 0 ? (y+10):(y-180)]);
       fixIE(postcodeFormElement);
-                        locationElement.innerHTML = easting + ', ' + northing ;
+                        $('location').innerHTML = easting + ', ' + northing ;
       $('easting').value = easting;
       $('northing').value = northing;
@@ -175 +173 @@
   sizeGridX = Math.round((screenWidth / tileWidth)-2)
   sizeGridY = Math.round((screenHeight / tileHeight)-1)
-  mapElement = $('map');
  
   page = ''
@@ -185 +182 @@
   }
   
-  mapElement.innerHTML = page
+  $('map').innerHTML = page
 }
 
@@ -198 +195 @@
 
 function initializePage() {
-                mapElement = $('map');
                 mapContainerElement = $('map_container');
                 markerElement = $('marker');
                 postcodeFormElement = $('postcode_form');
-                locationElement = $('location');
     mainPageElement = $('main_page');
     spinnerElement = $('spinner');
@@ -258 +253 @@
         for(var x=1; x<=sizeGridX; x++) {
                 for(var y=1; y<=sizeGridY; y++) {
-            // Update the table using the array data from position 0,0.
-            tileX = trimNumber(x+offsetGridX-Math.round(sizeGridX/2));
-            tileY = trimNumber(y+offsetGridY-Math.round(sizeGridY/2));
+            tileX = x+offsetGridX-Math.round(sizeGridX/2);
+            tileY = y+offsetGridY-Math.round(sizeGridY/2);
             $('element' + x + '.' + y).src = tileURL(tileX, tileY);
         }
@@ -280 +274 @@
 function tileURL(tileX, tileY) {
           var root = (tileX % 2) == 0 ? root1 : root2;
-                return root + prefixes[zoomLevel]+tileX+'/'+ tileY + '.jpg';
+                return root + prefixes[zoomLevel]+trimNumber(tileX)+'/'+ trimNumber(tileY) + '.jpg';
 }