X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fbc431f4646ae7086956e0b05074a603e7861176..945e4ddcc85bd8d0ec1b1c950a1af5c98e9460b8:/app/views/site/index.rhtml?ds=sidebyside diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml index d6a0fe8a3..f409ba537 100644 --- a/app/views/site/index.rhtml +++ b/app/views/site/index.rhtml @@ -1,11 +1,11 @@
- <%= 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' %> - <%= end_form_tag %> + <% end %>
Geolocation provided by npemap.org.uk, @@ -93,25 +93,29 @@ 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.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(); } + 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 ) { @@ -166,6 +170,10 @@ el.style.height = new_height + 'px'; } map.updateSize(); + el.style.display = 'none'; + setTimeout( function() { + el.style.display = ''; + }, 200 ); } if( ie6 ) {