Added test for relations_for_node where the relation had been deleted.

[rails.git] / app / controllers / api_controller.rb

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 820a5cb6615fe0bfe009a9ed16c7c8d94628abeb..f7c9f591f23a0bb6a8ac04a199f310f6b015be76 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -1,21 +1,37 @@
 class ApiController < ApplicationController
 
 class ApiController < ApplicationController
 

-  before_filter :authorize
+  session :off
+  before_filter :check_read_availability, :except => [:capabilities]

   after_filter :compress_output
 
   after_filter :compress_output
 

-  helper :user
-  model :user
+  # Help methods for checking boundary sanity and area size
+  include MapBoundary

 
 

-  def authorize_web
-    @current_user = User.find_by_token(session[:token])
-  end
+  #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
 
   # The maximum area you're allowed to request, in square degrees

-  MAX_REQUEST_AREA = 0.25
+  MAX_REQUEST_AREA = APP_CONFIG['max_request_area']
+
+  # Number of GPS trace/trackpoints returned per-page
+  TRACEPOINTS_PER_PAGE = APP_CONFIG['tracepoints_per_page']
+
+  
+  def trackpoints
+    @@count+=1
+    #retrieve the page number
+    page = params['page'].to_i
+    unless page
+        page = 0;
+    end
+
+    unless page >= 0
+        report_error("Page number must be greater than or equal to 0")
+        return
+    end
+
+    offset = page * TRACEPOINTS_PER_PAGE

 
 

-  def map
-    GC.start
-    response.headers["Content-Type"] = 'text/xml'

     # Figure out the bbox
     bbox = params['bbox']
     unless bbox and bbox.count(',') == 3
     # Figure out the bbox
     bbox = params['bbox']
     unless bbox and bbox.count(',') == 3


@@ -24,126 +40,233 @@ class ApiController < ApplicationController
     end
 
     bbox = bbox.split(',')
     end
 
     bbox = bbox.split(',')

-
-    min_lon = bbox[0].to_f
-    min_lat = bbox[1].to_f
-    max_lon = bbox[2].to_f
-    max_lat = bbox[3].to_f
-
-    # check the bbox is sane
-    unless min_lon <= max_lon
-      report_error("The minimum longitude must be less than the maximum longitude, but it wasn't")
+    min_lon, min_lat, max_lon, max_lat = sanitise_boundaries(bbox)
+    # check boundary is sane and area within defined
+    # see /config/application.yml
+    begin
+      check_boundaries(min_lon, min_lat, max_lon, max_lat)
+    rescue Exception => err
+      report_error(err.message)

       return
     end
       return
     end

-    unless min_lat <= max_lat
-      report_error("The minimum latitude must be less than the maximum latitude, but it wasn't")
-      return
+
+    # 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" )
+
+    doc = XML::Document.new
+    doc.encoding = 'UTF-8'
+    root = XML::Node.new 'gpx'
+    root['version'] = '1.0'
+    root['creator'] = 'OpenStreetMap.org'
+    root['xmlns'] = "http://www.topografix.com/GPX/1/0/"
+    
+    doc.root = root
+
+    track = XML::Node.new 'trk'
+    doc.root << track
+
+    trkseg = XML::Node.new 'trkseg'
+    track << trkseg
+
+    points.each do |point|
+      trkseg << point.to_xml_node()

     end
     end

-    unless min_lon >= -180 && min_lat >= -90 && max_lon <= 180 && max_lat <= 90
-      report_error("The latitudes must be between -90 and 90, and longitudes between -180 and 180")
-      return
+
+    #exit when we have too many requests
+    if @@count > MAX_COUNT
+      render :text => doc.to_s, :content_type => "text/xml"
+      @@count = COUNT
+      exit!

     end
 
     end
 

-    # check the bbox isn't too large
-    requested_area = (max_lat-min_lat)*(max_lon-min_lon)
-    if requested_area > MAX_REQUEST_AREA
-      report_error("The maximum bbox size is " + MAX_REQUEST_AREA.to_s + ", and your request was too large. Either request a smaller area, or use planet.osm")
+    response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""
+
+    render :text => doc.to_s, :content_type => "text/xml"
+  end
+
+  def map
+    GC.start
+    @@count+=1
+    # Figure out the bbox
+    bbox = params['bbox']
+
+    unless bbox and bbox.count(',') == 3
+      # alternatively: report_error(TEXT['boundary_parameter_required']
+      report_error("The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat")

       return
     end
 
       return
     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])
