Changeset 144

Timestamp:

Oct 23, 2006, 6:56:23 PM (14 years ago)

Author:

David Sheldon

Message:

Search now on the map page too, and added credit for Geonames.

Location:

trunk/npemap.org.uk/static

Files:

• default.css (modified) (1 diff)
• index.html (modified) (3 diffs)
• tiles/map.html (modified) (2 diffs)
• tiles/mapTiles.js (modified) (2 diffs)

trunk/npemap.org.uk/static/default.css

@@ -35 +35 @@
     margin: 4px;
 }
+
+span.terms {
+ margin-top: 0px;
+ font-family: sans;
+ font-size: 65%;
+ line-height: 100%;
+}

trunk/npemap.org.uk/static/index.html

@@ -47 +47 @@
 
 <form onsubmit="return find()">
-<p><label for="where">Place Name</label>
-<input id="where" name="where" /></p>
-<p><input type="submit" name="Zoom To" /></p>
+<p><label for="where">Place:</label>
+<input id="where" name="where" />
+<input type="submit" name="Zoom To" value="Go" /></p>
 </form>
+      <span class="terms">Functionality by <a href="http://geonames.org/">Geonames</a>.</span>
 </div>
 
@@ -83 +84 @@
     var easting = Math.round(en.easting/1000);
     var northing = Math.round(en.northing/1000);
-    window.location = urlFor(easting, northing, 1);
+    location.href = urlFor(easting, northing, 1);
   }
   else {
@@ -101 +102 @@
         var y = (img.height-(YAHOO.util.Event.getPageY(e) - imgPos[1])) * 2;
 
-        window.location=(urlFor(x, y, 1));
+        location.href=(urlFor(x, y, 1));
 
         YAHOO.util.Event.stopEvent(e);

trunk/npemap.org.uk/static/tiles/map.html

@@ -11 +11 @@
 <script src="event.js"></script> 
 <!-- Our functions -->
+<script src="jsr_class.js"></script> 
+<script src="jscoord-1.1.1.js"></script> 
 <script src="mapTiles.js"></script>
         <h1 id=theTitle>New Popular Edition Maps</h1>
@@ -50 +52 @@
                         <a href="/reportBug.html">problem?</a>
                 </div>
+                <div>
+      <form onsubmit="return find()">
+      <p><label for="where">Place name:</label><br/>
+      <input id="where" name="where" />
+      <input type="submit" name="Zoom To" value="Go" /></p>
+      </form>
+      <span class="terms">Functionality by <a href="http://geonames.org/">Geonames</a>.</span>
+                </div>
+</div>
 </div>
 <div id="map_container" style="float:left">

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

@@ -224 +224 @@
 }
 
+function gotoLocation(easting, northing, zoom) {
+  offsetGridX = easting; 
+  offsetGridY = northing;
+  zoomLevel = zoom;
+  refreshGrid();
+}
+
 
 // Need to use substring for IE, and it doesn't take negative numbers.
@@ -360 +367 @@
 
 
-
-
+function find() {
+   request = 'http://ws.geonames.org/searchJSON?name=' +  encodeURIComponent(document.getElementById('where').value)  + '&maxRows=1&callback=getLocation&country=GB&fclass=P&style=SHORT';
+  aObj = new JSONscriptRequest(request);
+  // Build the script tag
+  aObj.buildScriptTag();
+  // Execute (add) the script tag
+  aObj.addScriptTag();
+  return false;
+}
+// this function will be called by our JSON callback
+function getLocation(jData) {
+  if (jData == null) {
+    // There was a problem parsing search results
+    return;
+  }
+
+  var geonames = jData.geonames;
+  if (geonames.length > 0) {
+    var name = geonames[0];
+    var ll = new LatLng(name.lat,name.lng);
+    ll.WGS84ToOSGB36();
+    var en = ll.toOSRef();
+    var easting = Math.round(en.easting/1000);
+    var northing = Math.round(en.northing/1000);
+    gotoLocation(easting, northing, 1);
+    
+    document.getElementById('where').value = '';
+  }
+  else {
+    alert("Sorry, can't find that location"); 
+  }
+}
+
+