From: Tom Hughes <tom@compton.nu>
Date: Sun, 16 May 2010 13:49:45 +0000 (+0100)
Subject: Merge branch 'master' into openid
X-Git-Tag: live~6331
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7b9e852c9d53318cfc949fe4ceef2d3b665e2020?hp=f7009c57813db1ff579114095c7e959a885323a5

Merge branch 'master' into openid
---

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index ff702aed1..f121f2f0b 100644
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -2,7 +2,7 @@ module BrowseHelper
   def link_to_page(page, page_param)
     return link_to(page, page_param => page)
   end
-  
+
   def printable_name(object, version=false)
     name = t 'printable_name.with_id', :id => object.id.to_s
     if version
@@ -16,6 +16,14 @@ module BrowseHelper
     return name
   end
 
+  def link_class(type, object)
+    return type + " " + h(icon_tags(object).join(' '))
+  end
+
+  def link_title(object)
+    return h(icon_tags(object).map { |k,v| k + '=' + v }.to_sentence)
+  end
+
   def format_key(key)
     if url = wiki_link("key", key)
       link_to h(key), url, :title => t('browse.tag_details.wiki_link.key', :key => key)
@@ -36,6 +44,15 @@ module BrowseHelper
 
 private
 
+  ICON_TAGS = [ 
+    "aeroway", "amenity", "barrier", "building", "highway", "landuse",
+    "leisure", "man_made", "natural", "railway", "shop", "tourism", "waterway"
+  ]
+
+  def icon_tags(object)
+    object.tags.find_all { |k,v| ICON_TAGS.include? k }
+  end
+
   def wiki_link(type, lookup)
     locale = I18n.locale.to_s
 
diff --git a/app/views/browse/_changeset_details.html.erb b/app/views/browse/_changeset_details.html.erb
index 24d5da08c..6e3cbdb2e 100644
--- a/app/views/browse/_changeset_details.html.erb
+++ b/app/views/browse/_changeset_details.html.erb
@@ -53,7 +53,7 @@
       <td>
         <table cellpadding="0">
           <% @nodes.each do |node| %>
-            <tr><td><%= link_to h(printable_name(node, true)), :action => "node", :id => node.id.to_s %></td></tr>
+            <tr><td><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.id.to_s }, :class => link_class('node', node), :title => link_title(node) %></td></tr>
           <% end %>
         </table>
       </td>
@@ -67,7 +67,7 @@
       <td>
         <table cellpadding="0">
           <% @ways.each do |way| %>
-          <tr><td><%= link_to h(printable_name(way, true)), :action => "way", :id => way.id.to_s %></td></tr>
+          <tr><td><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></td></tr>
           <% end %>
           <%=
           #render :partial => "containing_relation", :collection => changeset_details.containing_relation_members 
@@ -84,7 +84,7 @@
       <td>
         <table cellpadding="0">
           <% @relations.each do |relation| %>
-          <tr><td><%= link_to h(printable_name(relation, true)), :action => "relation", :id => relation.id.to_s %></td></tr>
+          <tr><td><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.id.to_s }, :class => "relation " %></td></tr>
           <% end %>
         </table>
       </td>
diff --git a/app/views/browse/_node_details.html.erb b/app/views/browse/_node_details.html.erb
index 7982e6805..80df2cd85 100644
--- a/app/views/browse/_node_details.html.erb
+++ b/app/views/browse/_node_details.html.erb
@@ -13,7 +13,7 @@
       <td>
         <table cellpadding="0">
           <% node_details.ways.each do |way| %>
-            <tr><td><%= link_to h(printable_name(way)), :action => "way", :id => way.id.to_s %></td></tr>
+            <tr><td><%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></td></tr>
           <% end %>
           <%= render :partial => "containing_relation", :collection => node_details.containing_relation_members %>
         </table>
diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb
index cee2e0e75..b797081da 100644
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,8 +1,10 @@
+<%
+  member_class = link_class(relation_member.member_type.downcase, relation_member.member)
+  linked_name = link_to h(printable_name(relation_member.member)), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member)
+  type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase 
+%>
 <tr>
-  <td><%=
-    linked_name = link_to h(printable_name(relation_member.member)), :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s
-    type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase
-
+  <td class="<%= member_class %>"><%=
     if relation_member.member_role.blank?
       t'browse.relation_member.entry', :type => type_str, :name => linked_name
     else
