Only include tags which affect the icon in the link title

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 48dd590a20faa16d05c2dddc1cd6609ead18baab..28d1c4dc76ef96f93dc86a1dbcbc642db8e533ec 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 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
   def printable_name(object, version=false)
     name = t 'printable_name.with_id', :id => object.id.to_s
     if version


@@ -16,41 +16,81 @@ module BrowseHelper
     return name
   end
 
     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 css_class(type, object)
+    return type + " " + h(icon_tags(object).join(' '))
+  end

 
 

-    if type == "key"
-      ret = key
-      lookup = key
+  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)

     else
     else

-      ret = tag
-      lookup = key + "=" + tag
+      h(key)

     end
     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
     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

+  end
+
+private
+
+  ICON_TAGS = [ 
+    "aeroway", "amenity", "barrier", "building", "highway", "landuse",
+    "leisure", "man_made", "natural", "railway", "shop", "tourism", "waterway"
+  ]

 
 

-    return ret
+  def icon_tags(object)
+    object.tags.find_all { |k,v| ICON_TAGS.include? k }

   end
 
   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 wiki_link(type, lookup)
+    locale = I18n.locale.to_s
+
+    if page = WIKI_PAGES[locale][type][lookup] rescue nil
+      url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
+    elsif page = WIKI_PAGES["en"][type][lookup] rescue nil
+      url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
+    end
+
+    return url
+  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
+      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
     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
     end

+
+    return {
+      :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}",
+      :title => value
+    }

   end
 end
   end
 end