split_node_tags: Merge changes in main branch up to r7649.

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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 875a28340364e38a5ae5222a75d45b1d673687a8..94b24debf54d41162759c182f069ab03e29d8108 100644 (file)
--- 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,80 +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))));
-
-    // put in the freemap url for the moment. this will be replaced
-    // by a ruby equivalent.
-       /*
-    url= 'http://www.free-map.org.uk/freemap/common/osmlookup.php?'+ 
-            'action=get&x='+pos.lon+'&y='+pos.lat;
-
-    OpenLayers.loadURL(url,/null, null,osmLookupCallback); 
-       */
-  }
-
-  // the feature lookup finds the nearest POI node, or, if no node could
-  // be found, the nearest way
-  /*
-  function osmLookupCallback (xmlHTTP) {
-    var nodes = xmlHTTP.responseXML.getElementsByTagName('node');
-    var ways = xmlHTTP.responseXML.getElementsByTagName('way');
-    var features = (ways.length==1) ? ways:nodes;
-
-    if(features.length==1) {
-      var osm_id = features[0].getElementsByTagName('osm_id')[0].
-                        firstChild.nodeValue;
-      var name = 
-                (xmlHTTP.responseXML.getElementsByTagName('name').length>0) ?
-                    xmlHTTP.responseXML.getElementsByTagName('name')[0].
-                        firstChild.nodeValue: "";
-
-
-      if(this.osm_type=='way' && ways.length==1) {
-                // use openlayers vector layer to highlight way for editing?
-      }
-
-      var description="";
-      var wikipedia="";
-      var ad=false;
-
-      if(xmlHTTP.responseXML.getElementsByTagName('description').length){
-          osmdesc=
-              xmlHTTP.responseXML.getElementsByTagName('description')[0].
-              firstChild.nodeValue;
-
-          description += "<p>"+osmdesc+"</p>";
-       } 
-     }
-  }
-  */
-
   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);
@@ -190,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();
 
@@ -231,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>