X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1c7998009ffb63c8fded77a3b98b72e42a96f3f3..f1c0834c5cd5ddfa3d79d24b200e995597fe11f4:/app/views/site/index.rhtml

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 875a28340..edd755ddb 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -77,13 +77,13 @@ 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 %>
@@ -115,65 +115,11 @@ by the OpenStreetMap project and it's contributors.
 
     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());
   }
@@ -231,8 +177,10 @@ by the OpenStreetMap project and it's contributors.
 
     resizeMap();
   }
+  
+  mapInit();
 
+  window.onload = handleResize;
   window.onresize = handleResize;
-  window.onload = init;
 // -->
 </script>