Make sure the ruby quadtile code give the same result as the C version

[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 16d127641493236b78dd8dc7e183f38f29cbd1f8..f4105929ffe06a3ef4e3f80a266e739da08eeeb5 100644 (file)
--- a/app/controllers/map_bugs_controller.rb
+++ b/app/controllers/map_bugs_controller.rb
@@ -15,170 +15,189 @@ class MapBugsController < ApplicationController
 
   def get_bugs
 
 
   def get_bugs
 

-       # Figure out the bbox
+    # Figure out the bbox

     bbox = params['bbox']
 
     if bbox and bbox.count(',') == 3
       bbox = bbox.split(',')
     bbox = params['bbox']
 
     if bbox and bbox.count(',') == 3
       bbox = bbox.split(',')

-         min_lon, min_lat, max_lon, max_lat = sanitise_boundaries(bbox)
-       else
-         #Fallback to old style, this is deprecated and should not be used
-         raise OSM::APIBadUserInput.new("No l was given") unless params['l']
-         raise OSM::APIBadUserInput.new("No r was given") unless params['r']
-         raise OSM::APIBadUserInput.new("No b was given") unless params['b']
-         raise OSM::APIBadUserInput.new("No t was given") unless params['t']
-
-         min_lon = params['l'].to_f
-         max_lon = params['r'].to_f
-         min_lat = params['b'].to_f
-         max_lat = params['t'].to_f
+      @min_lon, @min_lat, @max_lon, @max_lat = sanitise_boundaries(bbox)
+    else
+      #Fallback to old style, this is deprecated and should not be used
+      raise OSM::APIBadUserInput.new("No l was given") unless params['l']
+      raise OSM::APIBadUserInput.new("No r was given") unless params['r']
+      raise OSM::APIBadUserInput.new("No b was given") unless params['b']
+      raise OSM::APIBadUserInput.new("No t was given") unless params['t']
+
+      @min_lon = params['l'].to_f
+      @max_lon = params['r'].to_f
+      @min_lat = params['b'].to_f
+      @max_lat = params['t'].to_f

     end
     end

-       limit = getLimit
-       conditions = closedCondition
-       
-       # check boundary is sane and area within defined
-    # see /config/application.yml
-    begin
-      check_boundaries(min_lon, min_lat, max_lon, max_lat)
-    rescue Exception => err
-      report_error(err.message)
-      return
-    end
-

 
 

+    limit = getLimit
+    conditions = closedCondition
+       
+    check_boundaries(@min_lon, @min_lat, @max_lon, @max_lat, MAX_BUG_REQUEST_AREA)

 
 

-       @bugs = MapBug.find_by_area(min_lat, min_lon, max_lat, max_lon, :order => "last_changed DESC", :limit => limit, :conditions => conditions)
+    @bugs = MapBug.find_by_area(@min_lat, @min_lon, @max_lat, @max_lon, :include => :comments, :order => "last_changed DESC", :limit => limit, :conditions => conditions)

 
 

-       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 :template => 'map_bugs/get_bugs.gpx'}
-       end
+    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 => { :comments => { :only => [:commenter_name, :date_created, :comment]}}) }        
+      format.gpx {render :template => 'map_bugs/get_bugs.gpx'}
+    end

   end
 
   def add_bug
   end
 
   def add_bug

