Merge pull request #3690 from AntonKhorev/search-form-no-group

[rails.git] / app / controllers / api / notes_controller.rb

diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb
index e6f391ede96e3767e7c5c08f9c210e3a744a9f8c..95466781f84c8bd97a8fef6c6bea1332d26f6388 100644 (file)
--- a/app/controllers/api/notes_controller.rb
+++ b/app/controllers/api/notes_controller.rb
@@ -18,13 +18,10 @@ module Api
       # support the old, deprecated, method with four arguments
       if params[:bbox]
         bbox = BoundingBox.from_bbox_params(params)
       # support the old, deprecated, method with four arguments
       if params[:bbox]
         bbox = BoundingBox.from_bbox_params(params)

-      else
-        raise OSM::APIBadUserInput, "No l was given" unless params[:l]
-        raise OSM::APIBadUserInput, "No r was given" unless params[:r]
-        raise OSM::APIBadUserInput, "No b was given" unless params[:b]
-        raise OSM::APIBadUserInput, "No t was given" unless params[:t]
-
+      elsif params[:l] && params[:r] && params[:b] && params[:t]

         bbox = BoundingBox.from_lrbt_params(params)
         bbox = BoundingBox.from_lrbt_params(params)

+      else
+        raise OSM::APIBadUserInput, "The parameter bbox is required"

       end
 
       # Get any conditions that need to be applied
       end
 
       # Get any conditions that need to be applied


@@ -235,23 +232,12 @@ module Api
     def feed
       # Get any conditions that need to be applied
       notes = closed_condition(Note.all)
     def feed
       # Get any conditions that need to be applied
       notes = closed_condition(Note.all)

-
-      # Process any bbox
-      if params[:bbox]
-        bbox = BoundingBox.from_bbox_params(params)
-
-        bbox.check_boundaries
-        bbox.check_size(Settings.max_note_request_area)
-
-        notes = notes.bbox(bbox)
-        @min_lon = bbox.min_lon
-        @min_lat = bbox.min_lat
-        @max_lon = bbox.max_lon
-        @max_lat = bbox.max_lat
-      end
+      notes = bbox_condition(notes)

 
       # Find the comments we want to return
 
       # Find the comments we want to return

-      @comments = NoteComment.where(:note => notes).order("created_at DESC").limit(result_limit).preload(:note)
+      @comments = NoteComment.where(:note => notes)
+                             .order(:created_at => :desc).limit(result_limit)
+                             .preload(:author, :note => { :comments => :author })

 
       # Render the result
       respond_to do |format|
 
       # Render the result
       respond_to do |format|


@@ -264,6 +250,7 @@ module Api
     def search
       # Get the initial set of notes
       @notes = closed_condition(Note.all)
     def search
       # Get the initial set of notes
       @notes = closed_condition(Note.all)

+      @notes = bbox_condition(@notes)

 
       # Add any user filter
       if params[:display_name] || params[:user]
 
       # Add any user filter
       if params[:display_name] || params[:user]


@@ -376,6 +363,27 @@ module Api
       end
     end
 
       end
     end
 

+    ##
+    # Generate a condition to choose which notes we want based
+    # on the user's bounding box request parameters
+    def bbox_condition(notes)
+      if params[:bbox]
+        bbox = BoundingBox.from_bbox_params(params)
+
+        bbox.check_boundaries
+        bbox.check_size(Settings.max_note_request_area)
+
+        @min_lon = bbox.min_lon
+        @min_lat = bbox.min_lat
+        @max_lon = bbox.max_lon
+        @max_lat = bbox.max_lat
+
+        notes.bbox(bbox)
+      else
+        notes
+      end
+    end
+

     ##
     # Add a comment to a note
     def add_comment(note, text, event, notify: true)
     ##
     # Add a comment to a note
     def add_comment(note, text, event, notify: true)