Changeset 557

Timestamp:

Jun 13, 2007, 6:38:41 PM (14 years ago)

Author:

Nick Burch

Message:

Finish off NI support

Location:

trunk/npemap.org.uk/static/tiles

Files:

• grid.css (modified) (1 diff)
• ni-raw-map.html (modified) (1 diff)
• ni-raw-mapTiles.js (modified) (15 diffs)

trunk/npemap.org.uk/static/tiles/grid.css

@@ -29 +29 @@
 }
 
-#postcode_form {
+#postcode_form,#location_form {
   line-height: 100%;
   background-color: white;

trunk/npemap.org.uk/static/tiles/ni-raw-map.html

@@ -64 +64 @@
   <div id="location_form">
     <div class="close"><a href="javascript:closeLocationWindow()" title="close">X</a></div>
-                <div><span id="location"></span></div>
-    <div><p><strong>Please email ni@npemap.org.uk with the raw location below, and the real WGS84 location that corresponds to</strong></p></div>
+                <div><span id="location"></span></div><br />
+    <div><b>Please email ni@npemap.org.uk with the raw location below, and the real WGS84 location that corresponds to</b></div><br />
     <div id="easting"></div>
     <div id="northing"></div>

trunk/npemap.org.uk/static/tiles/ni-raw-mapTiles.js

@@ -14 +14 @@
 var markerYOffset = 11;
 
-var offsetGridX = 450;
-var offsetGridY = 207;
+var offsetGridX = 259;
+var offsetGridY = 036;
 
 var zoomLevel = 1;
@@ -31 +31 @@
 prefixes[3] =  "scaled6/";
 prefixes[4] =  "scaled12/";
+prefixes[5] =  "scaled24/";
 
 var jumpOut = new Array(1);
@@ -36 +37 @@
 jumpOut[2] = 2;
 jumpOut[3] = 2;
+jumpOut[4] = 2;
 var jumpIn = new Array(1);
 jumpIn[2] = 3;
 jumpIn[3] = 2;
 jumpIn[4] = 2;
+jumpIn[5] = 2;
 
 var zooms = new Array(1);
@@ -46 +49 @@
 zooms[3] = 6;
 zooms[4] = 12;
+zooms[5] = 24;
 
 
@@ -54 +58 @@
 
 var markerElement;
-var postcodeFormElement;
+var locationFormElement;
 var mainPageElement;
 
@@ -76 +80 @@
 
 
-function showPostcodeWindow(easting, northing, x, y) {
-    hideMarkerWindow();
-
+function showLocationWindow(easting, northing, x, y) {
     var easting = trimSixDigits(Math.round(easting));
     var northing = trimSixDigits(Math.round(northing));
@@ -85 +87 @@
     YAHOO.util.Dom.setXY(markerElement, [(x-markerXOffset), (y-markerYOffset)]);
     
-    postcodeFormElement.style.display = 'block';
-    YAHOO.util.Dom.setXY(postcodeFormElement, [Math.max(0, (x-50)), (y-180) < 0 ? (y+10):(y-180)]);
+    locationFormElement.style.display = 'block';
+    YAHOO.util.Dom.setXY(locationFormElement, [Math.max(0, (x-50)), (y-180) < 0 ? (y+10):(y-180)]);
     
-   // Compute lat+long
-   var en = new OSRef(easting,northing);
-   var latlong = en.toLatLng();
-   var lat = Math.round(latlong.lat*10000) / 10000;
-   var lng = Math.round(latlong.lng*10000) / 10000;
-   
-
-    $('location').innerHTML = easting + ', ' + northing + " (" + lat + ", " + lng + ")";
-    $('easting').value = easting;
-    $('northing').value = northing;
-    $('returnX').value = offsetGridX;
-    $('returnY').value = offsetGridY;
-    $('grid').value = grid;
-    $('grid2').value = grid;
+    $('location').innerHTML = easting + ', ' + northing;
+    $('easting').innerHTML = "The raw easting is " + easting;
+    $('northing').innerHTML = "The raw northing is " + northing;
 
     $('postcode1').value = "";
@@ -123 +114 @@
            onComplete: function(o) {drawExisting(); updateStatus(o);  }
  });
- closePostcodeWindow();
+ closeLocationWindow();
  YAHOO.util.Event.preventDefault(e);
 }
 
 
-function closePostcodeWindow() {
-  postcodeFormElement.style.display = 'none';
+function closeLocationWindow() {
+  locationFormElement.style.display = 'none';
   markerElement.style.visibility = 'hidden';
 }
-
-function showMarkerWindow(x,y, postcode, easting, northing, source, id) {
-  closePostcodeWindow();
-   // Compute lat+long
-   var en = new OSRef(easting,northing);
-   var latlong = en.toLatLng();
-   var lat = Math.round(latlong.lat*10000) / 10000;
-   var lng = Math.round(latlong.lng*10000) / 10000;
-
-   // Display
-   $('location_detail').innerHTML = easting + ", "+northing;
-   $('latlong_detail').innerHTML = lat + ", " + lng;
-   $('postcode_detail').innerHTML = postcode;
-   $('postcode_id_detail').value= id; 
-   $('reason_email').value= ''; 
-   $('reason').value= ''; 
-   $('grid').value = grid;
-   $('grid2').value = grid;
-   $('source_detail').innerHTML = ((source == 0) ? 'this site' : '<a href="http://www.freethepostcode.org/">freethepostcode.org</a>');
-   $('postcode_detail_window').style.display = 'block';
-   $('bad').style.display = '';
-   $('report_form').style.display = 'none';
-   YAHOO.util.Dom.setXY('postcode_detail_window', [Math.max(0, (x-50)), (y-100) < 0 ? (y+10):(y-100)]);
-}
-
-function hideMarkerWindow() {
-   $('postcode_detail_window').style.display = 'none';
-}
-
 
 // MAP METHODS --------------------------------------------
@@ -185 +147 @@
     } else {
     
-      showPostcodeWindow(((baseEasting  + tileXratio)*1000), ((baseNorthing +tileYratio)*1000), x, y); 
+      showLocationWindow(((baseEasting  + tileXratio)*1000), ((baseNorthing +tileYratio)*1000), x, y); 
 
     }
@@ -196 +158 @@
 function zoomOut() {
         if(zoomLevel == (prefixes.length-1)) {
-    location.href="allmaps.html";
+                //location.href="allmaps.html";
                 return;
         }
@@ -220 +182 @@
     Element.hide('zoomin_enabled');
     Element.show('zoomin_disabled');
-    Element.show('showHideMarkers');
         } else {
     Element.show('zoomin_enabled');
     Element.hide('zoomin_disabled');
-    Element.hide('showHideMarkers');
   }
 }
@@ -266 +226 @@
 function initializePage() {
         markerElement = $('marker');
-        postcodeFormElement = $('postcode_form');
+        locationFormElement = $('location_form');
     mainPageElement = $('main_page');
 
@@ -300 +260 @@
       zoomLevel = urlterms[2]-0 ;
     }
-
-    grid = 'osgb';
-    if(urlterms.length > 3) {
-      if(urlterms[3] == 'ie') {
-         grid = 'osie';
-      }
-    }
   }
 }
@@ -341 +294 @@
 
 function refreshGrid() {
-  closePostcodeWindow();
-  hideMarkerWindow();
+  closeLocationWindow();
 
         for(var x=1; x<=sizeGridX; x++) {
@@ -608 +560 @@
  });
   if (typeof urchinTracker == 'function') urchinTracker('/tiles/reportBad');
- hideMarkerWindow();
  YAHOO.util.Event.preventDefault(e);
 }