require 'xml/libxml'
skip_before_filter :verify_authenticity_token, :except => [:list]
- before_filter :authorize_web, :only => [:list]
- before_filter :set_locale, :only => [:list]
+ before_filter :authorize_web, :only => [:list, :feed]
+ before_filter :set_locale, :only => [:list, :feed]
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, :list]
- before_filter(:only => [:list]) { |c| c.check_database_readable(true) }
+ before_filter :check_api_readable, :except => [:create, :update, :delete, :upload, :download, :query, :list, :feed]
+ before_filter(:only => [:list, :feed]) { |c| c.check_database_readable(true) }
after_filter :compress_output
- around_filter :api_call_handle_error, :except => [:list]
- around_filter :web_timeout, :only => [:list]
-
- # Help methods for checking boundary sanity and area size
- include MapBoundary
+ around_filter :api_call_handle_error, :except => [:list, :feed]
+ around_filter :web_timeout, :only => [:list, :feed]
# Helper methods for checking consistency
include ConsistencyValidations
def download
changeset = Changeset.find(params[:id])
- # get all the elements in the changeset and stick them in a big array.
- elements = [changeset.old_nodes,
- changeset.old_ways,
- changeset.old_relations].flatten
+ # get all the elements in the changeset which haven't been redacted
+ # and stick them in a big array.
+ elements = [changeset.old_nodes.unredacted,
+ changeset.old_ways.unredacted,
+ changeset.old_relations.unredacted].flatten
# sort the elements by timestamp and version number, as this is the
# almost sensible ordering available. this would be much nicer if
created = XML::Node.new "create"
created << elt.to_xml_node
else
- # get the previous version from the element history
- prev_elt = elt.class.find([elt.id, elt.version])
unless elt.visible
- # if the element isn't visible then it must have been deleted, so
- # output the *previous* XML
+ # if the element isn't visible then it must have been deleted
deleted = XML::Node.new "delete"
- deleted << prev_elt.to_xml_node
+ deleted << elt.to_xml_node
else
- # must be a modify, for which we don't need the previous version
- # yet...
+ # must be a modify
modified = XML::Node.new "modify"
modified << elt.to_xml_node
end
##
# query changesets by bounding box, time, user or open/closed status.
def query
+ # find any bounding box
+ if params['bbox']
+ bbox = BoundingBox.from_bbox_params(params)
+ end
+
# create the conditions that the user asked for. some or all of
# these may be nil.
changesets = Changeset.scoped
- changesets = conditions_bbox(changesets, params['bbox'])
+ 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'])
end
end
-
-
##
# list edits (open changesets) in reverse chronological order
def list
else
changesets = changesets.where("false")
end
- elsif request.format == :html
- @title = t 'user.no_such_user.title'
- @not_found_user = params[:display_name]
- render :template => 'user/no_such_user', :status => :not_found
+ 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 params[:nearby]
+ if @user
+ changesets = changesets.where(:user_id => @user.nearby)
+ elsif request.format == :html
+ require_user
+ return
+ end
+ end
+
if params[:bbox]
- bbox = params[:bbox]
+ bbox = BoundingBox.from_bbox_params(params)
elsif params[:minlon] and params[:minlat] and params[:maxlon] and params[:maxlat]
- bbox = params[:minlon] + ',' + params[:minlat] + ',' + params[:maxlon] + ',' + params[:maxlat]
+ bbox = BoundingBox.from_lon_lat_params(params)
end
-
+
if bbox
changesets = conditions_bbox(changesets, bbox)
- bbox = BoundingBox.from_s(bbox)
bbox_link = render_to_string :partial => "bbox", :object => bbox
end
user_link = render_to_string :partial => "user", :object => user
end
- if user and bbox
+ 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
@page = (params[:page] || 1).to_i
@page_size = 20
- @bbox = bbox
-
@edits = changesets.order("changesets.created_at DESC").offset((@page - 1) * @page_size).limit(@page_size).preload(:user, :changeset_tags)
+
+ render :action => :list
end
end
+ ##
+ # list edits as an atom feed
+ def feed
+ list
+ end
+
private
#------------------------------------------------------------
# utility functions below.
#------------------------------------------------------------
##
- # if a bounding box was specified then parse it and do some sanity
- # checks. this is mostly the same as the map call, but without the
- # area restriction.
+ # if a bounding box was specified do some sanity checks.
+ # restrict changesets to those enclosed by a bounding box
+ # we need to return both the changesets and the bounding box
def conditions_bbox(changesets, bbox)
- unless bbox.nil?
- raise OSM::APIBadUserInput.new("Bounding box should be min_lon,min_lat,max_lon,max_lat") unless bbox.count(',') == 3
- bbox = sanitise_boundaries(bbox.split(/,/))
- 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]
+ if bbox
+ bbox.check_boundaries
+ bbox = bbox.to_scaled
return changesets.where("min_lon < ? and max_lon > ? and min_lat < ? and max_lat > ?",
- (bbox[2] * GeoRecord::SCALE).to_i,
- (bbox[0] * GeoRecord::SCALE).to_i,
- (bbox[3] * GeoRecord::SCALE).to_i,
- (bbox[1] * GeoRecord::SCALE).to_i)
+ bbox.max_lon.to_i, bbox.min_lon.to_i,
+ bbox.max_lat.to_i, bbox.min_lat.to_i)
else
return changesets
end
projects / rails.git / blobdiff