Return "404 Not Found" for users and traces which don't exist.

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

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 054a9ca62078640d335debac6bc5f537eec564e7..62633dbb3ddbb6a79e0f38183e61a70621ece0d5 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -1,11 +1,7 @@
 class ApiController < ApplicationController
 
 class ApiController < ApplicationController
 

-  before_filter :authorize

   after_filter :compress_output
 
   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
 
   #COUNT is the number of map requests to allow before exiting and starting a new process
   @@count = COUNT
 


@@ -18,7 +14,6 @@ class ApiController < ApplicationController
   
   def trackpoints
     @@count+=1
   
   def trackpoints
     @@count+=1

-    response.headers["Content-Type"] = 'text/xml'

     #retrieve the page number
     page = params['page'].to_i
     unless page
     #retrieve the page number
     page = params['page'].to_i
     unless page


@@ -73,7 +68,7 @@ class ApiController < ApplicationController
     min_lon = min_lon * 1000000
     max_lon = max_lon * 1000000
     # get all the points
     min_lon = min_lon * 1000000
     max_lon = max_lon * 1000000
     # get all the points

-    points = Tracepoint.find(:all, :conditions => ['latitude BETWEEN ? AND ? AND longitude BETWEEN ? AND ?', min_lat.to_i, max_lat.to_i, min_lon.to_i, max_lon.to_i], :select => "SELECT DISTINCT *", :offset => offset, :limit => TRACEPOINTS_PER_PAGE, :order => "timestamp DESC" )
+    points = Tracepoint.find(:all, :conditions => ['latitude BETWEEN ? AND ? AND longitude BETWEEN ? AND ?', min_lat.to_i, max_lat.to_i, min_lon.to_i, max_lon.to_i], :select => "DISTINCT *", :offset => offset, :limit => TRACEPOINTS_PER_PAGE, :order => "timestamp DESC" )

 
     doc = XML::Document.new
     doc.encoding = 'UTF-8'
 
     doc = XML::Document.new
     doc.encoding = 'UTF-8'


@@ -96,12 +91,12 @@ class ApiController < ApplicationController
 
     #exit when we have too many requests
     if @@count > MAX_COUNT
 
     #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
 
       @@count = COUNT
       exit!
     end
 

-    render :text => doc.to_s
+    render :text => doc.to_s, :content_type => "text/xml"

 
   end
 
 
   end
 


@@ -109,7 +104,6 @@ class ApiController < ApplicationController
     GC.start
     @@count+=1
 
     GC.start
     @@count+=1
 

-    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


@@ -152,10 +146,11 @@ class ApiController < ApplicationController
 
     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")
 
     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
     end
 
     if node_ids.length == 0

-      render :text => "<osm version='0.4'></osm>"
+      render :text => "<osm version='0.4'></osm>", :content_type => "text/xml"

       return
     end
 
       return
     end
 


@@ -240,7 +235,7 @@ class ApiController < ApplicationController
       doc.root << way.to_xml_node(visible_segments, user_display_name_cache) if way.visible?
     end 
 
       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
     
     #exit when we have too many requests
     if @@count > MAX_COUNT