try and make the OpenStreetBugs API a bit more consistent with the rest of the API
This commit is contained in:
Kai Krueger
parent
01aa270315
commit
458402813c
6 changed files with 181 additions and 45 deletions
|
|
@ -1,8 +1,9 @@
|
|||
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]
|
||||
before_filter :authorize_web, :only => [:add_bug, :close_bug, :edit_bug, :delete]
|
||||
before_filter :check_api_writable, :only => [:add_bug, :close_bug, :edit_bug, :delete]
|
||||
before_filter :require_moderator, :only => [:delete]
|
||||
after_filter :compress_output
|
||||
around_filter :api_call_handle_error, :api_call_timeout
|
||||
|
||||
|
|
@ -11,19 +12,26 @@ class MapBugsController < ApplicationController
|
|||
|
||||
def get_bugs
|
||||
|
||||
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']
|
||||
# Figure out the bbox
|
||||
bbox = params['bbox']
|
||||
|
||||
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 = 100;
|
||||
limit = params['limit'] if ((params['limit']) && (params['limit'].to_i < 10000) && (params['limit'].to_i > 0))
|
||||
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
|
||||
end
|
||||
limit = getLimit
|
||||
conditions = closedCondition
|
||||
|
||||
# check boundary is sane and area within defined
|
||||
# see /config/application.yml
|
||||
|
|
@ -34,7 +42,9 @@ class MapBugsController < ApplicationController
|
|||
return
|
||||
end
|
||||
|
||||
@bugs = MapBug.find_by_area(min_lat, min_lon, max_lat, max_lon, :order => "last_changed DESC", :limit => limit, :conditions => "status != 'hidden'")
|
||||
|
||||
|
||||
@bugs = MapBug.find_by_area(min_lat, min_lon, max_lat, max_lon, :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"}
|
||||
|
|
@ -42,7 +52,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 :text => "Rendering GPX"}
|
||||
format.gpx {render :template => 'map_bugs/get_bugs.gpx'}
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -58,9 +68,9 @@ class MapBugsController < ApplicationController
|
|||
name = "NoName";
|
||||
name = params['name'] if params['name'];
|
||||
|
||||
bug = MapBug.create_bug(lat, lon)
|
||||
bug.save;
|
||||
add_comment(bug, comment, name);
|
||||
@bug = MapBug.create_bug(lat, lon)
|
||||
@bug.save;
|
||||
add_comment(@bug, comment, name);
|
||||
|
||||
render_ok
|
||||
end
|
||||
|
|
@ -92,17 +102,6 @@ class MapBugsController < ApplicationController
|
|||
render_ok
|
||||
end
|
||||
|
||||
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\n", :content_type => "text/html"
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
def rss
|
||||
request.format = :rss
|
||||
|
|
@ -114,6 +113,77 @@ class MapBugsController < ApplicationController
|
|||
get_bugs
|
||||
end
|
||||
|
||||
def read
|
||||
@bug = MapBug.find(params['id'])
|
||||
render :text => "", :status => :gone 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
|
||||
end
|
||||
|
||||
def delete
|
||||
bug = MapBug.find(params['id'])
|
||||
bug.status = "hidden"
|
||||
bug.save
|
||||
render :text => "ok\n", :content_type => "text/html"
|
||||
end
|
||||
|
||||
def search
|
||||
raise OSM::APIBadUserInput.new("No query string was given") unless params['q']
|
||||
limit = getLimit
|
||||
conditions = closedCondition
|
||||
|
||||
#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 => ['map_bug_comment.comment ~ ?', params['q']])
|
||||
@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
|
||||
end
|
||||
|
||||
|
||||
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
|
||||
end
|
||||
|
||||
def getLimit
|
||||
limit = 100;
|
||||
limit = params['limit'] if ((params['limit']) && (params['limit'].to_i < 10000) && (params['limit'].to_i > 0))
|
||||
return limit
|
||||
end
|
||||
|
||||
def closedCondition
|
||||
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 - 7.days).to_s + "')))"
|
||||
else
|
||||
conditions = "status = 'open'"
|
||||
end
|
||||
|
||||
return conditions
|
||||
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);
|
||||
|
|
|
|||
23
app/views/map_bugs/get_bugs.gpx.builder
Normal file
23
app/views/map_bugs/get_bugs.gpx.builder
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
xml.instruct!
|
||||
|
||||
|
||||
xml.gpx("version" => "1.1",
|
||||
"xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
|
||||
"xsi:schemaLocation" => "http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd") do
|
||||
|
||||
for bug in @bugs
|
||||
xml.wpt("lon" => bug.lon, "lat" => bug.lat) do
|
||||
xml.desc do
|
||||
xml.cdata! bug.flatten_comment("<hr />")
|
||||
end
|
||||
xml.extension do
|
||||
if bug.status = "open"
|
||||
xml.closed "0"
|
||||
else
|
||||
xml.closed "1"
|
||||
end
|
||||
xml.id bug.id
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1,23 +1,29 @@
|
|||
xml.instruct!
|
||||
|
||||
|
||||
xml.gpx("version" => "1.1",
|
||||
"xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
|
||||
"xsi:schemaLocation" => "http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd") do
|
||||
|
||||
xml.bugs do
|
||||
for bug in @bugs
|
||||
xml.wpt("lon" => bug.lon, "lat" => bug.lat) do
|
||||
xml.desc do
|
||||
xml.cdata! bug.flatten_comment("<hr />")
|
||||
end
|
||||
xml.extension do
|
||||
if bug.status = "open"
|
||||
xml.closed "0"
|
||||
else
|
||||
xml.closed "1"
|
||||
end
|
||||
xml.bug("lon" => bug.lon, "lat" => bug.lat) do
|
||||
xml.id bug.id
|
||||
xml.date_created bug.date_created
|
||||
xml.nearby bug.nearby_place
|
||||
xml.status bug.status
|
||||
if bug.status == "closed"
|
||||
xml.date_closed bug.date_closed
|
||||
end
|
||||
xml.comments do
|
||||
for comment in bug.map_bug_comment
|
||||
xml.comment do
|
||||
xml.date comment.date_created
|
||||
if !comment.commenter_id.nil?
|
||||
xml.uid comment.commenter_id
|
||||
xml.user comment.user.display_name
|
||||
else
|
||||
xml.user comment.commenter_name
|
||||
end
|
||||
xml.text comment.comment
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
25
app/views/map_bugs/read.xml.builder
Normal file
25
app/views/map_bugs/read.xml.builder
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
xml.instruct!
|
||||
|
||||
xml.bug("lon" => @bug.lon, "lat" => @bug.lat) do
|
||||
xml.id @bug.id
|
||||
xml.date_created @bug.date_created
|
||||
xml.nearby @bug.nearby_place
|
||||
xml.status @bug.status
|
||||
if @bug.status == "closed"
|
||||
xml.date_closed @bug.date_closed
|
||||
end
|
||||
xml.comments do
|
||||
for comment in @bug.map_bug_comment
|
||||
xml.comment do
|
||||
xml.date comment.date_created
|
||||
if !comment.commenter_id.nil?
|
||||
xml.uid comment.commenter_id
|
||||
xml.user comment.user.display_name
|
||||
else
|
||||
xml.user comment.commenter_name
|
||||
end
|
||||
xml.text comment.comment
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue