Merge branch 'master' into openstreetbugs

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index d2c2b5807c97f6ee6494fec99dbfdc4240bd4f53..9a49abd679c015f4c3a02259e9b9a2ac849f549d 100644 (file)
--- 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(' ')) + (object.visible == false ? ' deleted' : '')
+  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)
@@ -34,14 +42,37 @@ module BrowseHelper
     end
   end
 
+  def note_author(object)
+    if object.author.nil?
+      h(object.author_name)
+    else
+      link_to h(object.author_name), :controller => "user", :action => "view", :display_name => object.author_name
+    end
+  end
+
 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
 
-    if page = WIKI_PAGES[locale][type][lookup] rescue nil
+    # update-wiki-pages does s/ /_/g on keys before saving them, we
+    # have to replace spaces with underscore so we'll link
+    # e.g. `source=Isle of Man Government aerial imagery (2001)' to
+    # the correct page.
+    lookup_us = lookup.tr(" ", "_")
+
+    if page = WIKI_PAGES[locale][type][lookup_us] rescue nil
       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
-    elsif page = WIKI_PAGES["en"][type][lookup] rescue nil
+    elsif page = WIKI_PAGES["en"][type][lookup_us] rescue nil
       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
     end
 
@@ -49,6 +80,9 @@ private
   end
 
   def wikipedia_link(key, value)
+    # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL
+    return nil if value =~ /^http:\/\//
+
     if key == "wikipedia"
       # This regex should match Wikipedia language codes, everything
       # from de to zh-classical
@@ -68,9 +102,6 @@ private
       return nil
     end
 
-    # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL
-    return nil if value =~ /^http:\/\//
-
     return {
       :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}",
       :title => value