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 d21d1a0e856b2386f6462a98b9f806c37fbda6b0..a1b0a4925fb93b2b51af5d4fcd788b43ccdd1819 100644 (file)
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -1,21 +1,35 @@
-note that this copy of potlatch is coming off of richards dev account and isn't speaking to your local API as it hasn't been integrated yet.<br>
-FIXME integrate potlatch properly.
+<%= render :partial => 'search' %>
 
-<div id="mapcontent">Sorry, you need a Flash player to use Potlatch, the
+<% 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>.
 
-    <a href="http://wiki.openstreetmap.org/index.php/Editing">Several other options</a> are also available 
+    <a href="http://wiki.openstreetmap.org/index.php/Editing">Several other options</a> are also available
     for editing OpenStreetMap.</div>
-  <script type="text/javascript" src="http://richard.dev.openstreetmap.org/potlatch/swfobject.js"></script>
+  <script type="text/javascript" src="/javascripts/swfobject.js"></script>
   <script type="text/javascript">
-    var fo = new SWFObject("http://richard.dev.openstreetmap.org/potlatch/potlatch.swf", "potlatch", "700", "600", "6", "#FFFFFF");
+    var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "700", "600", "6", "#FFFFFF");
     function doSWF(lat,lon,sc) {
       fo.addVariable('lat',lat);
       fo.addVariable('long',lon);
       fo.addVariable('scale',sc);
-      fo.addVariable('token','tokenstring');
+      fo.addVariable('token','<%= @user.token %>');
       fo.write("mapcontent");
     }
-    doSWF(52.2,-2.2,12);
+
+    doSWF(<%= lat %>,<%= lon %>,<%= zoom %>);
 
 </script>