geocoder stuff

diff --git a/app/views/site/index.rhtml b/app/views/site/index.rhtml
index d6c2ed405e0bf9c7c5dfcd91bb0e827380554ff4..35e5426995e9c1d67ac139e4305866866269a908 100644 (file)
--- a/app/views/site/index.rhtml
+++ b/app/views/site/index.rhtml
@@ -1,11 +1,19 @@
 
 
 <div id="geocoder">
-  <%= start_form_tag :controller => 'way_tag', :action => 'search' %>
-  <%= text_field 'query', 'query'%>
+  <%= start_form_tag :controller => 'geocoder', :action => 'search' %>
+  <%= text_field 'query', 'postcode'%>
+  <%= text_field 'query', 'place_name'%>
   <%= submit_tag 'Search' %>
   <%= end_form_tag %>
+<div id="postcode-helper">
+eg SW15 6JH
 </div>
+<div id="placename-helper">
+Essen
+</div>
+</div>
+
 
 
 

diff --git a/config/routes.rb b/config/routes.rb
index c73b8c4542fbfe0f49b9abdf2bee4682466edce0..9bb8aadcaeab4d44638147ea7a4b0b3deb87cd96 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -73,6 +73,6 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/test/populate/:table/:count', :controller => 'test', :action => 'populate', :from => 1
 
   # fall through
-  map.connect ':controller/:id/:action'
+  #  map.connect ':controller/:id/:action'
   map.connect ':controller/:action'
 end

diff --git a/public/stylesheets/site.css b/public/stylesheets/site.css
index d49b603ad5894a472bb61dd00b8debe466f8de9a..c502a59ff9cfc32d3aaa9a72e6eb6efa5cc5a921 100644 (file)
--- a/public/stylesheets/site.css
+++ b/public/stylesheets/site.css
@@ -291,6 +291,18 @@ hides rule from IE5-Mac \*/
   padding-left: 14px;\r
 }\r
 \r
+#placename-helper{\r
+  font-size: 10px;\r
+  position:relative; bottom:36px; left: 470px;\r
+  color: gray;\r
+}\r
+\r
+#postcode-helper{\r
+  font-size: 10px;\r
+  position:relative; bottom:16px; left: 180px;\r
+  color: gray;\r
+}\r
+\r
 .gpxsummary {\r
   font-size: 12px;\r
   color: gray;\r