X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2e03861300bca1a44d50a9e9c684ffc0e2d6ad65..2660ce1868fa8f27d8285e4afe55a7ce05e8d212:/app/views/site/index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 878720efc..94b24debf 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -77,30 +77,28 @@ by the OpenStreetMap project and it's contributors.
 <%= javascript_include_tag 'map.js' %>
 
 
-<script type="text/javascript">
+<script type="text/javascript" defer="defer">
   <!--
   var brokenContentSize = $("content").offsetWidth == 0;
   var marker;
   var map;
 
-  function init(){
+  function mapInit(){
     map = createMap("map");
 
     <% if bbox %>
-    var min = lonLatToMercator(new OpenLayers.LonLat(<%= minlon %>, <%= minlat %>));
-    var max = lonLatToMercator(new OpenLayers.LonLat(<%= maxlon %>, <%= maxlat %>));
-    var bbox = new OpenLayers.Bounds(min.lon, min.lat, max.lon, max.lat);
+    var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
 
-    map.zoomToExtent(bbox);
+    setMapExtent(bbox);
     <% else %>
-    var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>));
+    var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
     var zoom = <%= zoom %>;
 
     <% if params['scale'] and params['scale'].length > 0 then %>
     zoom = scaleToZoom(<%= params['scale'].to_f() %>);
     <% end %>
 
-    map.setCenter(centre, zoom);
+    setMapCenter(centre, zoom);
     <% end %>
 
     <% if layers %>
@@ -108,35 +106,26 @@ by the OpenStreetMap project and it's contributors.
     <% end %>
 
     <% if marker %>
-    marker = addMarkerToMap(lonLatToMercator(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>)));
+    marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>));
     <% end %>
 
     map.events.register("zoomend", map, updateKey);
 
     map.events.register("moveend", map, updateLocation);
     map.events.register("changelayer", map, updateLocation);
-    map.events.register("click", map, mapClick);
     updateLocation();
 
     handleResize();
   }
 
-  // Map click results in feature lookup
-  function mapClick(e) {
-      var pos = lonLatToNonSphericalMercator
-                (mercatorToLonLat
-                    (map.getLonLatFromViewPortPx 
-                        ( map.events.getMousePosition(e))));
-  }
-
   function getPosition() {
-    return mercatorToLonLat(map.getCenter());
+    return getMapCenter();
   }
 
   function setPosition(lat, lon, zoom) {
-    var centre = lonLatToMercator(new OpenLayers.LonLat(lon, lat));
+    var centre = new OpenLayers.LonLat(lon, lat);
 
-    map.setCenter(centre, zoom);
+    setMapCenter(centre, zoom);
 
     if (marker)
       removeMarkerFromMap(marker);
@@ -145,7 +134,7 @@ by the OpenStreetMap project and it's contributors.
   }
 
   function updateLocation() {
-    var lonlat = mercatorToLonLat(map.getCenter());
+    var lonlat = getMapCenter();
     var zoom = map.getZoom();
     var layers = getMapLayers();
 
@@ -186,8 +175,14 @@ by the OpenStreetMap project and it's contributors.
 
     resizeMap();
   }
+  
+  mapInit();
 
+  window.onload = handleResize;
   window.onresize = handleResize;
-  window.onload = init;
+
+  <% if params['action'] == 'export' %>
+  <%= remote_function :url => { :controller => 'export', :action => 'start' } %>
+  <% end %>
 // -->
 </script>