add mappam... also stuff in user controller that must have been done by TomH?

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

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index 42f428a62a85a41c9ebe0ab23dd997738f3079d8..a1b0a4925fb93b2b51af5d4fcd788b43ccdd1819 100644 (file)
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -1,26 +1,35 @@
-<div id="mapImage">
+<%= render :partial => 'search' %>
 
-  <div style="position: absolute; left: 0px; top: 0px; height: 500px; width: 700px; padding: 1em;">
+<% 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 %>
 
-    <applet
-    code="org/openstreetmap/processing/OsmApplet.class"
-    archive="OSMApplet.jar, commons-codec-1.3.jar, core.jar, commons-logging.jar, commons-httpclient-3.0-rc3.jar, MinML2.jar, plugin.jar, thinlet.jar"
-    width="700"
-    height="500"
-    MAYSCRIPT="true" >
-    <param name="clat" value="<%= params['lat'] %>">
-    <param name="clon" value="<%= params['lon'] %>">
-    <param name="zoom" value="<%= params['zoom'] %>">
-    <param name="user" value="token">
-    <param name="pass" value="<%= @user.token %>">
-    <param name="wmsurl" value="http://www.openstreetmap.org/tile/0.2/gpx?;http://www.openstreetmap.org/api/wms/0.2/landsat/?request=GetMap&layers=modis,global_mosaic&styles=&srs=EPSG:4326&FORMAT=image/jpeg">
-    <param name="apiurl" value="http://www.openstreetmap.org/api/0.3/">
-    Your browser needs to support Java to edit maps.<br>
-    <a href="http://java.com/en/download/index.jsp">Download Java here</a>
-    </applet>
-    <br /><a href="http://www.openstreetmap.org/wiki/index.php/Editing" target="_blank">Need help editing?</a>
+<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>.
 
-  </div>
+    <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="/javascripts/swfobject.js"></script>
+  <script type="text/javascript">
+    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','<%= @user.token %>');
+      fo.write("mapcontent");
+    }
 
-</div>
+    doSWF(<%= lat %>,<%= lon %>,<%= zoom %>);
 
+</script>