X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/42822a8b89443d5fa6ec815d82684698d2d80b07..f4928d0e952ddbde662517d781367dd97eab86a7:/app/controllers/map_bugs_controller.rb diff --git a/app/controllers/map_bugs_controller.rb b/app/controllers/map_bugs_controller.rb index d3a62f553..28d22c3f3 100644 --- a/app/controllers/map_bugs_controller.rb +++ b/app/controllers/map_bugs_controller.rb @@ -1,102 +1,312 @@ class MapBugsController < ApplicationController + layout 'site', :only => [:mine] + before_filter :check_api_readable - before_filter :check_api_writable, :only => [:add_bug, :close_bug, :edit_bug] + before_filter :authorize_web, :only => [:create, :close, :update, :delete, :mine] + before_filter :check_api_writable, :only => [:create, :close, :update, :delete] + before_filter :require_moderator, :only => [:delete] + before_filter :set_locale, :only => [:mine] after_filter :compress_output around_filter :api_call_handle_error, :api_call_timeout # Help methods for checking boundary sanity and area size include MapBoundary - def get_bugs + def list + # 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 + #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'] - 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 - min_lon = params['l'].to_f - max_lon = params['r'].to_f - min_lat = params['b'].to_f - max_lat = params['t'].to_f + 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 + 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, :include => :comments, :order => "updated_at DESC", :limit => limit, :conditions => conditions) + + respond_to do |format| + format.html {render :template => 'map_bugs/list.rjs', :content_type => "text/javascript"} + format.rss {render :template => 'map_bugs/list.rss'} + format.js + format.xml {render :template => 'map_bugs/list.xml'} + format.json { render :json => @bugs.to_json(:methods => [:lat, :lon], :only => [:id, :status, :created_at], :include => { :comments => { :only => [:author_name, :created_at, :body]}}) } + format.gpx {render :template => 'map_bugs/list.gpx'} + end + end + + def create + 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 + end - bugs = MapBug.find_by_area(min_lat, min_lon, max_lat, max_lon, :order => "last_changed DESC", :limit => 100, :conditions => "status != 'hidden'") + def update + raise OSM::APIBadUserInput.new("No id was given") unless params['id'] + raise OSM::APIBadUserInput.new("No text was given") unless params['text'] - resp = "" + name = "NoName" + name = params['name'] if params['name'] - 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" - end + id = params['id'].to_i - render :text => resp, :content_type => "text/javascript" + bug = MapBug.find_by_id(id) + raise OSM::APINotFoundError unless bug + raise OSM::APIAlreadyDeletedError unless bug.visible + + MapBug.transaction do + bug_comment = add_comment(bug, params['text'], name, "commented") + end + + render_ok 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'] + def close + raise OSM::APIBadUserInput.new("No id was given") unless params['id'] + + id = params['id'].to_i + name = "NoName" + name = params['name'] if params['name'] - lon = params['lon'].to_f - lat = params['lat'].to_f - comment = params['text'] + bug = MapBug.find_by_id(id) + raise OSM::APINotFoundError unless bug + raise OSM::APIAlreadyDeletedError unless bug.visible - bug = MapBug.create_bug(lat, lon, comment) - - render_ok + MapBug.transaction do + bug.close_bug + add_comment(bug, :nil, name, "closed") + end + + render_ok + end + + def rss + limit = getLimit + conditions = closedCondition + + # 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 => "created_at DESC", :joins => :map_bug, :include => :map_bug, :conditions => conditions) + render :template => 'map_bugs/rss.rss' 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'] + 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, :created_at], :include => { :comments => { :only => [:author_name, :created_at, :body]}}) } + format.gpx + end + end - id = params['id'].to_i + def delete + bug = MapBug.find(params['id']) + raise OSM::APINotFoundError unless @bug + raise OSM::APIAlreadyDeletedError unless @bug.visible - bug = MapBug.find_by_id(id); - bug.text += "