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 fd9ce22ed69ac4552e2bd2682dd8d2dbf4c9d52b..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
 


@@ -186,7 +186,7 @@ class ApiController < ApplicationController
     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 }
     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, :include => [:way_tags]) # NB: doesn't pick up segments, tags from db until accessed via way.way_segments etc.
+      ways = Way.find(way_ids) # NB: doesn't pick up segments, tags from db until accessed via way.way_segments etc.

 
       # seg_ids = way_segments.collect {|way_segment| way_segment.segment_id }
 
 
       # seg_ids = way_segments.collect {|way_segment| way_segment.segment_id }
 


@@ -195,6 +195,8 @@ 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
 
     # - [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
     end
 
     # - [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


@@ -243,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