-       raise OSM::APIBadUserInput.new("No lat was given") unless params['lat']
-       raise OSM::APIBadUserInput.new("No lon was given") unless params['lon']
-       raise OSM::APIBadUserInput.new("No text was given") unless params['text']
-
-       lon = params['lon'].to_f
-       lat = params['lat'].to_f
-       comment = params['text']
-
-       name = "NoName";
-       name = params['name'] if params['name'];
-
-    @bug = MapBug.create_bug(lat, lon)
-
-
-       #TODO: move this into a helper function
-       url = "http://nominatim.openstreetmap.org/reverse?lat=" + lat.to_s + "&lon=" + lon.to_s + "&zoom=16" 
-    response = REXML::Document.new(Net::HTTP.get(URI.parse(url))) 
- 
-    if result = response.get_text("reversegeocode/result") 
-      @bug.nearby_place = result.to_s 
-    else 
-      @bug.nearby_place = "unknown"
-    end        
-       
-       @bug.save;
-       add_comment(@bug, comment, name);
+    raise OSM::APIBadUserInput.new("No lat was given") unless params['lat']
+    raise OSM::APIBadUserInput.new("No lon was given") unless params['lon']
+    raise OSM::APIBadUserInput.new("No text was given") unless params['text']
+
+    lon = params['lon'].to_f
+    lat = params['lat'].to_f
+    comment = params['text']
+
+    name = "NoName"
+    name = params['name'] if params['name']
+
+    #Include in a transaction to ensure that there is always a map_bug_comment for every map_bug
+    MapBug.transaction do
+      @bug = MapBug.create_bug(lat, lon)
+
+      #TODO: move this into a helper function
+      begin
+        url = "http://nominatim.openstreetmap.org/reverse?lat=" + lat.to_s + "&lon=" + lon.to_s + "&zoom=16" 
+        response = REXML::Document.new(Net::HTTP.get(URI.parse(url))) 
+               
+        if result = response.get_text("reversegeocode/result") 
+          @bug.nearby_place = result.to_s 
+        else 
+          @bug.nearby_place = "unknown"
+        end
+      rescue Exception => err
+        @bug.nearby_place = "unknown"
+      end
+         
+      @bug.save
+      add_comment(@bug, comment, name,"opened")
+    end

  
  

-       render_ok
+    render_ok

   end
 
   def edit_bug
   end
 
   def edit_bug

-       raise OSM::APIBadUserInput.new("No id was given") unless params['id']
-       raise OSM::APIBadUserInput.new("No text was given") unless params['text']
+    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'];
+    name = "NoName"
+    name = params['name'] if params['name']

        
        

-       id = params['id'].to_i
+    id = params['id'].to_i

 
 

-       bug = MapBug.find_by_id(id);
-       raise OSM::APINotFoundError unless bug
-       raise OSM::APIAlreadyDeletedError unless bug.visible
+    bug = MapBug.find_by_id(id)
+    raise OSM::APINotFoundError unless bug
+    raise OSM::APIAlreadyDeletedError unless bug.visible

 
 

-       bug_comment = add_comment(bug, params['text'], name);
+    MapBug.transaction do
+      bug_comment = add_comment(bug, params['text'], name,"commented")
+    end

 
 

-       render_ok
+    render_ok

   end
 
   def close_bug
   end
 
   def close_bug

-       raise OSM::APIBadUserInput.new("No id was given") unless params['id']
+    raise OSM::APIBadUserInput.new("No id was given") unless params['id']

        
        

-       id = params['id'].to_i
+    id = params['id'].to_i
+    name = "NoName"
+    name = params['name'] if params['name']

 
 

-       bug = MapBug.find_by_id(id);
-       raise OSM::APINotFoundError unless bug
-       raise OSM::APIAlreadyDeletedError unless bug.visible
+    bug = MapBug.find_by_id(id)
+    raise OSM::APINotFoundError unless bug
+    raise OSM::APIAlreadyDeletedError unless bug.visible

 
 

-       bug.close_bug;
+    MapBug.transaction do
+      bug.close_bug
+      add_comment(bug,:nil,name,"closed")
+    end

 
 

-       render_ok
+    render_ok

   end 
 
   end 
 

-

   def rss
   def rss

-       request.format = :rss
-       get_bugs
-  end
+    limit = getLimit
+    conditions = closedCondition

 
 

-  def gpx_bugs
-       request.format = :xml
-       get_bugs
+    # Figure out the bbox
+    bbox = params['bbox']
+
+    if bbox and bbox.count(',') == 3
+      bbox = bbox.split(',')
+      @min_lon, @min_lat, @max_lon, @max_lat = sanitise_boundaries(bbox)
+
+      check_boundaries(@min_lon, @min_lat, @max_lon, @max_lat, MAX_BUG_REQUEST_AREA)
+
+      conditions = cond_merge conditions, [OSM.sql_for_area(@min_lat, @min_lon, @max_lat, @max_lon)]
+    end
+
+    @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 read
   end
 
   def read

-       @bug = MapBug.find(params['id'])
-       raise OSM::APINotFoundError unless @bug
-       raise OSM::APIAlreadyDeletedError unless @bug.visible
-
-       respond_to do |format|
-         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]}}) }       
-       end
+    @bug = MapBug.find(params['id'])
+    raise OSM::APINotFoundError unless @bug
+    raise OSM::APIAlreadyDeletedError unless @bug.visible
+    
+    respond_to do |format|
+      format.rss
+      format.xml
+      format.json { render :json => @bug.to_json(:methods => [:lat, :lon], :only => [:id, :status, :date_created], :include => { :comments => { :only => [:commenter_name, :date_created, :comment]}}) }         
+      format.gpx
+    end

   end
 
   def delete
   end
 
   def delete

