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

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 395c851d4..875a28340 100644
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -43,15 +43,15 @@ by the OpenStreetMap project and it's contributors.
 <% if params['lon'] and params['lat'] %>
 <% lon =  h(params['lon']) %>
 <% lat =  h(params['lat']) %>
-<% zoom =  h(params['zoom']) || '5' %>
+<% zoom =  h(params['zoom'] || '5') %>
 <% layers = h(params['layers']) %>
 <% elsif params['mlon'] and params['mlat'] %>
 <% lon = h(params['mlon']) %> 
 <% lat = h(params['mlat']) %>
-<% zoom =  h(params['zoom']) || '12' %>
+<% zoom =  h(params['zoom'] || '12') %>
 <% layers = h(params['layers']) %>
 <% elsif cookies.key?("location") %>
-<% lon,lat,zoom,layers = cookies["location"].value.first.split(",") %>
+<% lon,lat,zoom,layers = cookies["location"].split(",") %>
 <% elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> 
 <% lon =  @user.home_lon %>
 <% lat =  @user.home_lat %>
@@ -67,12 +67,13 @@ by the OpenStreetMap project and it's contributors.
 <% else %>
 <% lon =  '-0.1' %>
 <% lat =  '51.5' %>
-<% zoom =  h(params['zoom']) || '5' %>
+<% zoom =  h(params['zoom'] || '5') %>
 <% layers = h(params['layers']) %>
 <% end %>
 <% end %>
 
-<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>
 <%= javascript_include_tag 'map.js' %>
 
 
@@ -113,11 +114,66 @@ by the OpenStreetMap project and it's contributors.
     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());
   }