Preserve the bounding box when redirecting history URLs

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 28d1c4dc76ef96f93dc86a1dbcbc642db8e533ec..cf13c27958943a6438b0fdcf99a947416667709a 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,27 +1,42 @@
 module BrowseHelper
 module BrowseHelper

-  def link_to_page(page, page_param)
-    return link_to(page, page_param => page)
-  end
-

   def printable_name(object, version=false)
   def printable_name(object, version=false)

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

     end
     end

+

     return name
   end
 
     return name
   end
 

-  def css_class(type, object)
-    return type + " " + h(icon_tags(object).join(' '))
+  def link_class(type, object)
+    if object.redacted?
+      type + " deleted"
+    else
+      type + " " + h(icon_tags(object).join(' ')) + (object.visible == false ? ' deleted' : '')
+    end

   end
 
   def link_title(object)
   end
 
   def link_title(object)

-    return h(icon_tags(object).map { |k,v| k + '=' + v }.to_sentence)
+    if object.redacted?
+      ""
+    else
+      h(icon_tags(object).map { |k,v| k + '=' + v }.to_sentence)
+    end

   end
 
   def format_key(key)
   end
 
   def format_key(key)


@@ -42,10 +57,22 @@ module BrowseHelper
     end
   end
 
     end
   end
 

+  def type_and_paginated_count(type, pages)
+    if pages.page_count == 1
+      t "browse.changeset.#{type}",
+        :count => pages.item_count
+    else
+      t "browse.changeset.#{type}_paginated",
+        :x => pages.current_page.first_item,
+        :y => pages.current_page.last_item,
+        :count => pages.item_count
+    end
+  end
+

 private
 
 private
 

-  ICON_TAGS = [ 
-    "aeroway", "amenity", "barrier", "building", "highway", "landuse",
+  ICON_TAGS = [
+    "aeroway", "amenity", "barrier", "building", "highway", "historic", "landuse",

     "leisure", "man_made", "natural", "railway", "shop", "tourism", "waterway"
   ]
 
     "leisure", "man_made", "natural", "railway", "shop", "tourism", "waterway"
   ]
 


@@ -56,9 +83,15 @@ private
   def wiki_link(type, lookup)
     locale = I18n.locale.to_s
 
   def wiki_link(type, lookup)
     locale = I18n.locale.to_s
 

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

-    elsif page = WIKI_PAGES["en"][type][lookup] rescue nil
+    elsif page = WIKI_PAGES["en"][type][lookup_us] rescue nil

       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
     end
 
       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
     end
 


@@ -67,15 +100,15 @@ private
 
   def wikipedia_link(key, value)
     # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL
 
   def wikipedia_link(key, value)
     # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL

-    return nil if value =~ /^http:\/\//
+    return nil if value =~ /^https?:\/\//

 
     if key == "wikipedia"
       # This regex should match Wikipedia language codes, everything
       # from de to zh-classical
 
     if key == "wikipedia"
       # This regex should match Wikipedia language codes, everything
       # from de to zh-classical

-      if value =~ /^([a-z-]{2,12}):(.+)$/
+      if value =~ /^([a-z-]{2,12}):(.+)$/i

         # Value is <lang>:<title> so split it up
         # 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
         lang  = $1

-        value = $2

       else
         # Value is <title> so default to English Wikipedia
         lang = 'en'
       else
         # Value is <title> so default to English Wikipedia
         lang = 'en'