Fixup some of the rss output and geocode bugs using nominatim
This commit is contained in:
parent
3344e60846
commit
81113f37b7
3 changed files with 25 additions and 6 deletions
|
@ -69,6 +69,18 @@ class MapBugsController < ApplicationController
|
||||||
name = params['name'] if params['name'];
|
name = params['name'] if params['name'];
|
||||||
|
|
||||||
@bug = MapBug.create_bug(lat, lon)
|
@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;
|
@bug.save;
|
||||||
add_comment(@bug, comment, name);
|
add_comment(@bug, comment, name);
|
||||||
|
|
||||||
|
|
|
@ -5,21 +5,22 @@ xml.rss("version" => "2.0",
|
||||||
"xmlns:georss" => "http://www.georss.org/georss") do
|
"xmlns:georss" => "http://www.georss.org/georss") do
|
||||||
xml.channel do
|
xml.channel do
|
||||||
xml.title "OpenStreetBugs"
|
xml.title "OpenStreetBugs"
|
||||||
xml.description "A list of bugs, reported, commented on or closed in your area"
|
xml.description t('bugs.rss.description')
|
||||||
xml.link url_for(:controller => "site", :action => "index", :only_path => false)
|
xml.link url_for(:controller => "site", :action => "index", :only_path => false)
|
||||||
|
|
||||||
for bug in @bugs
|
for bug in @bugs
|
||||||
xml.item do
|
xml.item do
|
||||||
if bug.status == "closed"
|
if bug.status == "closed"
|
||||||
xml.title "Closed bug"
|
xml.title t('bugs.rss.closed', :place => bug.nearby_place)
|
||||||
else if bug.map_bug_comment.length > 1
|
else if bug.map_bug_comment.length > 1
|
||||||
xml.title "Commented on bug"
|
xml.title t('bugs.rss.comment', :place => bug.nearby_place)
|
||||||
else
|
else
|
||||||
xml.title "Created bug"
|
xml.title t('bugs.rss.new', :place => bug.nearby_place)
|
||||||
end end
|
end end
|
||||||
|
|
||||||
xml.link url_for(:controller => "site", :action => "index", :only_path => false)
|
xml.link url_for(:controller => "browse", :action => "bug", :id => bug.id, :only_path => false)
|
||||||
xml.description bug.flatten_comment("|")
|
xml.guid url_for(:controller => "browse", :action => "bug", :id => bug.id, :only_path => false)
|
||||||
|
xml.description htmlize(bug.flatten_comment("<br><br>"))
|
||||||
if (!bug.map_bug_comment.empty?)
|
if (!bug.map_bug_comment.empty?)
|
||||||
xml.author bug.map_bug_comment[-1].commenter_name
|
xml.author bug.map_bug_comment[-1].commenter_name
|
||||||
end
|
end
|
||||||
|
|
|
@ -1619,6 +1619,12 @@ en:
|
||||||
back: "View all blocks"
|
back: "View all blocks"
|
||||||
revoker: "Revoker:"
|
revoker: "Revoker:"
|
||||||
needs_view: "The user needs to log in before this block will be cleared."
|
needs_view: "The user needs to log in before this block will be cleared."
|
||||||
|
bugs:
|
||||||
|
rss:
|
||||||
|
description: "A list of bugs, reported, commented on or closed in your area"
|
||||||
|
closed: "closed bug (near {{place}})"
|
||||||
|
new: "new bug (near {{place}})"
|
||||||
|
comment: "new comment (near {{place}})"
|
||||||
javascripts:
|
javascripts:
|
||||||
map:
|
map:
|
||||||
base:
|
base:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue