Merge remote-tracking branch 'upstream/pull/5064'

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

diff --git a/app/helpers/changesets_helper.rb b/app/helpers/changesets_helper.rb
index ae953c5833c59c59e2b135d342f0d2c7aa2f21e5..d3bc5ed9ac085cf0259ebdf37a7a085bbe1caa30 100644 (file)
--- a/app/helpers/changesets_helper.rb
+++ b/app/helpers/changesets_helper.rb
@@ -32,7 +32,7 @@ module ChangesetsHelper
 
   def changeset_index_title(params, user)
     if params[:friends] && user
 
   def changeset_index_title(params, user)
     if params[:friends] && user

-      t "changesets.index.title_friend"
+      t "changesets.index.title_followed"

     elsif params[:nearby] && user
       t "changesets.index.title_nearby"
     elsif params[:display_name]
     elsif params[:nearby] && user
       t "changesets.index.title_nearby"
     elsif params[:display_name]


@@ -41,4 +41,20 @@ module ChangesetsHelper
       t "changesets.index.title"
     end
   end
       t "changesets.index.title"
     end
   end

+
+  def changeset_data(changeset)
+    changeset_data = { :id => changeset.id }
+
+    if changeset.bbox_valid?
+      bbox = changeset.bbox.to_unscaled
+      changeset_data[:bbox] = {
+        :minlon => bbox.min_lon,
+        :minlat => bbox.min_lat,
+        :maxlon => bbox.max_lon,
+        :maxlat => bbox.max_lat
+      }
+    end
+
+    changeset_data
+  end

 end
 end