support json format in getBugs, add a limit and name parameter

[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 d3a62f553d3706db9f8927993e692fa0b6f25535..6224a8727cbc02928478b8466488051cb586938e 100644 (file)
--- a/app/controllers/map_bugs_controller.rb
+++ b/app/controllers/map_bugs_controller.rb
@@ -1,6 +1,7 @@
 class MapBugsController < ApplicationController
 
   before_filter :check_api_readable
+  before_filter :authorize_web, :only => [:add_bug, :close_bug, :edit_bug]
   before_filter :check_api_writable, :only => [:add_bug, :close_bug, :edit_bug]
   after_filter :compress_output
   around_filter :api_call_handle_error, :api_call_timeout
@@ -19,6 +20,10 @@ class MapBugsController < ApplicationController
        max_lon = params['r'].to_f
        min_lat = params['b'].to_f
        max_lat = params['t'].to_f
+
+       limit = 100;
+       limit = params['limit'] if ((params['limit']) && (params['limit'].to_i < 10000) && (params['limit'].to_i > 0))
+
        
        # check boundary is sane and area within defined
     # see /config/application.yml
@@ -29,15 +34,16 @@ class MapBugsController < ApplicationController
       return
     end
 
-       bugs = MapBug.find_by_area(min_lat, min_lon, max_lat, max_lon, :order => "last_changed DESC", :limit => 100, :conditions => "status != 'hidden'")
+       @bugs = MapBug.find_by_area(min_lat, min_lon, max_lat, max_lon, :order => "last_changed DESC", :limit => limit, :conditions => "status != 'hidden'")
 
-       resp = ""
-       
-       bugs.each do |bug|
-         resp += "putAJAXMarker(" + bug.id.to_s + ", " + bug.lon.to_s + ", " + bug.lat.to_s + " , '" + bug.text + "'," + (bug.status=="open"?"0":"1") + ");\n"
+       respond_to do |format|
+         format.html {render :template => 'map_bugs/get_bugs.js', :content_type => "text/javascript"}
+         format.rss {render :template => 'map_bugs/get_bugs.rss'}
+         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 :text => "Rendering GPX"}
        end
-
-       render :text => resp, :content_type => "text/javascript"
   end
 
   def add_bug
@@ -49,7 +55,12 @@ class MapBugsController < ApplicationController
        lat = params['lat'].to_f
        comment = params['text']
 
-    bug = MapBug.create_bug(lat, lon, comment) 
+       name = "NoName";
+       name = params['name'] if params['name'];
+
+    bug = MapBug.create_bug(lat, lon)
+       bug.save;
+       add_comment(bug, comment, name);
  
        render_ok
   end
@@ -58,12 +69,14 @@ class MapBugsController < ApplicationController
        raise OSM::APIBadUserInput.new("No id was given") unless params['id']
        raise OSM::APIBadUserInput.new("No text was given") unless params['text']
 
+       name = "NoName";
+       name = params['name'] if params['name'];
+       
        id = params['id'].to_i
 
        bug = MapBug.find_by_id(id);
-    bug.text += "<hr /> " + params['text']
-    bug.last_changed = Time.now.getutc;
-    bug.save;
+
+       bug_comment = add_comment(bug, params['text'], name);
 
        render_ok
   end
@@ -92,11 +105,28 @@ class MapBugsController < ApplicationController
   end
 
   def rss
-       ##TODO: needs to be implemented
+       request.format = :rss
+       get_bugs
   end
 
   def gpx_bugs
-       ##TODO: needs to be implemented
+       request.format = :xml
+       get_bugs
+  end
+
+  def add_comment(bug, comment, name) 
+    t = Time.now.getutc 
+    bug_comment = bug.map_bug_comment.create(:date_created => t, :visible => true, :comment => comment);  
+    if @user  
+      bug_comment.commenter_id = @user.id
+         bug_comment.commenter_name = @user.display_name
+    else  
+      bug_comment.commenter_ip = request.remote_ip
+         bug_comment.commenter_name = name + " (a)"
+    end
+    bug_comment.save; 
+    bug.last_changed = t 
+    bug.save 
   end
 
 end