diff --git a/app/views/browse/_way_details.html.erb b/app/views/browse/_way_details.html.erb
index 917582f82..0344ebf64 100644
--- a/app/views/browse/_way_details.html.erb
+++ b/app/views/browse/_way_details.html.erb
@@ -8,10 +8,10 @@
       <table cellpadding="0">
         <% way_details.way_nodes.each do |wn| %>
           <tr><td>
-            <%= link_to h(printable_name(wn.node)), :action => "node", :id => wn.node_id.to_s %>
+            <%= link_to h(printable_name(wn.node)), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node) %>
             <% related_ways = wn.node.ways.reject { |w| w.id == way_details.id } %>
 	    <% if related_ways.size > 0 then %>
-              (<%= t 'browse.way_details.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(h(printable_name(w)), :action => "way", :id => w.id.to_s) }.to_sentence %>)
+              (<%= t 'browse.way_details.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(h(printable_name(w)), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>)
             <% end %>
 	  </td></tr>
         <% end %>
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index bd93708e0..97f57e41c 100644
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,3 +1,6 @@
+<% content_for :head do %>
+<%= stylesheet_link_tag 'browse' %>
+<% end %>
 <%= render :partial => "navigation" %>
 <h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
 <% if @changeset.has_valid_bbox? %>
diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb
index 95176ab04..d9faaf478 100644
--- a/app/views/browse/node.html.erb
+++ b/app/views/browse/node.html.erb
@@ -2,6 +2,9 @@
 @name = printable_name @node
 @title = t('browse.node.node') + ' | ' + @name
 %>
+<% content_for :head do %>
+<%= stylesheet_link_tag 'browse' %>
+<% end %>
 <%= render :partial => "navigation" %>
 <h2><%= t'browse.node.node_title', :node_name => h(@name) %></h2>
 <%= render :partial => "map", :object => @node %>
diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb
index b1184d647..b8d0bc3b5 100644
--- a/app/views/browse/relation.html.erb
+++ b/app/views/browse/relation.html.erb
@@ -2,6 +2,9 @@
 @name = printable_name @relation
 @title = t('browse.relation.relation') + ' | ' + @name
 %>
+<% content_for :head do %>
+<%= stylesheet_link_tag 'browse' %>
+<% end %>
 <%= render :partial => "navigation" %>
 <h2><%= t'browse.relation.relation_title', :relation_name => h(@name) %></h2>
 <%= render :partial => "map", :object => @relation %>
diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb
index 55618247f..3489d7c23 100644
--- a/app/views/browse/way.html.erb
+++ b/app/views/browse/way.html.erb
@@ -2,6 +2,9 @@
 @name = printable_name @way
 @title = t('browse.way.way') + ' | ' + @name
 %>
+<% content_for :head do %>
+<%= stylesheet_link_tag 'browse' %>
+<% end %>
 <%= render :partial => "navigation" %>
 <h2><%= t'browse.way.way_title', :way_name => h(@name) %></h2>
 <%= render :partial => "map", :object => @way %>
diff --git a/public/images/browse/allotments.png b/public/images/browse/allotments.png
new file mode 100644
index 000000000..bc8d3fe96
Binary files /dev/null and b/public/images/browse/allotments.png differ
diff --git a/public/images/browse/alpinehut.p.16.png b/public/images/browse/alpinehut.p.16.png
new file mode 100644
index 000000000..84b09771b
Binary files /dev/null and b/public/images/browse/alpinehut.p.16.png differ
diff --git a/public/images/browse/atm2.p.16.png b/public/images/browse/atm2.p.16.png
new file mode 100644
index 000000000..62caf207e
Binary files /dev/null and b/public/images/browse/atm2.p.16.png differ
diff --git a/public/images/browse/bank2.p.16.png b/public/images/browse/bank2.p.16.png
new file mode 100644
index 000000000..a7d30e86d
Binary files /dev/null and b/public/images/browse/bank2.p.16.png differ
diff --git a/public/images/browse/bar.p.16.png b/public/images/browse/bar.p.16.png
new file mode 100644
index 000000000..201d66a03
Binary files /dev/null and b/public/images/browse/bar.p.16.png differ
diff --git a/public/images/browse/bridge.20.png b/public/images/browse/bridge.20.png
new file mode 100644
index 000000000..ed4808440
Binary files /dev/null and b/public/images/browse/bridge.20.png differ
diff --git a/public/images/browse/bridleway.20.png b/public/images/browse/bridleway.20.png
new file mode 100644
index 000000000..bb46bcb8e
Binary files /dev/null and b/public/images/browse/bridleway.20.png differ
diff --git a/public/images/browse/brownfield.png b/public/images/browse/brownfield.png
new file mode 100644
index 000000000..76d94ccee
Binary files /dev/null and b/public/images/browse/brownfield.png differ
diff --git a/public/images/browse/building.png b/public/images/browse/building.png
new file mode 100644
index 000000000..189bbe928
Binary files /dev/null and b/public/images/browse/building.png differ
diff --git a/public/images/browse/bus_station.n.16.png b/public/images/browse/bus_station.n.16.png
new file mode 100644
index 000000000..5224dd119
Binary files /dev/null and b/public/images/browse/bus_station.n.16.png differ
diff --git a/public/images/browse/bus_stop.p.16.png b/public/images/browse/bus_stop.p.16.png
new file mode 100644
index 000000000..7d9d5e8b6
Binary files /dev/null and b/public/images/browse/bus_stop.p.16.png differ
diff --git a/public/images/browse/byway.20.png b/public/images/browse/byway.20.png
new file mode 100644
index 000000000..fb98d24e9
Binary files /dev/null and b/public/images/browse/byway.20.png differ
diff --git a/public/images/browse/cafe.p.16.png b/public/images/browse/cafe.p.16.png
new file mode 100644
index 000000000..836f8a540
Binary files /dev/null and b/public/images/browse/cafe.p.16.png differ
diff --git a/public/images/browse/camping.n.16.png b/public/images/browse/camping.n.16.png
new file mode 100644
index 000000000..b76912566
Binary files /dev/null and b/public/images/browse/camping.n.16.png differ
diff --git a/public/images/browse/car_share.p.16.png b/public/images/browse/car_share.p.16.png
new file mode 100644
index 000000000..1dcc537f6
Binary files /dev/null and b/public/images/browse/car_share.p.16.png differ
diff --git a/public/images/browse/caravan_park.p.24.png b/public/images/browse/caravan_park.p.24.png
new file mode 100644
index 000000000..751f5204b
Binary files /dev/null and b/public/images/browse/caravan_park.p.24.png differ
diff --git a/public/images/browse/cemetery.png b/public/images/browse/cemetery.png
new file mode 100644
index 000000000..6d6d07222
Binary files /dev/null and b/public/images/browse/cemetery.png differ
diff --git a/public/images/browse/centre.png b/public/images/browse/centre.png
new file mode 100644
index 000000000..10661ae4a
Binary files /dev/null and b/public/images/browse/centre.png differ
diff --git a/public/images/browse/cinema.p.16.png b/public/images/browse/cinema.p.16.png
new file mode 100644
index 000000000..21f7dcb65
Binary files /dev/null and b/public/images/browse/cinema.p.16.png differ
diff --git a/public/images/browse/commercial.png b/public/images/browse/commercial.png
new file mode 100644
index 000000000..0d2d27c14
Binary files /dev/null and b/public/images/browse/commercial.png differ
diff --git a/public/images/browse/common.png b/public/images/browse/common.png
new file mode 100644
index 000000000..b2c4de826
Binary files /dev/null and b/public/images/browse/common.png differ
diff --git a/public/images/browse/cycleway.20.png b/public/images/browse/cycleway.20.png
new file mode 100644
index 000000000..a75255098
Binary files /dev/null and b/public/images/browse/cycleway.20.png differ
diff --git a/public/images/browse/drinkingtap.p.16.png b/public/images/browse/drinkingtap.p.16.png
new file mode 100644
index 000000000..b9baef7b7
Binary files /dev/null and b/public/images/browse/drinkingtap.p.16.png differ
diff --git a/public/images/browse/farm.png b/public/images/browse/farm.png
new file mode 100644
index 000000000..5b6f0bcfd
Binary files /dev/null and b/public/images/browse/farm.png differ
diff --git a/public/images/browse/fast_food.p.16.png b/public/images/browse/fast_food.p.16.png
new file mode 100644
index 000000000..28e78bfec
Binary files /dev/null and b/public/images/browse/fast_food.p.16.png differ
diff --git a/public/images/browse/firestation.p.16.png b/public/images/browse/firestation.p.16.png
new file mode 100644
index 000000000..cf2455922
Binary files /dev/null and b/public/images/browse/firestation.p.16.png differ
diff --git a/public/images/browse/footway.20.png b/public/images/browse/footway.20.png
new file mode 100644
index 000000000..5f69d00f1
Binary files /dev/null and b/public/images/browse/footway.20.png differ
diff --git a/public/images/browse/forest.png b/public/images/browse/forest.png
new file mode 100644
index 000000000..7e37c5df6
Binary files /dev/null and b/public/images/browse/forest.png differ
diff --git a/public/images/browse/fuel.p.16.png b/public/images/browse/fuel.p.16.png
new file mode 100644
index 000000000..7bab32a4d
Binary files /dev/null and b/public/images/browse/fuel.p.16.png differ
diff --git a/public/images/browse/gate2.p.16.png b/public/images/browse/gate2.p.16.png
new file mode 100644
index 000000000..cee412c89
Binary files /dev/null and b/public/images/browse/gate2.p.16.png differ
diff --git a/public/images/browse/golf.png b/public/images/browse/golf.png
new file mode 100644
index 000000000..f05ff255a
Binary files /dev/null and b/public/images/browse/golf.png differ
diff --git a/public/images/browse/halt.p.16.png b/public/images/browse/halt.p.16.png
new file mode 100644
index 000000000..fbea173c3
Binary files /dev/null and b/public/images/browse/halt.p.16.png differ
diff --git a/public/images/browse/heathland.png b/public/images/browse/heathland.png
new file mode 100644
index 000000000..9342b56da
Binary files /dev/null and b/public/images/browse/heathland.png differ
diff --git a/public/images/browse/hospital.p.16.png b/public/images/browse/hospital.p.16.png
new file mode 100644
index 000000000..dd4febf2b
Binary files /dev/null and b/public/images/browse/hospital.p.16.png differ
diff --git a/public/images/browse/hostel.p.16.png b/public/images/browse/hostel.p.16.png
new file mode 100644
index 000000000..ddab301d1
Binary files /dev/null and b/public/images/browse/hostel.p.16.png differ
diff --git a/public/images/browse/hotel.p.16.png b/public/images/browse/hotel.p.16.png
new file mode 100644
index 000000000..cd2ba1620
Binary files /dev/null and b/public/images/browse/hotel.p.16.png differ
diff --git a/public/images/browse/industrial.png b/public/images/browse/industrial.png
new file mode 100644
index 000000000..e90e4633d
Binary files /dev/null and b/public/images/browse/industrial.png differ
diff --git a/public/images/browse/lake.png b/public/images/browse/lake.png
new file mode 100644
index 000000000..78cdd020c
Binary files /dev/null and b/public/images/browse/lake.png differ
diff --git a/public/images/browse/level_crossing.p.16.png b/public/images/browse/level_crossing.p.16.png
new file mode 100644
index 000000000..27448359f
Binary files /dev/null and b/public/images/browse/level_crossing.p.16.png differ
diff --git a/public/images/browse/library.p.16.png b/public/images/browse/library.p.16.png
new file mode 100644
index 000000000..4e42a73ce
Binary files /dev/null and b/public/images/browse/library.p.16.png differ
diff --git a/public/images/browse/light_rail.20.png b/public/images/browse/light_rail.20.png
new file mode 100644
index 000000000..7f65a6271
Binary files /dev/null and b/public/images/browse/light_rail.20.png differ
diff --git a/public/images/browse/lighthouse.p.16.png b/public/images/browse/lighthouse.p.16.png
new file mode 100644
index 000000000..96ffd440c
Binary files /dev/null and b/public/images/browse/lighthouse.p.16.png differ
diff --git a/public/images/browse/military.png b/public/images/browse/military.png
new file mode 100644
index 000000000..54741f3d2
Binary files /dev/null and b/public/images/browse/military.png differ
diff --git a/public/images/browse/mini_round.p.16.png b/public/images/browse/mini_round.p.16.png
new file mode 100644
index 000000000..1448b3ee2
Binary files /dev/null and b/public/images/browse/mini_round.p.16.png differ
diff --git a/public/images/browse/motorway.20.png b/public/images/browse/motorway.20.png
new file mode 100644
index 000000000..c89fa12a8
Binary files /dev/null and b/public/images/browse/motorway.20.png differ
diff --git a/public/images/browse/museum.p.16.png b/public/images/browse/museum.p.16.png
new file mode 100644
index 000000000..c58d30683
Binary files /dev/null and b/public/images/browse/museum.p.16.png differ
diff --git a/public/images/browse/park.png b/public/images/browse/park.png
new file mode 100644
index 000000000..fac6f1fb9
Binary files /dev/null and b/public/images/browse/park.png differ
diff --git a/public/images/browse/parking.p.16.png b/public/images/browse/parking.p.16.png
new file mode 100644
index 000000000..5860900cf
Binary files /dev/null and b/public/images/browse/parking.p.16.png differ
diff --git a/public/images/browse/pharmacy.p.16.png b/public/images/browse/pharmacy.p.16.png
new file mode 100644
index 000000000..fb1c56c86
Binary files /dev/null and b/public/images/browse/pharmacy.p.16.png differ
diff --git a/public/images/browse/pitch.png b/public/images/browse/pitch.png
new file mode 100644
index 000000000..68333b7a4
Binary files /dev/null and b/public/images/browse/pitch.png differ
diff --git a/public/images/browse/place_of_worship.png b/public/images/browse/place_of_worship.png
new file mode 100644
index 000000000..95494f59c
Binary files /dev/null and b/public/images/browse/place_of_worship.png differ
diff --git a/public/images/browse/police.p.16.png b/public/images/browse/police.p.16.png
new file mode 100644
index 000000000..2dd87aaf2
Binary files /dev/null and b/public/images/browse/police.p.16.png differ
diff --git a/public/images/browse/post_box.p.16.png b/public/images/browse/post_box.p.16.png
new file mode 100644
index 000000000..3119cc135
Binary files /dev/null and b/public/images/browse/post_box.p.16.png differ
diff --git a/public/images/browse/post_office.p.16.png b/public/images/browse/post_office.p.16.png
new file mode 100644
index 000000000..743255eb0
Binary files /dev/null and b/public/images/browse/post_office.p.16.png differ
diff --git a/public/images/browse/primary.20.png b/public/images/browse/primary.20.png
new file mode 100644
index 000000000..668e25d71
Binary files /dev/null and b/public/images/browse/primary.20.png differ
diff --git a/public/images/browse/prison.p.16.png b/public/images/browse/prison.p.16.png
new file mode 100644
index 000000000..4b2fc4015
Binary files /dev/null and b/public/images/browse/prison.p.16.png differ
diff --git a/public/images/browse/pub.p.16.png b/public/images/browse/pub.p.16.png
new file mode 100644
index 000000000..b452a7ead
Binary files /dev/null and b/public/images/browse/pub.p.16.png differ
diff --git a/public/images/browse/rail.20.png b/public/images/browse/rail.20.png
new file mode 100644
index 000000000..f93a6ef8a
Binary files /dev/null and b/public/images/browse/rail.20.png differ
diff --git a/public/images/browse/recycling.p.16.png b/public/images/browse/recycling.p.16.png
new file mode 100644
index 000000000..59eb331aa
Binary files /dev/null and b/public/images/browse/recycling.p.16.png differ
diff --git a/public/images/browse/rental_bicycle.p.20.png b/public/images/browse/rental_bicycle.p.20.png
new file mode 100644
index 000000000..4bb10e00a
Binary files /dev/null and b/public/images/browse/rental_bicycle.p.20.png differ
diff --git a/public/images/browse/reserve.png b/public/images/browse/reserve.png
new file mode 100644
index 000000000..cf16376f6
Binary files /dev/null and b/public/images/browse/reserve.png differ
diff --git a/public/images/browse/residential.png b/public/images/browse/residential.png
new file mode 100644
index 000000000..67c2e34e0
Binary files /dev/null and b/public/images/browse/residential.png differ
diff --git a/public/images/browse/restaurant.p.16.png b/public/images/browse/restaurant.p.16.png
new file mode 100644
index 000000000..5c410087b
Binary files /dev/null and b/public/images/browse/restaurant.p.16.png differ
diff --git a/public/images/browse/retail.png b/public/images/browse/retail.png
new file mode 100644
index 000000000..cc9621111
Binary files /dev/null and b/public/images/browse/retail.png differ
diff --git a/public/images/browse/runway.20.png b/public/images/browse/runway.20.png
new file mode 100644
index 000000000..dac187ff1
Binary files /dev/null and b/public/images/browse/runway.20.png differ
diff --git a/public/images/browse/school.png b/public/images/browse/school.png
new file mode 100644
index 000000000..ea35d02aa
Binary files /dev/null and b/public/images/browse/school.png differ
diff --git a/public/images/browse/secondary.20.png b/public/images/browse/secondary.20.png
new file mode 100644
index 000000000..f6a758ed9
Binary files /dev/null and b/public/images/browse/secondary.20.png differ
diff --git a/public/images/browse/shelter2.p.16.png b/public/images/browse/shelter2.p.16.png
new file mode 100644
index 000000000..09ea53054
Binary files /dev/null and b/public/images/browse/shelter2.p.16.png differ
diff --git a/public/images/browse/shop_bakery.p.16.png b/public/images/browse/shop_bakery.p.16.png
new file mode 100644
index 000000000..89de12eb5
Binary files /dev/null and b/public/images/browse/shop_bakery.p.16.png differ
diff --git a/public/images/browse/shop_clothes.p.16.png b/public/images/browse/shop_clothes.p.16.png
new file mode 100644
index 000000000..b028a1cde
Binary files /dev/null and b/public/images/browse/shop_clothes.p.16.png differ
diff --git a/public/images/browse/shop_convenience.p.16.png b/public/images/browse/shop_convenience.p.16.png
new file mode 100644
index 000000000..2fc7584d5
Binary files /dev/null and b/public/images/browse/shop_convenience.p.16.png differ
diff --git a/public/images/browse/shop_diy.p.16.png b/public/images/browse/shop_diy.p.16.png
new file mode 100644
index 000000000..b1954ab91
Binary files /dev/null and b/public/images/browse/shop_diy.p.16.png differ
diff --git a/public/images/browse/shop_hairdresser.p.16.png b/public/images/browse/shop_hairdresser.p.16.png
new file mode 100644
index 000000000..aa783f260
Binary files /dev/null and b/public/images/browse/shop_hairdresser.p.16.png differ
diff --git a/public/images/browse/shop_supermarket.p.16.png b/public/images/browse/shop_supermarket.p.16.png
new file mode 100644
index 000000000..3b4338a96
Binary files /dev/null and b/public/images/browse/shop_supermarket.p.16.png differ
diff --git a/public/images/browse/station.p.16.png b/public/images/browse/station.p.16.png
new file mode 100644
index 000000000..f10492d70
Binary files /dev/null and b/public/images/browse/station.p.16.png differ
diff --git a/public/images/browse/subway.20.png b/public/images/browse/subway.20.png
new file mode 100644
index 000000000..56b89b03d
Binary files /dev/null and b/public/images/browse/subway.20.png differ
diff --git a/public/images/browse/taxiway.20.png b/public/images/browse/taxiway.20.png
new file mode 100644
index 000000000..3fb1dba7a
Binary files /dev/null and b/public/images/browse/taxiway.20.png differ
diff --git a/public/images/browse/telephone.p.16.png b/public/images/browse/telephone.p.16.png
new file mode 100644
index 000000000..29378e44b
Binary files /dev/null and b/public/images/browse/telephone.p.16.png differ
diff --git a/public/images/browse/theatre.p.16.png b/public/images/browse/theatre.p.16.png
new file mode 100644
index 000000000..6e0feab5c
Binary files /dev/null and b/public/images/browse/theatre.p.16.png differ
diff --git a/public/images/browse/toilets.p.16.png b/public/images/browse/toilets.p.16.png
new file mode 100644
index 000000000..353208cf7
Binary files /dev/null and b/public/images/browse/toilets.p.16.png differ
diff --git a/public/images/browse/tourist.png b/public/images/browse/tourist.png
new file mode 100644
index 000000000..c70be84d7
Binary files /dev/null and b/public/images/browse/tourist.png differ
diff --git a/public/images/browse/traffic_light.png b/public/images/browse/traffic_light.png
new file mode 100644
index 000000000..1c2b3ca7b
Binary files /dev/null and b/public/images/browse/traffic_light.png differ
diff --git a/public/images/browse/tram.20.png b/public/images/browse/tram.20.png
new file mode 100644
index 000000000..092ec65e5
Binary files /dev/null and b/public/images/browse/tram.20.png differ
diff --git a/public/images/browse/tree.p.16.png b/public/images/browse/tree.p.16.png
new file mode 100644
index 000000000..c8c3067af
Binary files /dev/null and b/public/images/browse/tree.p.16.png differ
diff --git a/public/images/browse/trunk.20.png b/public/images/browse/trunk.20.png
new file mode 100644
index 000000000..25b374f36
Binary files /dev/null and b/public/images/browse/trunk.20.png differ
diff --git a/public/images/browse/tunnel.20.png b/public/images/browse/tunnel.20.png
new file mode 100644
index 000000000..49cd98f19
Binary files /dev/null and b/public/images/browse/tunnel.20.png differ
diff --git a/public/images/browse/turning_circle.p.16.png b/public/images/browse/turning_circle.p.16.png
new file mode 100644
index 000000000..d29def0ff
Binary files /dev/null and b/public/images/browse/turning_circle.p.16.png differ
diff --git a/public/images/browse/unclassified.20.png b/public/images/browse/unclassified.20.png
new file mode 100644
index 000000000..2f687c171
Binary files /dev/null and b/public/images/browse/unclassified.20.png differ
diff --git a/public/images/browse/view_point.p.16.png b/public/images/browse/view_point.p.16.png
new file mode 100644
index 000000000..b18660c86
Binary files /dev/null and b/public/images/browse/view_point.p.16.png differ
diff --git a/public/images/browse/wood.png b/public/images/browse/wood.png
new file mode 100644
index 000000000..1bebdfa47
Binary files /dev/null and b/public/images/browse/wood.png differ
diff --git a/public/stylesheets/browse.css b/public/stylesheets/browse.css
new file mode 100644
index 000000000..2ca44bcd1
--- /dev/null
+++ b/public/stylesheets/browse.css
@@ -0,0 +1,109 @@
+.node { padding-left: 25px; }
+.way { padding-left: 25px; }
+
+/* Nodes */
+
+.aeroway.aerodrome { background: url(/images/browse/aerodrome.p.16.png) no-repeat center left; }
+
+.amenity.atm { background: url(/images/browse/atm2.p.16.png) no-repeat center left; }
+.amenity.bank { background: url(/images/browse/bank2.p.16.png) no-repeat center left; }
+.amenity.bar { background: url(/images/browse/bar.p.16.png) no-repeat center left; }
+.amenity.bicycle_rental { background: url(/images/browse/rental_bicycle.p.20.png) no-repeat center left; }
+.amenity.bus_station { background: url(/images/browse/bus_station.n.16.png) no-repeat center left; }
+.amenity.cafe { background: url(/images/browse/cafe.p.16.png) no-repeat center left; }
+.amenity.car_sharing { background: url(/images/browse/car_share.p.16.png) no-repeat center left; }
+.amenity.cinema { background: url(/images/browse/cinema.p.16.png) no-repeat center left; }
+.amenity.drinking_water { background: url(/images/browse/drinkingtap.p.16.png) no-repeat center left; }
+.amenity.fast_food { background: url(/images/browse/fast_food.p.16.png) no-repeat center left; }
+.amenity.fire_station { background: url(/images/browse/firestation.p.16.png) no-repeat center left; }
+.amenity.fuel { background: url(/images/browse/fuel.p.16.png) no-repeat center left; }
+.amenity.hospital { background: url(/images/browse/hospital.p.16.png) no-repeat center left; }
+.amenity.library { background: url(/images/browse/library.p.16.png) no-repeat center left; }
+.amenity.parking { background: url(/images/browse/parking.p.16.png) no-repeat center left; }
+.amenity.pharmacy { background: url(/images/browse/pharmacy.p.16.png) no-repeat center left; }
+.amenity.place_of_worship { background: url(/images/browse/place_of_worship.png) no-repeat center left; }
+.amenity.police { background: url(/images/browse/police.p.16.png) no-repeat center left; }
+.amenity.post_box { background: url(/images/browse/post_box.p.16.png) no-repeat center left; }
+.amenity.post_office { background: url(/images/browse/post_office.p.16.png) no-repeat center left; }
+.amenity.prison { background: url(/images/browse/prison.p.16.png) no-repeat center left; }
+.amenity.pub { background: url(/images/browse/pub.p.16.png) no-repeat center left; }
+.amenity.restaurant { background: url(/images/browse/restaurant.p.16.png) no-repeat center left; }
+.amenity.recycling { background: url(/images/browse/recycling.p.16.png) no-repeat center left; }
+.amenity.shelter { background: url(/images/browse/shelter2.p.16.png) no-repeat center left; }
+.amenity.telephone { background: url(/images/browse/telephone.p.16.png) no-repeat center left; }
+.amenity.theatre { background: url(/images/browse/theatre.p.16.png) no-repeat center left; }
+.amenity.toilets { background: url(/images/browse/toilets.p.16.png) no-repeat center left; }
+
+.barrier.gate { background: url(/images/browse/gate2.p.16.png) no-repeat center left; }
+
+.highway.bus_stop { background: url(/images/browse/bus_stop.p.16.png) no-repeat center left; }
+.highway.mini_roundabout { background: url(/images/browse/mini_round.p.16.png) no-repeat center left; }
+.highway.traffic_signals { background: url(/images/browse/traffic_light.png) no-repeat center left; }
+.highway.turning_circle { background: url(/images/browse/turning_circle.p.16.png) no-repeat center left; }
+
+.man_made.lighthouse { background: url(/images/browse/lighthouse.p.16.png) no-repeat center left; }
+
+.natural.tree { background: url(/images/browse/tree.p.16.png) no-repeat center left; }
+
+.railway.halt { background: url(/images/browse/halt.p.16.png) no-repeat center left; }
+.railway.station { background: url(/images/browse/station.p.16.png) no-repeat center left; }
+.railway.level_crossing { background: url(/images/browse/level_crossing.p.16.png) no-repeat center left; }
+
+.shop { background: url(/images/browse/shop_convenience.p.16.png) no-repeat center left; }
+.shop.bakery { background: url(/images/browse/shop_bakery.p.16.png) no-repeat center left; }
+.shop.clothes { background: url(/images/browse/shop_clothes.p.16.png) no-repeat center left; }
+.shop.convenience { background: url(/images/browse/shop_convenience.p.16.png) no-repeat center left; }
+.shop.diy { background: url(/images/browse/shop_diy.p.16.png) no-repeat center left; }
+.shop.hairdresser { background: url(/images/browse/shop_hairdresser.p.16.png) no-repeat center left; }
+.shop.supermarket { background: url(/images/browse/shop_supermarket.p.16.png) no-repeat center left; }
+
+.tourism.alpine_hut { background: url(/images/browse/alpinehut.p.16.png) no-repeat center left; }
+.tourism.camp_site { background: url(/images/browse/camping.n.16.png) no-repeat center left; }
+.tourism.caravan_site { background: url(/images/browse/caravan_park.n.16.png) no-repeat center left; }
+.tourism.hostel { background: url(/images/browse/hostel.p.16.png) no-repeat center left; }
+.tourism.hotel { background: url(/images/browse/hotel.p.16.png) no-repeat center left; }
+.tourism.museum { background: url(/images/browse/museum.p.16.png) no-repeat center left; }
+.tourism.viewpoint { background: url(/images/browse/view_point.p.16.png) no-repeat center left; }
+
+/* Ways */
+
+.aeroway.runway { background: url(/images/browse/runway.20.png) no-repeat center left; }
+.aeroway.taxiway { background: url(/images/browse/taxiway.20.png) no-repeat center left; }
+
+.building { background: url(/images/browse/building.png) no-repeat center left; }
+
+.highway.bridleway { background: url(/images/browse/bridleway.20.png) no-repeat center left; }
+.highway.byway { background: url(/images/browse/byway.20.png) no-repeat center left; }
+.highway.cycleway { background: url(/images/browse/cycleway.20.png) no-repeat center left; }
+.highway.footway { background: url(/images/browse/footway.20.png) no-repeat center left; }
+.highway.motorway { background: url(/images/browse/motorway.20.png) no-repeat center left; }
+.highway.primary { background: url(/images/browse/primary.20.png) no-repeat center left; }
+.highway.residential { background: url(/images/browse/unclassified.20.png) no-repeat center left; }
+.highway.secondary { background: url(/images/browse/secondary.20.png) no-repeat center left; }
+.highway.trunk { background: url(/images/browse/trunk.20.png) no-repeat center left; }
+.highway.unclassified { background: url(/images/browse/unclassified.20.png) no-repeat center left; }
+
+.landuse.brownfield { background: url(/images/browse/brownfield.png) no-repeat center left; }
+.landuse.cemetery { background: url(/images/browse/cemetery.png) no-repeat center left; }
+.landuse.commercial { background: url(/images/browse/commercial.png) no-repeat center left; }
+.landuse.farm { background: url(/images/browse/farm.png) no-repeat center left; }
+.landuse.forest { background: url(/images/browse/forest.png) no-repeat center left; }
+.landuse.industrial { background: url(/images/browse/industrial.png) no-repeat center left; }
+.landuse.military { background: url(/images/browse/military.png) no-repeat center left; }
+.landuse.residential { background: url(/images/browse/residential.png) no-repeat center left; }
+.landuse.retail { background: url(/images/browse/retail.png) no-repeat center left; }
+.landuse.tourism { background: url(/images/browse/tourism.png) no-repeat center left; }
+.landuse.wood { background: url(/images/browse/wood.png) no-repeat center left; }
+
+.leisure.golf_course { background: url(/images/browse/golf.png) no-repeat center left; }
+.leisure.park { background: url(/images/browse/park.png) no-repeat center left; }
+.leisure.pitch { background: url(/images/browse/pitch.png) no-repeat center left; }
+.leisure.nature_reserve { background: url(/images/browse/reserve.png) no-repeat center left; }
+
+.natural.heath { background: url(/images/browse/heathland.png) no-repeat center left; }
+.natural.water { background: url(/images/browse/lake.png) no-repeat center left; }
+
+.railway.light_rail { background: url(/images/browse/light_rail.20.png) no-repeat center left; }
+.railway.rail { background: url(/images/browse/rail.20.png) no-repeat center left; }
+.railway.subway { background: url(/images/browse/subway.20.png) no-repeat center left; }
+.railway.tram { background: url(/images/browse/tram.20.png) no-repeat center left; }