+    bbox = bbox.split(',')

 
 

-    node_ids = nodes.collect {|node| node.id }
+    min_lon, min_lat, max_lon, max_lat = sanitise_boundaries(bbox)

 
 

-    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")
+    # check boundary is sane and area within defined
+    # see /config/application.yml
+    begin
+      check_boundaries(min_lon, min_lat, max_lon, max_lat)
+    rescue Exception => err
+      report_error(err.message)
+      return

     end
 
     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 = 1", :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])
+
+    node_ids = @nodes.collect(&:id)
+    if node_ids.length > APP_CONFIG['max_number_of_nodes']
+      report_error("You requested too many nodes (limit is #{APP_CONFIG['max_number_of_nodes']}). Either request a smaller area, or use planet.osm")
+      return
+    end

     if node_ids.length == 0
     if node_ids.length == 0

-      render :text => '<osm></osm>'
+      render :text => "<osm version='#{API_VERSION}'></osm>", :content_type => "text/xml"

       return
     end
 
       return
     end
 

-    # grab the segments
-    segments = Array.new
+    doc = OSM::API.new.get_xml_doc
+
+    # add bounds
+    bounds = XML::Node.new 'bounds'
+    bounds['minlat'] = min_lat.to_s
+    bounds['minlon'] = min_lon.to_s
+    bounds['maxlat'] = max_lat.to_s
+    bounds['maxlon'] = max_lon.to_s
+    doc.root << bounds
+
+    # get ways
+    # find which ways are needed
+    ways = Array.new

     if node_ids.length > 0
     if node_ids.length > 0

-      node_ids_sql = "(#{node_ids.join(',')})"
-      # get the referenced segments
-      segments = Segment.find_by_sql "select * from current_segments where visible = 1 and (node_a in #{node_ids_sql} or node_b in #{node_ids_sql})"
+      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)
+
+      list_of_way_nodes = ways.collect { |way|
+        way.way_nodes.collect { |way_node| way_node.node_id }
+      }
+      list_of_way_nodes.flatten!
+
+    else
+      list_of_way_nodes = Array.new

     end
     end

-    # see if we have any missing nodes
-    segments_nodes = segments.collect {|segment| segment.node_a }
-    segments_nodes += segments.collect {|segment| segment.node_b }

 
 

-    segments_nodes.uniq!
+    # - [0] in case some thing links to node 0 which doesn't exist. Shouldn't actually ever happen but it does. FIXME: file a ticket for this
+    nodes_to_fetch = (list_of_way_nodes.uniq - node_ids) - [0]

 
 

-    missing_nodes = segments_nodes - node_ids
+    if nodes_to_fetch.length > 0
+      @nodes += Node.find(nodes_to_fetch)
+    end

 
 

-    # get missing nodes if there are any
-    nodes += Node.find(missing_nodes) if missing_nodes.length > 0
+    visible_nodes = {}
+    user_display_name_cache = {}

 
 

-    doc = OSM::API.new.get_xml_doc
+    @nodes.each do |node|
+      if node.visible?
+        doc.root << node.to_xml_node(user_display_name_cache)
+        visible_nodes[node.id] = node
+      end
+    end

 
 

-    # get ways
-    # find which ways are needed
-    segment_ids = segments.collect {|segment| segment.id }
-    ways = Array.new
-    if segment_ids.length > 0
-      way_segments = WaySegment.find_all_by_segment_id(segment_ids)
-      way_ids = way_segments.collect {|way_segment| way_segment.id }
-      ways = Way.find(way_ids) # NB: doesn't pick up segments, tags from db until accessed via way.way_segments etc.
+    way_ids = Array.new
+    ways.each do |way|
+      if way.visible?
+        doc.root << way.to_xml_node(visible_nodes, user_display_name_cache)
+        way_ids << way.id
+      end
+    end 

 
 

-      # seg_ids = way_segments.collect {|way_segment| way_segment.segment_id }
+    relations = Relation.find_for_nodes(visible_nodes.keys, :conditions => "visible = 1") +
+                Relation.find_for_ways(way_ids, :conditions => "visible = 1")

 
 