-       bug = MapBug.find(params['id'])
-       raise OSM::APINotFoundError unless @bug
-       raise OSM::APIAlreadyDeletedError unless @bug.visible
-       bug.status = "hidden"
-       bug.save
-       render :text => "ok\n", :content_type => "text/html" 
+    bug = MapBug.find(params['id'])
+    raise OSM::APINotFoundError unless @bug
+    raise OSM::APIAlreadyDeletedError unless @bug.visible
+
+    MapBug.transaction do
+      bug.status = "hidden"
+      bug.save
+      add_comment(bug,:nil,name,"hidden")
+    end
+
+    render :text => "ok\n", :content_type => "text/html" 

   end
 
   def search
   end
 
   def search

-       raise OSM::APIBadUserInput.new("No query string was given") unless params['q']
-       limit = getLimit
-       conditions = closedCondition
-       conditions = cond_merge conditions, ['map_bug_comment.comment ~ ?', params['q']]
+    raise OSM::APIBadUserInput.new("No query string was given") unless params['q']
+    limit = getLimit
+    conditions = closedCondition
+    conditions = cond_merge conditions, ['map_bug_comment.comment ~ ?', params['q']]

        
        

-       #TODO: There should be a better way to do this.   CloseConditions are ignored at the moment
-
-       bugs2 = MapBug.find(:all, :limit => limit, :order => "last_changed DESC", :joins => :map_bug_comment,
-                                               :conditions => conditions)
-       @bugs = bugs2.uniq
-       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 :template => 'map_bugs/get_bugs.gpx'}
-       end
+    #TODO: There should be a better way to do this.   CloseConditions are ignored at the moment
+
+    bugs2 = MapBug.find(:all, :limit => limit, :order => "last_changed DESC", :joins => :comments, :include => :comments,
+                        :conditions => conditions)
+    @bugs = bugs2.uniq
+    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 => { :comments => { :only => [:commenter_name, :date_created, :comment]}}) }
+      format.gpx {render :template => 'map_bugs/get_bugs.gpx'}
+    end

   end
 
   def my_bugs
   end
 
   def my_bugs

- 

     if params[:display_name] 
     if params[:display_name] 

-      @user2 = User.find_by_display_name(params[:display_name], :conditions => { :visible => true }) 
+      @user2 = User.find_by_display_name(params[:display_name], :conditions => { :status => ["active", "confirmed"] }) 

  
       if @user2  
         if @user2.data_public? or @user2 == @user 
  
       if @user2  
         if @user2.data_public? or @user2 == @user 


@@ -186,32 +205,32 @@ class MapBugsController < ApplicationController
         else 
           conditions = ['false'] 
         end 
         else 
           conditions = ['false'] 
         end 

-      elsif request.format == :html 
+      else #if request.format == :html 

         @title = t 'user.no_such_user.title' 
         @not_found_user = params[:display_name] 
         render :template => 'user/no_such_user', :status => :not_found 
         @title = t 'user.no_such_user.title' 
         @not_found_user = params[:display_name] 
         render :template => 'user/no_such_user', :status => :not_found 

+        return

       end 
     end
 
       end 
     end
 

-       if @user2 
+    if @user2 

       user_link = render_to_string :partial => "user", :object => @user2 
     end 
       user_link = render_to_string :partial => "user", :object => @user2 
     end 

-
-       @title =  t 'bugs.user.title_user', :user => @user2.display_name 
+    
+    @title =  t 'bugs.user.title_user', :user => @user2.display_name 

     @heading =  t 'bugs.user.heading_user', :user => @user2.display_name 
     @description = t 'bugs.user.description_user', :user => user_link
     @heading =  t 'bugs.user.heading_user', :user => @user2.display_name 
     @description = t 'bugs.user.description_user', :user => user_link

-
-       @page = (params[:page] || 1).to_i 
+    
+    @page = (params[:page] || 1).to_i 

     @page_size = 10
 
     @page_size = 10
 

