X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4f552430b4b302156e20ec4f2915fe927fdd356b..dd1ec4eb9bd23c2e7d93451b41f3eda99ffb9f08:/app/views/user/account.html.erb

diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb
index cdd3160e8..64e5ed4bd 100644
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -117,7 +117,23 @@
     <td></td>
     <td>
       <p><%= t 'user.account.update home location on click' %> <input type="checkbox" value="1" <% unless @user.home_lat and @user.home_lon %> checked="checked" <% end %> id="updatehome" /> </p>
-      <div id="map" class="user_map"></div>
+      <% content_for :head do %>
+        <%= javascript_include_tag "user" %>
+      <% end %>
+      <%
+         home = @user.home_lat && @user.home_lon
+         data = {
+           :lon => @user.home_lon || params['lon'] || 0,
+           :lat => @user.home_lat || params['lat'] || 20,
+           :zoom => home ? 12 : params['zoom'] || 1,
+           :marker => !!home
+         }
+
+         if params[:scale].to_f > 0 then
+          data[:zoom] = scale_to_zoom params[:scale]
+         end
+      %>
+      <%= content_tag "div", "", :id => "map", :class => "user_map set_location", :data => data %>
     </td>
   </tr>
   
@@ -128,8 +144,6 @@
 </table>
 <% end %>
 
-<%= render :partial => 'map', :locals => { :setting_location => true,  :show_other_users => false } %>
-
 <% unless @user.data_public? %>
 <a name="public"></a>
 <h2><%= t 'user.account.public editing note.heading' %></h2>