We can cache the trace list for logged in users now

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

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 80b9fdb94df1bea3d61f8b9e72bc0053d1eac415..f80a938baf96804925617988444452aa570538f0 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -4,15 +4,17 @@ class ChangesetController < ApplicationController
   layout 'site'
   require 'xml/libxml'
 
-  before_filter :authorize_web, :only => [:list, :list_user, :list_bbox]
-  before_filter :set_locale, :only => [:list, :list_user, :list_bbox]
+  before_filter :authorize_web, :only => [:list]
+  before_filter :set_locale, :only => [:list]
   before_filter :authorize, :only => [:create, :update, :delete, :upload, :include, :close]
   before_filter :require_allow_write_api, :only => [:create, :update, :delete, :upload, :include, :close]
   before_filter :require_public_data, :only => [:create, :update, :delete, :upload, :include, :close]
   before_filter :check_api_writable, :only => [:create, :update, :delete, :upload, :include]
-  before_filter :check_api_readable, :except => [:create, :update, :delete, :upload, :download, :query]
+  before_filter :check_api_readable, :except => [:create, :update, :delete, :upload, :download, :query, :list]
+  before_filter(:only => [:list]) { |c| c.check_database_readable(true) }
   after_filter :compress_output
-  around_filter :api_call_handle_error
+  around_filter :api_call_handle_error, :except => [:list]
+  around_filter :web_timeout, :only => [:list]
 
   filter_parameter_logging "<osmChange version"
 
@@ -28,7 +30,7 @@ class ChangesetController < ApplicationController
 
     cs = Changeset.from_xml(request.raw_post, true)
 
-    # Assume that Node.from_xml has thrown an exception if there is an error parsing the xml
+    # Assume that Changeset.from_xml has thrown an exception if there is an error parsing the xml
     cs.user_id = @user.id
     cs.save_with_tags!
     render :text => cs.id.to_s, :content_type => "text/plain"
@@ -255,7 +257,7 @@ class ChangesetController < ApplicationController
     conditions = conditions_nonempty
 
     if params[:display_name]
-      user = User.find_by_display_name(params[:display_name], :conditions => { :visible => true })
+      user = User.find_by_display_name(params[:display_name], :conditions => { :status => ["active", "confirmed"] })
 
       if user 
         if user.data_public? or user == @user
@@ -345,7 +347,10 @@ private
       raise OSM::APIBadUserInput.new("Minimum longitude should be less than maximum.") unless bbox[0] <= bbox[2]
       raise OSM::APIBadUserInput.new("Minimum latitude should be less than maximum.") unless bbox[1] <= bbox[3]
       return ['min_lon < ? and max_lon > ? and min_lat < ? and max_lat > ?',
-              bbox[2] * GeoRecord::SCALE, bbox[0] * GeoRecord::SCALE, bbox[3]* GeoRecord::SCALE, bbox[1] * GeoRecord::SCALE]
+              (bbox[2] * GeoRecord::SCALE).to_i,
+              (bbox[0] * GeoRecord::SCALE).to_i,
+              (bbox[3] * GeoRecord::SCALE).to_i,
+              (bbox[1] * GeoRecord::SCALE).to_i]
     else
       return nil
     end
@@ -427,7 +432,7 @@ private
   # query changesets which are closed
   # ('closed at' time has passed or changes limit is hit)
   def conditions_closed(closed)
-    return closed.nil? ? nil : ['closed_at < ? and num_changes > ?', 
+    return closed.nil? ? nil : ['closed_at < ? or num_changes > ?', 
                                 Time.now.getutc, Changeset::MAX_ELEMENTS]
   end