Make sure we always put a valid URL on the edit tab, and allow switching

[rails.git] / app / views / site / edit.rhtml

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index e1ef556e07fa59c04af1f3ec0c9198f72ed0ab8b..a1b0a4925fb93b2b51af5d4fcd788b43ccdd1819 100644 (file)
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -1,7 +1,18 @@
-<!-- <p>This editor isn't working yet - currently you can only browse the aerial photos.
-See <a href="http://trac.openstreetmap.org/ticket/402">Trac #402</a> for more details.
-You may also want to look at <a href="http://josm.eigenheimstrasse.de/">JOSM</a> for a
-fully functional desktop client editor for OpenStreetMap.</p> -->
+<%= render :partial => 'search' %>
+
+<% if params['mlon'] and params['mlat'] %>
+<% lon =  params['mlon'] %>
+<% lat =  params['mlat']  %>
+<% zoom =  params['zoom'] || '12' %>
+<% elsif @user and params['lon'].nil? and params['lat'].nil? %> 
+<% lon =  @user.home_lon %>
+<% lat =  @user.home_lat %>
+<% zoom = '12' %>
+<%else%>
+<% lon =  params['lon'] || '-0.1' %>
+<% lat =  params['lat'] || '51.5' %>
+<% zoom =  params['zoom'] || '12' %>
+<% end %>
 
 <div id="mapcontent">You need a Flash player to use Potlatch, the
     OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>.
@@ -18,9 +29,7 @@ fully functional desktop client editor for OpenStreetMap.</p> -->
       fo.addVariable('token','<%= @user.token %>');
       fo.write("mapcontent");
     }
-<% lon =  params['lon'] || @user.home_lon || '-0.1' %>
-<% lat =  params['lat'] || @user.home_lat || '51.5' %>
 
-    doSWF(<%= lat %>,<%= lon %>,12);
+    doSWF(<%= lat %>,<%= lon %>,<%= zoom %>);
 
 </script>