X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b095b59d5e0ee805e49980af80b21bd1acff1345..25d5c58c5c8902812731ef8d202dd2f015771cb1:/app/helpers/browse_helper.rb diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index b192a63d5..8e0c7648f 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -1,30 +1,36 @@ +require "cgi" + module BrowseHelper - def printable_name(object, version=false) - 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 + def printable_name(object, version = false) + id = if object.id.is_a?(Array) + object.id[0] + else + object.id + end + name = t "printable_name.with_id", :id => id.to_s + 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? - if object.tags.include? "name:#{I18n.locale}" - name = t 'printable_name.with_name', :name => object.tags["name:#{I18n.locale}"].to_s, :id => name - elsif object.tags.include? 'name' - name = t 'printable_name.with_name', :name => object.tags['name'].to_s, :id => name + locale = I18n.locale.to_s + + 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) + 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) + 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) end end - return name + name end def link_class(type, object) - classes = [ type ] + classes = [type] if object.redacted? classes << "deleted" @@ -40,13 +46,17 @@ module BrowseHelper 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 + def link_follow(object) + "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) + link_to h(key), url, :title => t("browse.tag_details.wiki_link.key", :key => key) else h(key) end @@ -54,9 +64,20 @@ module BrowseHelper 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]) + 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) + 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 colour_value = colour_preview(key, value) + %(
#{h(value)} ) else linkify h(value) end @@ -74,15 +95,12 @@ module BrowseHelper end end -private + private - ICON_TAGS = [ - "aeroway", "amenity", "barrier", "building", "highway", "historic", "landuse", - "leisure", "man_made", "natural", "railway", "shop", "tourism", "waterway" - ] + 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 } + object.tags.find_all { |k, _v| ICON_TAGS.include? k }.sort end def wiki_link(type, lookup) @@ -94,50 +112,94 @@ private # 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 - return url + url end def wikipedia_link(key, value) # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL - return nil if value =~ /^https?:\/\// + return nil if value =~ %r{^https?://} if key == "wikipedia" # This regex should match Wikipedia language codes, everything # from de to zh-classical - if value =~ /^([a-z-]{2,12}):(.+)$/i - # Value is