X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/88aa34f61bf74b723aa4a4431208c63783e834f8..85d17f257c338f668a1d17d9fc62a2f48ec84230:/app/helpers/browse_helper.rb?ds=sidebyside

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 48dd590a2..de439d56f 100644
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -2,9 +2,14 @@ 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 object.id.is_a?(Array)
+      id = object.id[0]
+    else
+      id = object.id
+    end
+    name = t 'printable_name.with_id', :id => id.to_s
     if version
       name = t 'printable_name.with_version', :id => name, :version => object.version.to_s
     end
@@ -16,41 +21,87 @@ module BrowseHelper
     return name
   end
 
-  def wiki_link(type, key, tag)
-    wiki_data = YAML.load_file("#{RAILS_ROOT}/config/wiki-tag-and-key-description.yml")
-    my_locale = I18n.locale.to_s
+  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
 
-    if type == "key"
-      ret = key
-      lookup = key
+  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)
     else
-      ret = tag
-      lookup = key + "=" + tag
+      h(key)
     end
+  end
 
-    # Try our native language
-    has_primary = wiki_data[my_locale][type][lookup] rescue false
-    if has_primary
-      ret = wikify(type, key, tag, lookup, wiki_data[my_locale][type][lookup])
+  def format_value(key, value)
+    if wp = wikipedia_link(key, value)
+      link_to h(wp[:title]), wp[:url], :title => t('browse.tag_details.wikipedia_link', :page => wp[:title])
+    elsif url = wiki_link("tag", "#{key}=#{value}")
+      link_to h(value), url, :title => t('browse.tag_details.wiki_link.tag', :key => key, :value => value)
     else
-      # Fall back on English
-      has_fallback = wiki_data["en"][type][lookup] rescue false
-      if has_fallback
-        ret = wikify(type, key, tag, lookup, wiki_data["en"][type][lookup])
-      end
+      linkify h(value)
+    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
+
+    # 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_us] rescue nil
+      url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
     end
 
-    return ret
+    return url
   end
 
-  def wikify(type, key, tag, text, wiki)
-    my_locale = I18n.locale
-    url = "http://wiki.openstreetmap.org/wiki/#{wiki}?uselang=#{my_locale}"
-    
-    if type == "key"
-      return '<a href="' + url + '" title="' + h(t('browse.tag_details.wiki_link.key', :key => key)) + '">' + h(text) + '</a>'
+  def wikipedia_link(key, value)
+    # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL
+    return nil if value =~ /^https?:\/\//
+
+    if key == "wikipedia"
+      # This regex should match Wikipedia language codes, everything
+      # from de to zh-classical
+      if value =~ /^([a-z-]{2,12}):(.+)$/
+        # Value is <lang>:<title> so split it up
+        lang  = $1
+        value = $2
+      else
+        # Value is <title> so default to English Wikipedia
+        lang = 'en'
+      end
+    elsif key =~ /^wikipedia:(\S+)$/
+      # Language is in the key, so assume value is a simple title
+      lang = $1
     else
-      return '<a href="' + url + '" title="' + h(t('browse.tag_details.wiki_link.tag', :key => key, :value => tag)) + '">' + h(tag) + '</a>'
+      # Not a wikipedia key!
+      return nil
     end
+
+    return {
+      :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}",
+      :title => value
+    }
   end
 end