began callback code for feature lookup

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index 878720efc7888b62abfe9654c21f490778f399f3..875a28340364e38a5ae5222a75d45b1d673687a8 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -127,7 +127,52 @@ by the OpenStreetMap project and it's contributors.
                 (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());

diff --git a/config/database.yml b/config/database.yml
index 709a78c63eaeab9dafb341201e026dcc0b56b532..b884f3b938fea8c5ea541e0d4af5fbbc16529dd7 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -13,8 +13,8 @@
 development:
   adapter: mysql
   database: openstreetmap
-  username: whatever 
-  password: whatever 
+  username: openstreetmap
+  password: openstreetmap
   host: localhost
 
 # Warning: The database defined as 'test' will be erased and