X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d4cea98b16c4fc8f050ed44be3ee0aeee09c4134..3db4ac9a8e8dd94bc288e98ff353452e401d0a59:/app/controllers/api_controller.rb?ds=sidebyside diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index 35a0f25b7..696407109 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -1,11 +1,9 @@ class ApiController < ApplicationController - before_filter :authorize + session :off + before_filter :check_read_availability, :except => [:capabilities] after_filter :compress_output - helper :user - model :user - #COUNT is the number of map requests to allow before exiting and starting a new process @@count = COUNT @@ -18,7 +16,6 @@ class ApiController < ApplicationController def trackpoints @@count+=1 - response.headers["Content-Type"] = 'text/xml' #retrieve the page number page = params['page'].to_i unless page @@ -67,13 +64,8 @@ class ApiController < ApplicationController return end - # integerise - min_lat = min_lat * 1000000 - max_lat = max_lat * 1000000 - min_lon = min_lon * 1000000 - max_lon = max_lon * 1000000 # get all the points - points = Tracepoint.find(:all, :conditions => ['gps_points.latitude > ? AND gps_points.longitude > ? AND gps_points.latitude < ? AND gps_points.longitude < ? AND ( public = 1 OR gpx_files.user_id = ? ) AND visible = 1', min_lat.to_i, min_lon.to_i, max_lat.to_i, max_lon.to_i, @user.id ], :select => "gps_points.*", :joins => "INNER JOIN gpx_files ON gpx_files.id = gpx_id", :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 => TRACEPOINTS_PER_PAGE, :order => "timestamp DESC" ) doc = XML::Document.new doc.encoding = 'UTF-8' @@ -96,12 +88,12 @@ class ApiController < ApplicationController #exit when we have too many requests if @@count > MAX_COUNT - render :text => doc.to_s + render :text => doc.to_s, :content_type => "text/xml" @@count = COUNT exit! end - render :text => doc.to_s + render :text => doc.to_s, :content_type => "text/xml" end @@ -109,7 +101,6 @@ class ApiController < ApplicationController GC.start @@count+=1 - response.headers["Content-Type"] = 'text/xml' # Figure out the bbox bbox = params['bbox'] unless bbox and bbox.count(',') == 3 @@ -146,16 +137,17 @@ class ApiController < ApplicationController end # get all the nodes - nodes = Node.find(:all, :conditions => ['latitude > ? AND longitude > ? AND latitude < ? AND longitude < ? AND visible = 1', min_lat, min_lon, max_lat, max_lon]) + nodes = Node.find_by_area(min_lat, min_lon, max_lat, max_lon, :conditions => "visible = 1") node_ids = nodes.collect {|node| node.id } if node_ids.length > 50_000 report_error("You requested too many nodes (limit is 50,000). Either request a smaller area, or use planet.osm") + return end if node_ids.length == 0 - render :text => '' + render :text => "", :content_type => "text/xml" return end @@ -195,6 +187,8 @@ class ApiController < ApplicationController list_of_way_segments = list_of_way_segs.collect { |way_seg| way_seg.segment_id } + else + list_of_way_segments = Array.new end # - [0] in case some thing links to segment 0 which doesn't exist. Shouldn't actually ever happen but it does. FIXME: file a ticket for this @@ -238,13 +232,30 @@ class ApiController < ApplicationController doc.root << way.to_xml_node(visible_segments, user_display_name_cache) if way.visible? end - render :text => doc.to_s + 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 + + def capabilities + doc = OSM::API.new.get_xml_doc + + api = XML::Node.new 'api' + version = XML::Node.new 'version' + version['minimum'] = '0.4'; + version['maximum'] = '0.4'; + api << version + area = XML::Node.new 'area' + area['maximum'] = MAX_REQUEST_AREA.to_s; + api << area + + doc.root << api + render :text => doc.to_s, :content_type => "text/xml" end end