Resolve conflict

[rails.git] / app / controllers / changeset_controller.rb

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 63f9f0f7d4745aceb943f1965ce39ffd60ee954e..735fa73a88c31a1820515aa9e4677011946be8b3 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -210,6 +210,7 @@ class ChangesetController < ApplicationController
     changesets = conditions_time(changesets, params['time'])
     changesets = conditions_open(changesets, params['open'])
     changesets = conditions_closed(changesets, params['closed'])
+    changesets = conditions_ids(changesets, params['changesets'])
 
     # create the results document
     results = OSM::API.new.get_xml_doc
@@ -250,8 +251,8 @@ class ChangesetController < ApplicationController
   ##
   # list edits (open changesets) in reverse chronological order
   def list
-    if request.format == :atom and params[:page]
-      redirect_to params.merge({ :page => nil }), :status => :moved_permanently
+    if request.format == :atom and params[:max_id]
+      redirect_to params.merge({ :max_id => nil }), :status => :moved_permanently
       return
     end
 
@@ -268,7 +269,8 @@ class ChangesetController < ApplicationController
       return
     end
 
-    if request.format == :html and !params[:bbox]
+    if request.format == :html and !params[:list]
+      require_oauth
       render :action => :history, :layout => map_layout
     else
       changesets = conditions_nonempty(Changeset.all)
@@ -291,7 +293,7 @@ class ChangesetController < ApplicationController
         changesets = changesets.where("changesets.id <= ?", params[:max_id])
       end
 
-      @edits = changesets.order("changesets.created_at DESC").limit(20).preload(:user, :changeset_tags)
+      @edits = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags)
 
       render :action => :list, :layout => false
     end
@@ -412,6 +414,20 @@ private
     end
   end
 
+  ##
+  # query changesets by a list of ids
+  # (either specified as array or comma-separated string)
+  def conditions_ids(changesets, ids)
+    if ids.nil?
+      return changesets
+    elsif ids.empty?
+      raise OSM::APIBadUserInput.new("No changesets were given to search for")
+    else
+      ids = ids.split(',').collect { |n| n.to_i }
+      return changesets.where(:id => ids)
+    end
+  end
+
   ##
   # eliminate empty changesets (where the bbox has not been set)
   # this should be applied to all changeset list displays