X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e670da54cbc4a7b00525b8decb506a23deddd918..07fc605923eb6f64318b9559d3eecf979789ae3e:/app/helpers/browse_helper.rb?ds=sidebyside

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index cf13c2795..482503e8a 100644
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,129 +1,122 @@
 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 element_icon(type, object)
+    selected_icon_data = { :filename => "#{type}.svg", :priority => 1 }
 
-    # 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
+      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
 
-    return name
+    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 link_class(type, object)
-    if object.redacted?
-      type + " deleted"
-    else
-      type + " " + h(icon_tags(object).join(' ')) + (object.visible == false ? ' deleted' : '')
+  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 link_title(object)
-    if object.redacted?
-      ""
-    else
-      h(icon_tags(object).map { |k,v| k + '=' + v }.to_sentence)
+  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 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)
+  def printable_element_name(object)
+    id = if object.id.is_a?(Array)
+           object.id[0]
+         else
+           object.id
+         end
+    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?
+      available_locales = Locale.list(name_locales(object))
+
+      locale = available_locales.preferred(preferred_languages, :default => nil)
+
+      if object.tags.include? "name:#{locale}"
+        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 => tag.bdi(object.tags["name"].to_s), :id => tag.bdi(name)
+      elsif object.tags.include? "ref"
+        name = t "printable_name.with_name_html", :name => tag.bdi(object.tags["ref"].to_s), :id => tag.bdi(name)
+      end
     end
+
+    name
   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 url = wiki_link("tag", "#{key}=#{value}")
-      link_to h(value), url, :title => t('browse.tag_details.wiki_link.tag', :key => key, :value => value)
+  def printable_element_version(object)
+    t "printable_name.version", :version => object.version
+  end
+
+  def element_strikethrough(object, &)
+    if object.redacted? || !object.visible?
+      tag.s(&)
     else
-      linkify h(value)
+      yield
     end
   end
 
-  def type_and_paginated_count(type, pages)
+  def link_follow(object)
+    "nofollow" if object.tags.empty?
+  end
+
+  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 = [
-    "aeroway", "amenity", "barrier", "building", "highway", "historic", "landuse",
-    "leisure", "man_made", "natural", "railway", "shop", "tourism", "waterway"
-  ]
-
-  def icon_tags(object)
-    object.tags.find_all { |k,v| ICON_TAGS.include? k }
-  end
+  def sidebar_classic_pagination(pages, page_param)
+    max_width_for_default_padding = 35
 
-  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[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}"
+    width = 0
+    pagination_items(pages, {}).each do |(body)|
+      width += 2 # padding width
+      width += body.length
     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 =~ /^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 <lang>:<title> so split it up
-        # Note that value is always left as-is, see: https://trac.openstreetmap.org/ticket/4315
-        lang  = $1
-      else
-        # Value is <title> so default to English Wikipedia
-        lang = 'en'
+    link_classes = ["page-link", { "px-1" => width > max_width_for_default_padding }]
+
+    tag.ul :class => "pagination pagination-sm mb-2" do
+      pagination_items(pages, {}).each do |body, page_or_class|
+        linked = !(page_or_class.is_a? String)
+        link = if linked
+                 link_to body, url_for(page_param => page_or_class.number), :class => link_classes, **yield(page_or_class)
+               else
+                 tag.span body, :class => link_classes
+               end
+        concat tag.li link, :class => ["page-item", { page_or_class => !linked }]
       end
-    elsif key =~ /^wikipedia:(\S+)$/
-      # Language is in the key, so assume value is a simple title
-      lang = $1
-    else
-      # Not a wikipedia key!
-      return nil
     end
+  end
+
+  private
 
-    return {
-      :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}",
-      :title => value
-    }
+  def name_locales(object)
+    object.tags.keys.map { |k| Regexp.last_match(1) if k =~ /^name:(.*)$/ }.flatten
   end
 end