Merge branch 'master' into openid

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
 

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>

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>

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

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 %>

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? %>

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 %>

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 %>

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 %>

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; }