Improve consistency of trace upload forms and error handling.

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

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 7e8017f4e3736dabf1471d6d1f6730f045506ad5..6964071098f5785baceef0dd4cd9397ddd981d0f 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -1,6 +1,7 @@
 class ApiController < ApplicationController
 
   session :off
 class ApiController < ApplicationController
 
   session :off

+  before_filter :check_read_availability, :except => [:capabilities]

   after_filter :compress_output
 
   #COUNT is the number of map requests to allow before exiting and starting a new process
   after_filter :compress_output
 
   #COUNT is the number of map requests to allow before exiting and starting a new process


@@ -63,13 +64,8 @@ class ApiController < ApplicationController
       return
     end
 
       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
     # 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 => "DISTINCT *", :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'
 
     doc = XML::Document.new
     doc.encoding = 'UTF-8'


@@ -141,7 +137,7 @@ class ApiController < ApplicationController
     end
 
     # get all the nodes
     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 }
 
 
     node_ids = nodes.collect {|node| node.id }