Adjust browse line/icon height/alignment for text-only zooming

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 6ec3fb591c017d1d3848c9259b9874c468781be4..482503e8ae66b3c48e5be261e5974c5d66aba821 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,49 +1,122 @@
 module BrowseHelper
 module BrowseHelper

-  def link_to_page(page, page_param)
-    return link_to(page, page_param => page)
+  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
   end

-  
-  def printable_name(object, version=false)
-    name = t 'printable_name.with_id', :id => object.id.to_s
-    if version
-      name = t 'printable_name.with_version', :id => name, :version => object.version.to_s
+
+  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

-    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
+  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

-    return name

   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)
+  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 printable_element_version(object)
+    t "printable_name.version", :version => object.version
+  end
+
+  def element_strikethrough(object, &)
+    if object.redacted? || !object.visible?
+      tag.s(&)

     else
     else

-      h(key)
+      yield

     end
   end
 
     end
   end
 

-  def format_value(key, value)
-    if url = wiki_link("tag", "#{key}=#{value}")
-      link_to h(value), url, :title => t('browse.tag_details.wiki_link.tag', :key => key, :value => value)
+  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 ".#{type.pluralize}",
+        :count => pages.item_count

     else
     else

-      linkify h(value)
+      t ".#{type.pluralize}_paginated",
+        :x => selected_page.first_item,
+        :y => selected_page.last_item,
+        :count => pages.item_count

     end
   end
 
     end
   end
 

-private
+  def sidebar_classic_pagination(pages, page_param)
+    max_width_for_default_padding = 35

 
 

-  def wiki_link(type, lookup)
-    wiki_data = YAML.load_file("#{RAILS_ROOT}/config/wiki-tag-and-key-description.yml")
-    locale = I18n.locale.to_s
+    width = 0
+    pagination_items(pages, {}).each do |(body)|
+      width += 2 # padding width
+      width += body.length
+    end
+    link_classes = ["page-link", { "px-1" => width > max_width_for_default_padding }]

 
 

-    if page = wiki_data[locale][type][lookup] rescue nil
-      url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
-    elsif page = wiki_data["en"][type][lookup] rescue nil
-      url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
+    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

     end
     end

+  end
+
+  private

 
 

-    return url
+  def name_locales(object)
+    object.tags.keys.map { |k| Regexp.last_match(1) if k =~ /^name:(.*)$/ }.flatten

   end
 end
   end
 end