layout 'site'
require 'xml/libxml'
- session :off, :except => [:list]
- before_filter :authorize_web, :only => [:list]
+ session :off, :except => [:list, :list_user, :list_bbox]
+ before_filter :authorize_web, :only => [:list, :list_user, :list_bbox]
before_filter :authorize, :only => [:create, :update, :delete, :upload, :include, :close]
- before_filter :check_write_availability, :only => [:create, :update, :delete, :upload, :include]
- before_filter :check_read_availability, :except => [:create, :update, :delete, :upload, :download, :query]
+ 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]
after_filter :compress_output
# Help methods for checking boundary sanity and area size
render :nothing => true, :status => :method_not_allowed
end
+ rescue LibXML::XML::Error, ArgumentError => ex
+ raise OSM::APIBadXMLError.new("osm", xml, ex.message)
rescue ActiveRecord::RecordNotFound
render :nothing => true, :status => :not_found
rescue OSM::APIError => ex
conditions = cond_merge conditions, conditions_user(params['user'])
conditions = cond_merge conditions, conditions_time(params['time'])
conditions = cond_merge conditions, conditions_open(params['open'])
+ conditions = cond_merge conditions, conditions_closed(params['closed'])
# create the results document
results = OSM::API.new.get_xml_doc
render ex.render_opts
end
+
+
##
- # list edits belonging to a user
+ # list edits (open changesets) in reverse chronological order
def list
- user = User.find(:first, :conditions => [ "visible = ? and display_name = ?", true, params[:display_name]])
+ conditions = conditions_nonempty
+
+
+ # @changesets = Changeset.find(:all, :order => "closed_at DESC", :conditions => ['closed_at < ?', DateTime.now], :limit=> 20)
+
+
+ #@edit_pages, @edits = paginate(:changesets,
+ # :include => [:user, :changeset_tags],
+ # :conditions => conditions,
+ # :order => "changesets.created_at DESC",
+ # :per_page => 20)
+ #
+
+ @edits = Changeset.find(:all,
+ :order => "changesets.created_at DESC",
+ :conditions => conditions,
+ :limit => 20)
+
+ end
+
+ ##
+ # list edits (changesets) belonging to a user
+ def list_user
+ user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})
+
+ if user
+ @display_name = user.display_name
+ if not user.data_public? and @user != user
+ @edits = nil
+ render
+ else
+ conditions = cond_merge conditions, ['user_id = ?', user.id]
+ 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)
+ end
+ else
+ @not_found_user = params[:display_name]
+ render :template => 'user/no_such_user', :status => :not_found
+ end
+ end
+
+ ##
+ # list changesets in a bbox
+ def list_bbox
+ # 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 => ["changesets.user_id = ? AND min_lat IS NOT NULL", user.id],
+ :conditions => conditions,
:order => "changesets.created_at DESC",
:per_page => 20)
-
- @action = 'list'
- @display_name = user.display_name
- # FIXME needs rescues in here
+
+ @bbox = sanitise_boundaries(bbox.split(/,/)) unless bbox==nil
end
-
+
private
#------------------------------------------------------------
# utility functions below.
if a and b
a_str = a.shift
b_str = b.shift
- return [ a_str + " and " + b_str ] + a + b
+ return [ a_str + " AND " + b_str ] + a + b
elsif a
return a
else b
end
##
- # restrict changes to those during a particular time period
+ # restrict changes to those closed during a particular time period
def conditions_time(time)
unless time.nil?
# if there is a range, i.e: comma separated, then the first is
times = time.split(/,/)
raise OSM::APIBadUserInput.new("bad time range") if times.size != 2
- from, to = times.collect { |t| Time.parse(t) }
+ from, to = times.collect { |t| DateTime.parse(t) }
return ['closed_at >= ? and created_at <= ?', from, to]
else
# if there is no comma, assume its a lower limit on time
- return ['closed_at >= ?', Time.parse(time)]
+ return ['closed_at >= ?', DateTime.parse(time)]
end
else
return nil
end
##
- # restrict changes to those which are open
+ # return changesets which are open (haven't been closed yet)
+ # we do this by seeing if the 'closed at' time is in the future. Also if we've
+ # hit the maximum number of changes then it counts as no longer open.
+ # if parameter 'open' is nill then open and closed changsets are returned
def conditions_open(open)
- return open.nil? ? nil : ['closed_at >= ?', Time.now]
+ return open.nil? ? nil : ['closed_at >= ? and num_changes <= ?',
+ Time.now.getutc, Changeset::MAX_ELEMENTS]
+ end
+
+ ##
+ # 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 > ?',
+ Time.now.getutc, Changeset::MAX_ELEMENTS]
end
+ ##
+ # eliminate empty changesets (where the bbox has not been set)
+ # this should be applied to all changeset list displays
+ def conditions_nonempty()
+ return ['min_lat IS NOT NULL']
+ end
+
end
projects / rails.git / blobdiff