X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/80f48e812f94e2d430f83b96183f93df729572d8..d593d3d2dd6986aa07f5d5268d3e0d7b808590db:/app/views/notes/_note.json.jsonify?ds=sidebyside diff --git a/app/views/notes/_note.json.jsonify b/app/views/notes/_note.json.jsonify index 985bcf79c..b96439922 100644 --- a/app/views/notes/_note.json.jsonify +++ b/app/views/notes/_note.json.jsonify @@ -2,17 +2,23 @@ json.type "Feature" json.geometry do json.type "Point" - json.coordinates [ note.lon, note.lat ] + json.coordinates [ note.lon.to_f, note.lat.to_f ] end json.properties do json.id note.id json.url note_url(note, :format => params[:format]) - json.comment_url comment_note_url(note, :format => params[:format]) - json.close_url close_note_url(note, :format => params[:format]) + + if note.closed? + json.reopen_url reopen_note_url(note, :format => params[:format]) + else + json.comment_url comment_note_url(note, :format => params[:format]) + json.close_url close_note_url(note, :format => params[:format]) + end + json.date_created note.created_at json.status note.status - json.closed_at note.closed_at if note.status == "closed" + json.closed_at note.closed_at if note.closed? json.comments(note.comments) do |comment| json.date comment.created_at @@ -20,7 +26,7 @@ json.properties do if comment.author json.uid comment.author.id json.user comment.author.display_name - json.user_url user_url(:display_name => comment.author.display_name, :host => SERVER_URL) + json.user_url user_url(:display_name => comment.author.display_name, :only_path => false) end json.action comment.event