From 6d3aa7386b47f86745e3212ac584b0400c8395f8 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 16 May 2010 12:55:10 +0100 Subject: [PATCH] Only include tags which affect the icon in the link title --- app/helpers/browse_helper.rb | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index 54c99f560..28d1c4dc7 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -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 -- 2.43.2