Merge branch 'master' into openid

[rails.git] / app / helpers / browse_helper.rb

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 54c99f5600bf78b93e3eb24963028d56ddac393e..090d1e9c3a13cd7c275bef2dfa4b20ab2ab16e22 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -16,14 +16,12 @@ module BrowseHelper
     return name
   end
 
-  def css_class(type, object)
-    css = type + " " + h(object.tags.find_all { |k,v| k == "aeroway" || k == "amenity" || k == "barrier" || k == "building" || k == "highway" || k == "landuse" || k == "leisure" || k == "man_made" || k == "natural" || k == "railway" || k == "shop" || k == "tourism" || k == "waterway" }.join(' '))
-    return css
+  def link_class(type, object)
+    return type + " " + h(icon_tags(object).join(' ')) + (object.visible == false ? ' deleted' : '')
   end
 
   def link_title(object)
-    title = h(object.tags.map { |k,v| k + '=' + v }.to_sentence)
-    return title
+    return h(icon_tags(object).map { |k,v| k + '=' + v }.to_sentence)
   end
 
   def format_key(key)
@@ -46,6 +44,15 @@ module BrowseHelper
 
 private
 
+  ICON_TAGS = [ 
+    "aeroway", "amenity", "barrier", "building", "highway", "historic", "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