-       @bugs = MapBug.find(:all, 
-                                               :include => [:map_bug_comment, {:map_bug_comment => :user}],
-                                               :joins => :map_bug_comment,
-                                               :order => "last_changed DESC",
-                                               :conditions => conditions,
-                                               :offset => (@page - 1) * @page_size, 
-                                               :limit => @page_size).uniq
-       
+    @bugs = MapBug.find(:all, 
+                        :include => [:comments, {:comments => :user}],
+                        :joins => :comments,
+                        :order => "last_changed DESC",
+                        :conditions => conditions,
+                        :offset => (@page - 1) * @page_size, 
+                        :limit => @page_size).uniq

   end
 
 private 
   end
 
 private 


@@ -234,54 +253,62 @@ private
     end 
   end 
 
     end 
   end 
 

-
-

   def render_ok
   def render_ok

-       output_js = :false
-       output_js = :true if params['format'] == "js"
-
-       if output_js == :true
-         render :text => "osbResponse();", :content_type => "text/javascript" 
-       else
-         render :text => "ok " + @bug.id.to_s + "\n", :content_type => "text/html" if @bug
-         render :text => "ok\n", :content_type => "text/html" unless @bug
-       end
+    output_js = :false
+    output_js = :true if params['format'] == "js"
+
+    if output_js == :true
+      render :text => "osbResponse();", :content_type => "text/javascript" 
+    else
+      render :text => "ok " + @bug.id.to_s + "\n", :content_type => "text/html" if @bug
+      render :text => "ok\n", :content_type => "text/html" unless @bug
+    end

   end
 
   def getLimit
   end
 
   def getLimit

-       limit = 100;
-       limit = params['limit'] if ((params['limit']) && (params['limit'].to_i < 10000) && (params['limit'].to_i > 0))
-       return limit
+    limit = 100
+    limit = params['limit'] if ((params['limit']) && (params['limit'].to_i < 10000) && (params['limit'].to_i > 0))
+    return limit

   end
 
   def closedCondition
   end
 
   def closedCondition

-       closed_since = 7 unless params['closed']
-       closed_since = params['closed'].to_i if params['closed']
+    closed_since = 7 unless params['closed']
+    closed_since = params['closed'].to_i if params['closed']

        
        

-       if closed_since < 0
-         conditions = ["status != 'hidden'"]
-       elsif closed_since > 0
-         conditions = ["((status = 'open') OR ((status = 'closed' ) AND (date_closed > '" + (Time.now - closed_since.days).to_s + "')))"]
-       else
-         conditions = ["status = 'open'"]
-       end
-
-       return conditions
+    if closed_since < 0
+      conditions = ["status != 'hidden'"]
+    elsif closed_since > 0
+      conditions = ["((status = 'open') OR ((status = 'closed' ) AND (date_closed > '" + (Time.now - closed_since.days).to_s + "')))"]
+    else
+      conditions = ["status = 'open'"]
+    end
+
+    return conditions

   end
 
   end
 

-  def add_comment(bug, comment, name) 
+  def add_comment(bug, comment, name,event) 

     t = Time.now.getutc 
     t = Time.now.getutc 

-    bug_comment = bug.map_bug_comment.create(:date_created => t, :visible => true, :comment => comment);  
+    bug_comment = bug.comments.create(:date_created => t, :visible => true, :event => event)
+    bug_comment.comment = comment unless comment == :nil

     if @user  
       bug_comment.commenter_id = @user.id
     if @user  
       bug_comment.commenter_id = @user.id

-         bug_comment.commenter_name = @user.display_name
+      bug_comment.commenter_name = @user.display_name

     else  
       bug_comment.commenter_ip = request.remote_ip
     else  
       bug_comment.commenter_ip = request.remote_ip

-         bug_comment.commenter_name = name + " (a)"
+      bug_comment.commenter_name = name + " (a)"

     end
     end

-    bug_comment.save; 
+    bug_comment.save 

     bug.last_changed = t 
     bug.last_changed = t 

-    bug.save 
+    bug.save
+
+    sent_to = Set.new
+    bug.comments.each do | cmt |
+      if cmt.user
+        unless sent_to.include?(cmt.user)
+          Notifier.deliver_bug_comment_notification(bug_comment, cmt.user) unless cmt.user == @user
+          sent_to.add(cmt.user)
+        end
+      end
+    end

   end
   end

-

 end
 end