-require "uri"
+require "cgi"
module BrowseHelper
def printable_name(object, version = false)
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
+ name = t "printable_name.with_version", :id => name, :version => object.version.to_s if version
# 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
- while locale =~ /-[^-]+/ && !object.tags.include?("name:#{I18n.locale}")
- locale = locale.sub(/-[^-]+/, "")
- end
+ locale = locale.sub(/-[^-]+/, "") while locale =~ /-[^-]+/ && !object.tags.include?("name:#{I18n.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)
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 url = telephone_link(key, value)
- link_to h(value), url, :title => t("browse.tag_details.telephone_link", :phone_number => 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
private
- ICON_TAGS = %w(aeroway amenity barrier building highway historic landuse leisure man_made natural railway shop tourism waterway).freeze
+ ICON_TAGS = %w[aeroway amenity barrier building highway historic landuse leisure man_made natural railway shop tourism waterway].freeze
def icon_tags(object)
object.tags.find_all { |k, _v| ICON_TAGS.include? k }.sort
# 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}"
+ 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
# Must break it up to correctly build the url
value = Regexp.last_match(1)
section = "#" + Regexp.last_match(2)
- encoded_section = "#" + URI.encode(Regexp.last_match(2).gsub(/ +/, "_"), /[^A-Za-z0-9:_]/).tr("%", ".")
+ encoded_section = "#" + CGI.escape(Regexp.last_match(2).gsub(/ +/, "_")).tr("%", ".")
else
section = ""
encoded_section = ""
end
{
- :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{encoded_section}",
+ :url => "https://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{encoded_section}",
:title => value + section
}
end
# 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/wiki/#{value}?uselang=#{I18n.locale}",
+ :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|operator|subject):wikidata/ &&
+ 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/wiki/#{id.strip}?uselang=#{I18n.locale}" }
+ { :title => id, :url => "//www.wikidata.org/entity/#{id.strip}?uselang=#{I18n.locale}" }
end
end
nil
end
- def telephone_link(_key, value)
- # does it look like a phone number? eg "+1 (234) 567-8901 " ?
- return nil unless value =~ %r{^\s*\+[\d\s\(\)/\.-]{6,25}\s*$}
-
- # remove all whitespace instead of encoding it http://tools.ietf.org/html/rfc3966#section-5.1.1
- # "+1 (234) 567-8901 " -> "+1(234)567-8901"
- value_no_whitespace = value.gsub(/\s+/, "")
-
- "tel:#{value_no_whitespace}"
+ 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
end
end
projects / rails.git / blobdiff