X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b92a2de9ec251b219dc1908a52da4239b05af6c7..873c1cb84e2fe475bc4ff566d71929fdcc35787d:/app/controllers/changeset_controller.rb diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index c7cb245f3..735fa73a8 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -55,7 +55,7 @@ class ChangesetController < ApplicationController changeset.set_closed_time_now changeset.save! - render :nothing => true + render :text => "" end ## @@ -204,12 +204,13 @@ class ChangesetController < ApplicationController # create the conditions that the user asked for. some or all of # these may be nil. - changesets = Changeset.scoped + changesets = Changeset.all changesets = conditions_bbox(changesets, bbox) changesets = conditions_user(changesets, params['user'], params['display_name']) changesets = conditions_time(changesets, params['time']) changesets = conditions_open(changesets, params['open']) changesets = conditions_closed(changesets, params['closed']) + changesets = conditions_ids(changesets, params['changesets']) # create the results document results = OSM::API.new.get_xml_doc @@ -243,98 +244,58 @@ class ChangesetController < ApplicationController render :text => changeset.to_xml, :mime_type => "text/xml" else - render :nothing => true, :status => :bad_request + render :text => "", :status => :bad_request end end ## # list edits (open changesets) in reverse chronological order def list - if request.format == :atom and params[:page] - redirect_to params.merge({ :page => nil }), :status => :moved_permanently - else - changesets = conditions_nonempty(Changeset.scoped) - - if params[:display_name] - user = User.find_by_display_name(params[:display_name]) - - if user and user.active? - if user.data_public? or user == @user - changesets = changesets.where(:user_id => user.id) - else - changesets = changesets.where("false") - end - else - render_unknown_user params[:display_name] - return - end - end - - if params[:friends] - if @user - changesets = changesets.where(:user_id => @user.friend_users.public) - elsif request.format == :html - require_user - return - end - end + if request.format == :atom and params[:max_id] + redirect_to params.merge({ :max_id => nil }), :status => :moved_permanently + return + end - if params[:nearby] - if @user - changesets = changesets.where(:user_id => @user.nearby) - elsif request.format == :html - require_user - return - end + if params[:display_name] + user = User.find_by_display_name(params[:display_name]) + if !user || !user.active? + render_unknown_user params[:display_name] + return end + end - if params[:bbox] - bbox = BoundingBox.from_bbox_params(params) - elsif params[:minlon] and params[:minlat] and params[:maxlon] and params[:maxlat] - bbox = BoundingBox.from_lon_lat_params(params) - end + if (params[:friends] || params[:nearby]) && !@user && request.format == :html + require_user + return + end - if bbox - changesets = conditions_bbox(changesets, bbox) - bbox_link = render_to_string :partial => "bbox", :object => bbox - end + if request.format == :html and !params[:list] + require_oauth + render :action => :history, :layout => map_layout + else + changesets = conditions_nonempty(Changeset.all) - if user - user_link = render_to_string :partial => "user", :object => user + if params[:display_name] + if user.data_public? or user == @user + changesets = changesets.where(:user_id => user.id) + else + changesets = changesets.where("false") + end + elsif params[:bbox] + changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params)) + elsif params[:friends] && @user + changesets = changesets.where(:user_id => @user.friend_users.public) + elsif params[:nearby] && @user + changesets = changesets.where(:user_id => @user.nearby) end - if params[:friends] and @user - @title = t 'changeset.list.title_friend' - @heading = t 'changeset.list.heading_friend' - @description = t 'changeset.list.description_friend' - elsif params[:nearby] and @user - @title = t 'changeset.list.title_nearby' - @heading = t 'changeset.list.heading_nearby' - @description = t 'changeset.list.description_nearby' - elsif user and bbox - @title = t 'changeset.list.title_user_bbox', :user => user.display_name, :bbox => bbox.to_s - @heading = t 'changeset.list.heading_user_bbox', :user => user.display_name, :bbox => bbox.to_s - @description = t 'changeset.list.description_user_bbox', :user => user_link, :bbox => bbox_link - elsif user - @title = t 'changeset.list.title_user', :user => user.display_name - @heading = t 'changeset.list.heading_user', :user => user.display_name - @description = t 'changeset.list.description_user', :user => user_link - elsif bbox - @title = t 'changeset.list.title_bbox', :bbox => bbox.to_s - @heading = t 'changeset.list.heading_bbox', :bbox => bbox.to_s - @description = t 'changeset.list.description_bbox', :bbox => bbox_link - else - @title = t 'changeset.list.title' - @heading = t 'changeset.list.heading' - @description = t 'changeset.list.description' + if params[:max_id] + changesets = changesets.where("changesets.id <= ?", params[:max_id]) end - @page = (params[:page] || 1).to_i - @page_size = 20 + @edits = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags) - @edits = changesets.order("changesets.created_at DESC").offset((@page - 1) * @page_size).limit(@page_size).preload(:user, :changeset_tags) - - render :action => :list + render :action => :list, :layout => false end end @@ -453,6 +414,20 @@ private end end + ## + # query changesets by a list of ids + # (either specified as array or comma-separated string) + def conditions_ids(changesets, ids) + if ids.nil? + return changesets + elsif ids.empty? + raise OSM::APIBadUserInput.new("No changesets were given to search for") + else + ids = ids.split(',').collect { |n| n.to_i } + return changesets.where(:id => ids) + end + end + ## # eliminate empty changesets (where the bbox has not been set) # this should be applied to all changeset list displays