-      list_of_way_segs = ways.collect {|way| way.way_segments}
-      list_of_way_segs.flatten!
+    # we do not normally return the "other" partners referenced by an relation, 
+    # e.g. if we return a way A that is referenced by relation X, and there's 
+    # another way B also referenced, that is not returned. But we do make 
+    # an exception for cases where an relation references another *relation*; 
+    # in that case we return that as well (but we don't go recursive here)
+    relations += Relation.find_for_relations(relations.collect { |r| r.id }, :conditions => "visible = 1")

 
 

-      list_of_way_segments = list_of_way_segs.collect { |way_seg| way_seg.segment_id }
+    # 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)
+    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

+  end

 
 

-    segments_to_fetch = list_of_way_segments.uniq - segment_ids
+  def changes
+    zoom = (params[:zoom] || '12').to_i

 
 

-    if segments_to_fetch.length > 0
-      segments += Segment.find(segments_to_fetch)
+    if params.include?(:start) and params.include?(:end)
+      starttime = Time.parse(params[:start])
+      endtime = Time.parse(params[:end])
+    else
+      hours = (params[:hours] || '1').to_i.hours
+      endtime = Time.now
+      starttime = endtime - hours

     end
 
     end
 

-    # get more nodes
-    #
+    if zoom >= 1 and zoom <= 16 and
+       endtime >= starttime and endtime - starttime <= 24.hours
+      mask = (1 << zoom) - 1

 
 

-    segments_nodes = segments.collect {|segment| segment.node_a }
-    segments_nodes += segments.collect {|segment| segment.node_b }
+      tiles = Node.count(:conditions => ["timestamp BETWEEN ? AND ?", starttime, endtime],
+                         :group => "maptile_for_point(latitude, longitude, #{zoom})")

 
 

-    node_ids_a = nodes.collect {|node| node.id }
+      doc = OSM::API.new.get_xml_doc
+      changes = XML::Node.new 'changes'
+      changes["starttime"] = starttime.xmlschema
+      changes["endtime"] = endtime.xmlschema

 
 

-    nodes_to_get = segments_nodes - node_ids_a
-    nodes += Node.find(nodes_to_get) if nodes_to_get.length > 0
+      tiles.each do |tile, count|
+        x = (tile.to_i >> zoom) & mask
+        y = tile.to_i & mask

 
 

-    visible_nodes = {}
-    user_display_name_cache = {}
+        t = XML::Node.new 'tile'
+        t["x"] = x.to_s
+        t["y"] = y.to_s
+        t["z"] = zoom.to_s
+        t["changes"] = count.to_s

 
 

-    nodes.each do |node|
-      if node.visible?
-        doc.root << node.to_xml_node(user_display_name_cache)
-        visible_nodes[node.id] = node
+        changes << t

       end
       end

-    end

 
 

-    visible_segments = {}
+      doc.root << changes

 
 

-    segments.each do |segment|
-      if visible_nodes[segment.node_a] and visible_nodes[segment.node_b] and segment.visible?
-        doc.root << segment.to_xml_node(user_display_name_cache) 
-        visible_segments[segment.id] = segment
-      end
+      render :text => doc.to_s, :content_type => "text/xml"
+    else
+      render :text => "Requested zoom is invalid", :status => :bad_request

     end
     end

+  end

 
 

-    ways.each do |way|
-      doc.root << way.to_xml_node(visible_segments, user_display_name_cache) if way.visible?
-    end 
-
-    render :text => doc.to_s
+  def capabilities
+    doc = OSM::API.new.get_xml_doc

 
 

+    api = XML::Node.new 'api'
+    version = XML::Node.new 'version'
+    version['minimum'] = "#{API_VERSION}";
+    version['maximum'] = "#{API_VERSION}";
+    api << version
+    area = XML::Node.new 'area'
+    area['maximum'] = MAX_REQUEST_AREA.to_s;
+    api << area
+    tracepoints = XML::Node.new 'tracepoints'
+    tracepoints['per_page'] = APP_CONFIG['tracepoints_per_page'].to_s
+    api << tracepoints
+    
+    doc.root << api
+
+    render :text => doc.to_s, :content_type => "text/xml"

   end
 end
   end
 end