X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/23fa74823a66df95330f75f9bfd5cb2bffcb2505..5bb23f6f5f8fed81f1166a15344e44afa7fbb480:/app/helpers/browse_helper.rb?ds=inline diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb index 17de962fe..482503e8a 100644 --- a/app/helpers/browse_helper.rb +++ b/app/helpers/browse_helper.rb @@ -1,52 +1,77 @@ -require "cgi" - module BrowseHelper - def printable_name(object, version = false) + def element_icon(type, object) + selected_icon_data = { :filename => "#{type}.svg", :priority => 1 } + + unless object.redacted? + target_tags = object.tags.find_all { |k, _v| BROWSE_ICONS.key? k }.sort + title = target_tags.map { |k, v| "#{k}=#{v}" }.to_sentence unless target_tags.empty? + + target_tags.each do |k, v| + icon_data = BROWSE_ICONS[k][v] || BROWSE_ICONS[k][:*] + selected_icon_data = icon_data if icon_data && icon_data[:priority] > selected_icon_data[:priority] + end + end + + image_tag "browse/#{selected_icon_data[:filename]}", + :size => 20, + :class => ["align-bottom object-fit-none browse-icon", { "browse-icon-invertible" => selected_icon_data[:invert] }], + :title => title + end + + def element_single_current_link(type, object) + link_to object, { :rel => (link_follow(object) if type == "node") } do + element_strikethrough object do + printable_element_name object + end + end + end + + def element_list_item(type, object, &) + tag.li(tag.div(element_icon(type, object) + tag.div(:class => "align-self-center", &), :class => "d-flex gap-1")) + end + + def element_list_item_with_strikethrough(type, object, &) + element_list_item type, object do + element_strikethrough object, & + end + end + + def printable_element_name(object) 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 + name = id.to_s # 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}" - 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" - 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" - 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 name end - def link_class(type, object) - classes = [type] - - if object.redacted? - classes << "deleted" - else - classes += icon_tags(object).flatten.map { |t| h(t) } - classes << "deleted" unless object.visible? - end - - classes.join(" ") + def printable_element_version(object) + t "printable_name.version", :version => object.version end - def link_title(object) - if object.redacted? - "" + def element_strikethrough(object, &) + if object.redacted? || !object.visible? + tag.s(&) else - h(icon_tags(object).map { |k, v| k + "=" + v }.to_sentence) + yield end end @@ -54,152 +79,44 @@ module BrowseHelper "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 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)} ).html_safe - else - linkify h(value) - end - end - - def type_and_paginated_count(type, pages) + def type_and_paginated_count(type, pages, selected_page = pages.current_page) if pages.page_count == 1 - t "browse.changeset.#{type}", + t ".#{type.pluralize}", :count => pages.item_count else - t "browse.changeset.#{type}_paginated", - :x => pages.current_page.first_item, - :y => pages.current_page.last_item, + t ".#{type.pluralize}_paginated", + :x => selected_page.first_item, + :y => selected_page.last_item, :count => pages.item_count end end - private - - 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 - 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