From: Tom Hughes <tom@compton.nu>
Date: Tue, 7 Aug 2007 17:14:27 +0000 (+0000)
Subject: Remove old geocoder views and add new one.
X-Git-Tag: live~8286
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3bae3e688181aeb6957b4baf959501dadc5c6fd5

Remove old geocoder views and add new one.
---

diff --git a/app/views/geocoder/_geocoder.rhtml b/app/views/geocoder/_geocoder.rhtml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/views/geocoder/results.rhtml b/app/views/geocoder/results.rhtml
deleted file mode 100644
index 7f4d710e1..000000000
--- a/app/views/geocoder/results.rhtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<h2>Your Search Results for <%= @place_name.capitalize %></h2>
-
-<table>
-<tr>
-<th>Name</th>
-<th>Country</th>
-<th></th>
-<th></th>
-<th></th>
-</tr>
-
-<% @res_ary.each do |hsh| %>
-
-<tr>
-<td>
-<%=  hsh['name'] %>
-</td>
-<td>
-<%= hsh['countryname'] %>
-</td>
-<td>
-<%= link_to('Map', url="/index.html?mlat=#{hsh['lat']}&mlon=#{hsh['lon']}&zoom=12") %>  
-</td>
-<td>
-<%= link_to('Edit', url="/edit.html?mlat=#{hsh['lat']}&mlon=#{hsh['lon']}&zoom=12") %>  
-</td>
-<td>
-<%= link_to('API', url="/#FIXME") %>  
-</td>
-</tr>
-<% end %>
-
-</table>
diff --git a/app/views/geocoder/search.rhtml b/app/views/geocoder/search.rhtml
new file mode 100644
index 000000000..bbe1fad2a
--- /dev/null
+++ b/app/views/geocoder/search.rhtml
@@ -0,0 +1,10 @@
+<% @results.each do |source| %>
+<p class="search_results_heading">Results from <%= link_to source[:source], source[:url] %></p>
+<% if source[:results] %>
+<% source[:results].each do |result| %>
+<p class="search_results_entry"><%= link_to_function result[:description], "setPosition(#{result[:lat]}, #{result[:lon]}, #{result[:zoom]})" %></p>
+<% end %>
+<% else %>
+<p class="search_results_error"><%= source[:error] %></p>
+<% end %>
+<% end %>