session :off
before_filter :check_api_readable, :except => [:capabilities]
after_filter :compress_output
+ around_filter :api_call_handle_error, :api_call_timeout
# Help methods for checking boundary sanity and area size
include MapBoundary
- #COUNT is the number of map requests to allow before exiting and starting a new process
- @@count = COUNT
-
- # The maximum area you're allowed to request, in square degrees
- MAX_REQUEST_AREA = APP_CONFIG['max_request_area']
-
- # Number of GPS trace/trackpoints returned per-page
- TRACEPOINTS_PER_PAGE = APP_CONFIG['tracepoints_per_page']
-
# Get an XML response containing a list of tracepoints that have been uploaded
# within the specified bounding box, and in the specified page.
def trackpoints
- @@count+=1
#retrieve the page number
page = params['page'].to_i
unless page
return
end
- offset = page * TRACEPOINTS_PER_PAGE
+ offset = page * APP_CONFIG['tracepoints_per_page']
# Figure out the bbox
bbox = params['bbox']
end
# get all the points
- points = Tracepoint.find_by_area(min_lat, min_lon, max_lat, max_lon, :offset => offset, :limit => TRACEPOINTS_PER_PAGE, :order => "timestamp DESC" )
+ points = Tracepoint.find_by_area(min_lat, min_lon, max_lat, max_lon, :offset => offset, :limit => APP_CONFIG['tracepoints_per_page'], :order => "timestamp DESC" )
doc = XML::Document.new
doc.encoding = XML::Encoding::UTF_8
trkseg << point.to_xml_node()
end
- #exit when we have too many requests
- if @@count > MAX_COUNT
- render :text => doc.to_s, :content_type => "text/xml"
- @@count = COUNT
- exit!
- end
-
response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""
render :text => doc.to_s, :content_type => "text/xml"
# fetched. All the nodes and ways that are referenced by those ways are then
# fetched. Finally all the xml is returned.
def map
- GC.start
- @@count+=1
# Figure out the bbox
bbox = params['bbox']
end
# FIXME um why is this area using a different order for the lat/lon from above???
- @nodes = Node.find_by_area(min_lat, min_lon, max_lat, max_lon, :conditions => {:visible => true}, :limit => APP_CONFIG['max_number_of_nodes']+1)
+ @nodes = Node.find_by_area(min_lat, min_lon, max_lat, max_lon, :conditions => {:visible => true}, :include => :node_tags, :limit => APP_CONFIG['max_number_of_nodes']+1)
# get all the nodes, by tag not yet working, waiting for change from NickB
# need to be @nodes (instance var) so tests in /spec can be performed
#@nodes = Node.search(bbox, params[:tag])
if node_ids.length > 0
way_nodes = WayNode.find_all_by_node_id(node_ids)
way_ids = way_nodes.collect { |way_node| way_node.id[0] }
- ways = Way.find(way_ids)
+ ways = Way.find(way_ids, :include => [:way_nodes, :way_tags])
list_of_way_nodes = ways.collect { |way|
way.way_nodes.collect { |way_node| way_node.node_id }
nodes_to_fetch = (list_of_way_nodes.uniq - node_ids) - [0]
if nodes_to_fetch.length > 0
- @nodes += Node.find(nodes_to_fetch)
+ @nodes += Node.find(nodes_to_fetch, :include => :node_tags)
end
visible_nodes = {}
+ changeset_cache = {}
user_display_name_cache = {}
@nodes.each do |node|
if node.visible?
- doc.root << node.to_xml_node(user_display_name_cache)
+ doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
visible_nodes[node.id] = node
end
end
way_ids = Array.new
ways.each do |way|
if way.visible?
- doc.root << way.to_xml_node(visible_nodes, user_display_name_cache)
+ doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
way_ids << way.id
end
end
# this "uniq" may be slightly inefficient; it may be better to first collect and output
# all node-related relations, then find the *not yet covered* way-related ones etc.
relations.uniq.each do |relation|
- doc.root << relation.to_xml_node(user_display_name_cache)
+ doc.root << relation.to_xml_node(nil, changeset_cache, user_display_name_cache)
end
response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""
render :text => doc.to_s, :content_type => "text/xml"
-
- #exit when we have too many requests
- if @@count > MAX_COUNT
- @@count = COUNT
-
- exit!
- end
end
# Get a list of the tiles that have changed within a specified time
version['maximum'] = "#{API_VERSION}";
api << version
area = XML::Node.new 'area'
- area['maximum'] = MAX_REQUEST_AREA.to_s;
+ area['maximum'] = APP_CONFIG['max_request_area'].to_s;
api << area
tracepoints = XML::Node.new 'tracepoints'
tracepoints['per_page'] = APP_CONFIG['tracepoints_per_page'].to_s
waynodes = XML::Node.new 'waynodes'
waynodes['maximum'] = APP_CONFIG['max_number_of_way_nodes'].to_s
api << waynodes
+ changesets = XML::Node.new 'changesets'
+ changesets['maximum_elements'] = Changeset::MAX_ELEMENTS.to_s
+ api << changesets
+ timeout = XML::Node.new 'timeout'
+ timeout['seconds'] = APP_CONFIG['api_timeout'].to_s
+ api << timeout
doc.root << api
projects / rails.git / blobdiff