Merge the gpx_bugs action into the main get_bugs action

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

diff --git a/app/controllers/map_bugs_controller.rb b/app/controllers/map_bugs_controller.rb
index d1790a0dede39eada140bf1d46862e8a84b025b4..158bf435aa0837356e7b0beab36f0d20638795b5 100644 (file)
--- a/app/controllers/map_bugs_controller.rb
+++ b/app/controllers/map_bugs_controller.rb
@@ -47,7 +47,7 @@ class MapBugsController < ApplicationController
       format.js
       format.xml {render :template => 'map_bugs/get_bugs.xml'}
       format.json { render :json => @bugs.to_json(:methods => [:lat, :lon], :only => [:id, :status, :date_created], :include => { :map_bug_comment => { :only => [:commenter_name, :date_created, :comment]}}) }         
-#      format.gpx {render :template => 'map_bugs/get_bugs.gpx'}
+      format.gpx {render :template => 'map_bugs/get_bugs.gpx'}
     end
   end
 
@@ -127,7 +127,6 @@ class MapBugsController < ApplicationController
     render_ok
   end 
 
-
   def rss
     # Figure out the bbox
     bbox = params['bbox']
@@ -145,18 +144,13 @@ class MapBugsController < ApplicationController
     limit = getLimit
     conditions = closedCondition
     conditions = cond_merge conditions, [OSM.sql_for_area_no_quadtile(@min_lat, @min_lon, @max_lat, @max_lon)]
-       
+       
     check_boundaries(@min_lon, @min_lat, @max_lon, @max_lat, :false)
 
     @comments = MapBugComment.find(:all, :limit => limit, :order => "date_created DESC", :joins => :map_bug, :include => :map_bug, :conditions => conditions)
     render :template => 'map_bugs/rss.rss'
   end
 
-  def gpx_bugs
-    request.format = :xml
-    get_bugs
-  end
-  
   def read
     @bug = MapBug.find(params['id'])
     raise OSM::APINotFoundError unless @bug
@@ -166,6 +160,7 @@ class MapBugsController < ApplicationController
       format.rss
       format.xml
       format.json { render :json => @bug.to_json(:methods => [:lat, :lon], :only => [:id, :status, :date_created], :include => { :map_bug_comment => { :only => [:commenter_name, :date_created, :comment]}}) }          
+      format.gpx
     end
   end
 
@@ -200,7 +195,7 @@ class MapBugsController < ApplicationController
       format.js
       format.xml {render :template => 'map_bugs/get_bugs.xml'}
       format.json { render :json => @bugs.to_json(:methods => [:lat, :lon], :only => [:id, :status, :date_created], :include => { :map_bug_comment => { :only => [:commenter_name, :date_created, :comment]}}) }
-#      format.gpx {render :template => 'map_bugs/get_bugs.gpx'}
+      format.gpx {render :template => 'map_bugs/get_bugs.gpx'}
     end
   end