Only include tags which affect the icon in the link title
authorTom Hughes <tom@compton.nu>
Sun, 16 May 2010 11:55:10 +0000 (12:55 +0100)
committerTom Hughes <tom@compton.nu>
Sun, 16 May 2010 11:55:10 +0000 (12:55 +0100)
app/helpers/browse_helper.rb

index 54c99f5600bf78b93e3eb24963028d56ddac393e..28d1c4dc76ef96f93dc86a1dbcbc642db8e533ec 100644 (file)
@@ -17,13 +17,11 @@ module BrowseHelper
   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
+    return type + " " + h(icon_tags(object).join(' '))
   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", "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