Fix opensearch icon & update attribution

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index e6ac242dd7421b93bc106dd053c9cf12eed0f83c..0f533770b8042165245e0d036b066626c4b97a30 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,7 +1,5 @@
-require "cgi"
-

 module BrowseHelper
 module BrowseHelper

-  def printable_name(object, version = false)
+  def printable_name(object, version: false)

     id = if object.id.is_a?(Array)
            object.id[0]
          else
     id = if object.id.is_a?(Array)
            object.id[0]
          else


@@ -13,16 +11,16 @@ module BrowseHelper
     # don't look at object tags if redacted, so as to avoid giving
     # away redacted version tag information.
     unless object.redacted?
     # don't look at object tags if redacted, so as to avoid giving
     # away redacted version tag information.
     unless object.redacted?

-      locale = I18n.locale.to_s
+      available_locales = Locale.list(name_locales(object))

 
 

-      locale = locale.sub(/-[^-]+/, "") while locale =~ /-[^-]+/ && !object.tags.include?("name:#{I18n.locale}")
+      locale = available_locales.preferred(preferred_languages, :default => nil)

 
       if object.tags.include? "name:#{locale}"
 
       if object.tags.include? "name:#{locale}"

-        name = t "printable_name.with_name_html", :name => content_tag(:bdi, object.tags["name:#{locale}"].to_s), :id => content_tag(:bdi, name)
+        name = t "printable_name.with_name_html", :name => tag.bdi(object.tags["name:#{locale}"].to_s), :id => tag.bdi(name)

       elsif object.tags.include? "name"
       elsif object.tags.include? "name"

-        name = t "printable_name.with_name_html", :name => content_tag(:bdi, object.tags["name"].to_s), :id => content_tag(:bdi, name)
+        name = t "printable_name.with_name_html", :name => tag.bdi(object.tags["name"].to_s), :id => tag.bdi(name)

       elsif object.tags.include? "ref"
       elsif object.tags.include? "ref"

-        name = t "printable_name.with_name_html", :name => content_tag(:bdi, object.tags["ref"].to_s), :id => content_tag(:bdi, name)
+        name = t "printable_name.with_name_html", :name => tag.bdi(object.tags["ref"].to_s), :id => tag.bdi(name)

       end
     end
 
       end
     end
 


@@ -46,7 +44,7 @@ module BrowseHelper
     if object.redacted?
       ""
     else
     if object.redacted?
       ""
     else

-      h(icon_tags(object).map { |k, v| k + "=" + v }.to_sentence)
+      h(icon_tags(object).map { |k, v| "#{k}=#{v}" }.to_sentence)

     end
   end
 
     end
   end
 


@@ -54,37 +52,6 @@ module BrowseHelper
     "nofollow" if object.tags.empty?
   end
 
     "nofollow" if object.tags.empty?
   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
-      h(key)
-    end
-  end
-
-  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 wdt = wikidata_links(key, value)
-      # IMPORTANT: Note that wikidata_links() returns an array of hashes, unlike for example wikipedia_link(),
-      # which just returns one such hash.
-      wdt = wdt.map do |w|
-        link_to(w[:title], w[:url], :title => t("browse.tag_details.wikidata_link", :page => w[:title].strip))
-      end
-      safe_join(wdt, ";")
-    elsif url = wiki_link("tag", "#{key}=#{value}")
-      link_to h(value), url, :title => t("browse.tag_details.wiki_link.tag", :key => key, :value => value)
-    elsif phones = telephone_links(key, value)
-      # similarly, telephone_links() returns an array of phone numbers
-      phones = phones.map do |p|
-        link_to(h(p[:phone_number]), p[:url], :title => t("browse.tag_details.telephone_link", :phone_number => p[:phone_number]))
-      end
-      safe_join(phones, "; ")
-    else
-      linkify h(value)
-    end
-  end
-

   def type_and_paginated_count(type, pages)
     if pages.page_count == 1
       t "browse.changeset.#{type}",
   def type_and_paginated_count(type, pages)
     if pages.page_count == 1
       t "browse.changeset.#{type}",


