X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/03f733c4f4091dc53e391aa74a020681af98a4ff..273706ae09862364deaa0287a3b563340300fdea:/app/controllers/map_bugs_controller.rb diff --git a/app/controllers/map_bugs_controller.rb b/app/controllers/map_bugs_controller.rb index 16d127641..41881cfb7 100644 --- a/app/controllers/map_bugs_controller.rb +++ b/app/controllers/map_bugs_controller.rb @@ -20,7 +20,7 @@ class MapBugsController < ApplicationController if bbox and bbox.count(',') == 3 bbox = bbox.split(',') - min_lon, min_lat, max_lon, max_lat = sanitise_boundaries(bbox) + @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'] @@ -28,26 +28,17 @@ class MapBugsController < ApplicationController 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 = params['l'].to_f + @max_lon = params['r'].to_f + @min_lat = params['b'].to_f + @max_lat = params['t'].to_f 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 - + check_boundaries(@min_lon, @min_lat, @max_lon, @max_lat, :false) - - @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_no_quadtile(@min_lat, @min_lon, @max_lat, @max_lon, :include => :map_bug_comment, :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"} @@ -71,21 +62,28 @@ class MapBugsController < ApplicationController 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); + #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 end @@ -103,7 +101,9 @@ class MapBugsController < ApplicationController 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 end @@ -112,20 +112,44 @@ class MapBugsController < ApplicationController raise OSM::APIBadUserInput.new("No id was given") unless params['id'] 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.close_bug; + MapBug.transaction do + bug.close_bug; + add_comment(bug,:nil,name,"closed") + end render_ok end def rss - request.format = :rss - 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) + else + @min_lon = -180.0 + @min_lat = -90.0 + @max_lon = 180.0 + @max_lat = 90.0 + end + 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 @@ -149,8 +173,12 @@ class MapBugsController < ApplicationController bug = MapBug.find(params['id']) raise OSM::APINotFoundError unless @bug raise OSM::APIAlreadyDeletedError unless @bug.visible - bug.status = "hidden" - bug.save + MapBug.transaction do + bug.status = "hidden"; + bug.save + add_comment(bug,:nil,name,"hidden") + end + render :text => "ok\n", :content_type => "text/html" end @@ -162,7 +190,7 @@ class MapBugsController < ApplicationController #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, + bugs2 = MapBug.find(:all, :limit => limit, :order => "last_changed DESC", :joins => :map_bug_comment, :include => :map_bug_comment, :conditions => conditions) @bugs = bugs2.uniq respond_to do |format| @@ -186,10 +214,11 @@ class MapBugsController < ApplicationController 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 + return end end @@ -269,9 +298,10 @@ private return conditions end - def add_comment(bug, comment, name) + def add_comment(bug, comment, name,event) t = Time.now.getutc - bug_comment = bug.map_bug_comment.create(:date_created => t, :visible => true, :comment => comment); + bug_comment = bug.map_bug_comment.create(:date_created => t, :visible => true, :event => event); + bug_comment.comment = comment unless comment == :nil if @user bug_comment.commenter_id = @user.id bug_comment.commenter_name = @user.display_name