X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7599f98957334d1924550205f7ba12a726de7eb0..2a2a204125383729223083f203a04e9e6eff873d:/app/views/notes/_note.json.jsonify

diff --git a/app/views/notes/_note.json.jsonify b/app/views/notes/_note.json.jsonify
index 6afb4a555..74ff5ccec 100644
--- a/app/views/notes/_note.json.jsonify
+++ b/app/views/notes/_note.json.jsonify
@@ -2,24 +2,38 @@ json.type "Feature"
 
 json.geometry do
   json.type "Point"
-  json.coordinates [ note.lon, note.lat ]              
+  json.coordinates [ note.lon, note.lat ]
 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.nearby  note.nearby_place
   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
-    json.uid comment.author_id unless comment.author_id.nil?
-    json.user comment.author_name
+
+    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)
+    end
+
     json.action comment.event
-    json.text comment.body unless comment.body.nil?
+
+    if comment.body
+      json.text comment.body.to_text
+      json.html comment.body.to_html
+    end
   end
 end