Set the lat and long on the view and edit tabs when the map is loaded.

[rails.git] / app / views / site / index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index d6a0fe8a325eb9544fd6d25fd69212cccc0653fd..f409ba5373e223dda6a331d73ff6ef016fac2430 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,11 +1,11 @@
 
 
 <div id="geocoder">
 
 
 <div id="geocoder">

-  <%= start_form_tag :controller => 'geocoder', :action => 'search' %>
+  <% form_tag :controller => 'geocoder', :action => 'search' do %>

   <%= text_field 'query', 'postcode' %>
   <%= text_field 'query', 'place_name'%>
   <%= submit_tag 'Search' %>
   <%= text_field 'query', 'postcode' %>
   <%= text_field 'query', 'place_name'%>
   <%= submit_tag 'Search' %>

-  <%= end_form_tag %>
+  <% end %>

 
   <div id="geocoder-attribution">
     Geolocation provided by <a href="http://npemap.org.uk/">npemap.org.uk</a>,
 
   <div id="geocoder-attribution">
     Geolocation provided by <a href="http://npemap.org.uk/">npemap.org.uk</a>,


@@ -93,25 +93,29 @@
     markers.addMarker(marker);
     <%end%>
 
     markers.addMarker(marker);
     <%end%>
 

-      map.addControl(new OpenLayers.Control.LayerSwitcher());
+    map.addControl(new OpenLayers.Control.LayerSwitcher());

     map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
 
     map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
 

-    map.events.register("moveend", map, function() { 
-        var lonlat = map.getCenter();
-
-        var lon_deg = (lonlat.lon / 20037508.34) * 180;
-        var lat_deg = (lonlat.lat / 20037508.34) * 180;
-        var PI = 3.14159265358979323846;
-        lat_deg = 180/PI * (2 * Math.atan(Math.exp(lat_deg * PI / 180)) - PI / 2);
-        var zoom = map.getZoom();
-        updatelinks(lon_deg,lat_deg,zoom);
-        });
+    map.events.register("moveend", map, updateLocation);

     document.getElementById( 'map_OpenLayers_ViewPort' ).style.position = 'absolute';
     if( ie6 ) {
       handleResize();
     }
     document.getElementById( 'map_OpenLayers_ViewPort' ).style.position = 'absolute';
     if( ie6 ) {
       handleResize();
     }

+    updateLocation();

   }        
 
   }        
 

+  function updateLocation() {
+    var lonlat = map.getCenter();
+
+    var lon_deg = (lonlat.lon / 20037508.34) * 180;
+    var lat_deg = (lonlat.lat / 20037508.34) * 180;
+    var PI = 3.14159265358979323846;
+    lat_deg = 180/PI * (2 * Math.atan(Math.exp(lat_deg * PI / 180)) - PI / 2);
+    var zoom = map.getZoom();
+
+    updatelinks(lon_deg,lat_deg,zoom);
+  }
+

   function getStyle( el, property ) {
     var style;
     if( el.currentStyle ) {
   function getStyle( el, property ) {
     var style;
     if( el.currentStyle ) {


@@ -166,6 +170,10 @@
       el.style.height = new_height + 'px';
     }
     map.updateSize();
       el.style.height = new_height + 'px';
     }
     map.updateSize();

+    el.style.display = 'none';
+    setTimeout( function() {
+        el.style.display = '';
+        }, 200 );

   }
 
 if( ie6 ) {
   }
 
 if( ie6 ) {