Change server_settings to smtp_settings to avoid deprecation warning.

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

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 8e4004dd15652aa3bb4f1dfa5c7cf83da2f5f5fe..4b785f8bcf74eba6b013ac14c0e1fc67b88fcd98 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -155,7 +155,7 @@ class ApiController < ApplicationController
     end
 
     if node_ids.length == 0
     end
 
     if node_ids.length == 0

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

       return
     end
 
       return
     end
 


@@ -195,9 +195,12 @@ class ApiController < ApplicationController
 
       list_of_way_segments = list_of_way_segs.collect { |way_seg| way_seg.segment_id }
 
 
       list_of_way_segments = list_of_way_segs.collect { |way_seg| way_seg.segment_id }
 

+       else
+         list_of_way_segments = Array.new

     end
 
     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)
 
     if segments_to_fetch.length > 0
       segments += Segment.find(segments_to_fetch)


@@ -242,6 +245,7 @@ class ApiController < ApplicationController
     #exit when we have too many requests
     if @@count > MAX_COUNT
       @@count = COUNT
     #exit when we have too many requests
     if @@count > MAX_COUNT
       @@count = COUNT

+      

       exit!
     end
 
       exit!
     end