@@ -105,105 +72,7 @@ module BrowseHelper
     object.tags.find_all { |k, _v| ICON_TAGS.include? k }.sort
   end
 
     object.tags.find_all { |k, _v| ICON_TAGS.include? k }.sort
   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.dig(locale, type, lookup_us)
-      url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
-    elsif page = WIKI_PAGES.dig("en", type, lookup_us)
-      url = "https://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
-    end
-
-    url
-  end
-
-  def wikipedia_link(key, value)
-    # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL
-    return nil if value =~ %r{^https?://}
-
-    if key == "wikipedia"
-      # This regex should match Wikipedia language codes, everything
-      # from de to zh-classical
-      lang = if value =~ /^([a-z-]{2,12}):(.+)$/i
-               # Value is <lang>:<title> so split it up
-               # Note that value is always left as-is, see: https://trac.openstreetmap.org/ticket/4315
-               Regexp.last_match(1)
-             else
-               # Value is <title> so default to English Wikipedia
-               "en"
-             end
-    elsif key =~ /^wikipedia:(\S+)$/
-      # Language is in the key, so assume value is the title
-      lang = Regexp.last_match(1)
-    else
-      # Not a wikipedia key!
-      return nil
-    end
-
-    if value =~ /^([^#]*)#(.*)/
-      # Contains a reference to a section of the wikipedia article
-      # Must break it up to correctly build the url
-      value = Regexp.last_match(1)
-      section = "#" + Regexp.last_match(2)
-      encoded_section = "#" + CGI.escape(Regexp.last_match(2).gsub(/ +/, "_")).tr("%", ".")
-    else
-      section = ""
-      encoded_section = ""
-    end
-
-    {
-      :url => "https://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{encoded_section}",
-      :title => value + section
-    }
-  end
-
-  def wikidata_links(key, value)
-    # The simple wikidata-tag (this is limited to only one value)
-    if key == "wikidata" && value =~ /^[Qq][1-9][0-9]*$/
-      return [{
-        :url => "//www.wikidata.org/entity/#{value}?uselang=#{I18n.locale}",
-        :title => value
-      }]
-    # Key has to be one of the accepted wikidata-tags
-    elsif key =~ /(architect|artist|brand|name:etymology|network|operator|subject):wikidata/ &&
-          # Value has to be a semicolon-separated list of wikidata-IDs (whitespaces allowed before and after semicolons)
-          value =~ /^[Qq][1-9][0-9]*(\s*;\s*[Qq][1-9][0-9]*)*$/
-      # Splitting at every semicolon to get a separate hash for each wikidata-ID
-      return value.split(";").map do |id|
-        { :title => id, :url => "//www.wikidata.org/entity/#{id.strip}?uselang=#{I18n.locale}" }
-      end
-    end
-    nil
-  end
-
-  def telephone_links(_key, value)
-    # Does it look like a global phone number? eg "+1 (234) 567-8901 "
-    # or a list of alternate numbers separated by ;
-    #
-    # Per RFC 3966, this accepts the visual separators -.() within the number,
-    # which are displayed and included in the tel: URL, and accepts whitespace,
-    # which is displayed but not included in the tel: URL.
-    #  (see: http://tools.ietf.org/html/rfc3966#section-5.1.1)
-    #
-    # Also accepting / as a visual separator although not given in RFC 3966,
-    # because it is used as a visual separator in OSM data in some countries.
-    if value =~ %r{^\s*\+[\d\s\(\)/\.-]{6,25}\s*(;\s*\+[\d\s\(\)/\.-]{6,25}\s*)*$}
-      return value.split(";").map do |phone_number|
-        # for display, remove leading and trailing whitespace
-        phone_number = phone_number.strip
-
-        # for tel: URL, remove all whitespace
-        # "+1 (234) 567-8901 " -> "tel:+1(234)567-8901"
-        phone_no_whitespace = phone_number.gsub(/\s+/, "")
-        { :phone_number => phone_number, :url => "tel:#{phone_no_whitespace}" }
-      end
-    end
-    nil
+  def name_locales(object)
+    object.tags.keys.map { |k| Regexp.last_match(1) if k =~ /^name:(.*)$/ }.flatten

   end
 end
   end
 end