Fix bogus SQL.

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

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 1eda437010c88ff2c9a2faf913fd7e9cd822d611..be00b9f9c8b1d39a7763008a1e246de94f49561a 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -9,10 +9,6 @@ class ApiController < ApplicationController
   #COUNT is the number of map requests to allow before exiting and starting a new process
   @@count = COUNT
 
-  def authorize_web
-    @current_user = User.find_by_token(session[:token])
-  end
-
   # The maximum area you're allowed to request, in square degrees
   MAX_REQUEST_AREA = 0.25
 
@@ -77,7 +73,7 @@ class ApiController < ApplicationController
     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(: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'
@@ -159,7 +155,7 @@ class ApiController < ApplicationController
     end
 
     if node_ids.length == 0
-      render :text => '<osm></osm>'
+      render :text => "<osm version='0.4'></osm>"
       return
     end
 
@@ -199,9 +195,12 @@ 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
 
-    segments_to_fetch = list_of_way_segments.uniq - segment_ids
+    # - [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
+    segments_to_fetch = (list_of_way_segments.uniq - segment_ids) - [0]
 
     if segments_to_fetch.length > 0
       segments += Segment.find(segments_to_fetch)
@@ -246,6 +245,7 @@ class ApiController < ApplicationController
     #exit when we have too many requests
     if @@count > MAX_COUNT
       @@count = COUNT
+      
       exit!
     end