Forgot that /history can also be called without a bbox (if one can't be found)

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

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index e8212d510a072b8b35b706876e7a2b8929c0cbfc..959957463097d53ae93de2588c52ba4bc94f1c32 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -1,7 +1,7 @@
 # The ChangesetController is the RESTful interface to Changeset objects
 
 class ChangesetController < ApplicationController
-  layout 'site', :except => :rss
+  layout 'site', :except => [ :list_rss, :list_user_rss, :list_bbox_rss ]
   require 'xml/libxml'
 
   before_filter :authorize_web, :only => [:list, :list_user, :list_bbox]
@@ -273,6 +273,18 @@ class ChangesetController < ApplicationController
                                    :limit => 20)
     
   end
+
+  ##
+  # list edits (open changesets) in reverse chronological order
+  def list_rss
+    conditions = conditions_nonempty
+
+    @edits =  Changeset.find(:all,
+                             :order => "changesets.created_at DESC",
+                             :conditions => conditions,
+                             :limit => 20)
+    
+  end
   
   ##
   # list edits (changesets) belonging to a user
@@ -301,7 +313,7 @@ class ChangesetController < ApplicationController
 
   ##
   # list edits (changesets) belonging to a user
-  def rss
+  def list_user_rss
     user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})
     
     if user
@@ -352,6 +364,35 @@ class ChangesetController < ApplicationController
                                    
     @bbox = sanitise_boundaries(bbox.split(/,/)) unless bbox==nil
   end
+
+  ##
+  # list changesets in a bbox
+  def list_bbox_rss
+    # support 'bbox' param or alternatively 'minlon', 'minlat' etc       
+    if params['bbox']
+       bbox = params['bbox']
+    elsif params['minlon'] and params['minlat'] and params['maxlon'] and params['maxlat']
+       bbox = h(params['minlon']) + ',' + h(params['minlat']) + ',' + h(params['maxlon']) + ',' + h(params['maxlat'])
+    else
+      #TODO: fix bugs in location determination for history tab (and other tabs) then uncomment this redirect
+      #redirect_to :action => 'list'
+      
+      # For now just render immediately, and skip the db
+      render
+      return
+    end
+       
+    conditions = conditions_bbox(bbox);
+    conditions = cond_merge conditions, conditions_nonempty
+    
+    @edit_pages, @edits = paginate(:changesets,
+                                   :include => [:user, :changeset_tags],
+                                   :conditions => conditions,
+                                   :order => "changesets.created_at DESC",
+                                   :per_page => 20)
+                                   
+    @bbox = sanitise_boundaries(bbox.split(/,/)) unless bbox==nil
+  end
   
 private
   #------------------------------------------------------------