From: Tom Hughes <tom@compton.nu>
Date: Mon, 1 Aug 2011 15:59:40 +0000 (+0100)
Subject: Show the current location when editing a diary entry with a location
X-Git-Tag: live~6226
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e60810aeda7207f511083c7e6075f76b70c6e139?hp=2047f7cc9b85686e1f4598e60dd241c04ef2989c

Show the current location when editing a diary entry with a location
---

diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb
index 122c4e434..b5abd667b 100644
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -35,7 +35,11 @@
   </table>
 <% end %>
 
-<% if @user.home_lat.nil? or @user.home_lon.nil? %>
+<% if @diary_entry.latitude and @diary_entry.longitude %>
+  <% lon = @diary_entry.longitude %>
+  <% lat = @diary_entry.latitude %>
+  <% zoom = '12' %>
+<% elsif @user.home_lat.nil? or @user.home_lon.nil? %>
   <% lon = h(params['lon'] || '-0.1') %>
   <% lat = h(params['lat'] || '51.5') %>
   <% zoom = h(params['zoom'] || '4') %> 
@@ -81,6 +85,10 @@
 
     setMapCenter(centre, zoom);
 
+    <% if @diary_entry.latitude and @diary_entry.longitude %>
+    marker = addMarkerToMap(centre, null, "<%= t 'diary_entry.edit.marker_text' -%>");
+    <% end %>
+
     map.events.register("click", map, setLocation);
   }
 // -->