X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/12c1d5e6c05813a0697724277b4d8529a1a7c240..6b633e9d4a49df1f9308ef392203437cb7742558:/app/controllers/api/changesets_controller.rb

diff --git a/app/controllers/api/changesets_controller.rb b/app/controllers/api/changesets_controller.rb
index 56070951a..0a49a95f4 100644
--- a/app/controllers/api/changesets_controller.rb
+++ b/app/controllers/api/changesets_controller.rb
@@ -170,8 +170,15 @@ module Api
       changesets = conditions_closed(changesets, params["closed"])
       changesets = conditions_ids(changesets, params["changesets"])
 
-      # sort and limit the changesets
-      changesets = changesets.order("created_at DESC").limit(100)
+      # sort the changesets
+      changesets = if params[:order] == "oldest"
+                     changesets.order(:closed_at => :asc)
+                   else
+                     changesets.order(:closed_at => :desc)
+                   end
+
+      # limit the result
+      changesets = changesets.limit(result_limit)
 
       # preload users, tags and comments, and render result
       @changesets = changesets.preload(:user, :changeset_tags, :comments)
@@ -383,5 +390,19 @@ module Api
         changesets.where(:id => ids)
       end
     end
+
+    ##
+    # Get the maximum number of results to return
+    def result_limit
+      if params[:limit]
+        if params[:limit].to_i.positive? && params[:limit].to_i <= Settings.max_changeset_query_limit
+          params[:limit].to_i
+        else
+          raise OSM::APIBadUserInput, "Changeset limit must be between 1 and #{Settings.max_changeset_query_limit}"
+        end
+      else
+        Settings.default_changeset_query_limit
+      end
+    end
   end
 end