for items which don't actually have a geometry, just zoomToMaxExtent.

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

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index fa693051b677f10f7917dc3f4c79d2037ad727e9..c72a3ab1d75ecff9f945f28fc104db6543630049 100644 (file)
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -26,15 +26,19 @@
 <% if params['mlon'] and params['mlat'] %>
 <% lon =  h(params['mlon']) %>
 <% lat =  h(params['mlat'])  %>
 <% if params['mlon'] and params['mlat'] %>
 <% lon =  h(params['mlon']) %>
 <% lat =  h(params['mlat'])  %>

-<% zoom =  h(params['zoom'] || '12') %>
-<% elsif @user and params['lon'].nil? and params['lat'].nil? %> 
+<% zoom =  h(params['zoom'] || '14') %>
+<% elsif @user and params['lon'].nil? and params['lat'].nil? and params['gpx'].nil? %> 

 <% lon =  @user.home_lon %>
 <% lat =  @user.home_lat %>
 <% lon =  @user.home_lon %>
 <% lat =  @user.home_lat %>

-<% zoom = '12' %>
-<%else%>
+<% zoom = '14' %>
+<% elsif params['gpx'].nil? %>

 <% lon =  h(params['lon'] || '-0.1') %>
 <% lat =  h(params['lat'] || '51.5') %>
 <% lon =  h(params['lon'] || '-0.1') %>
 <% lat =  h(params['lat'] || '51.5') %>

-<% zoom =  h(params['zoom'] || '12') %>
+<% zoom =  h(params['zoom'] || '14') %>
+<% else %>
+<% lon = nil %>
+<% lat = nil %>
+<% zoom = '14' %>

 <% end %>
 
 <div id="map">You need a Flash player to use Potlatch, the
 <% end %>
 
 <div id="map">You need a Flash player to use Potlatch, the


@@ -44,10 +48,11 @@
     for editing OpenStreetMap.
 </div>
 <%= javascript_include_tag 'swfobject.js' %>
     for editing OpenStreetMap.
 </div>
 <%= javascript_include_tag 'swfobject.js' %>

-<script type="text/javascript">
+<script type="text/javascript" defer="defer">

   var brokenContentSize = $("content").offsetWidth == 0;
   var brokenContentSize = $("content").offsetWidth == 0;

-  var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "700", "600", "6", "#FFFFFF");
-  var changesaved = true;
+  var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "6", "#FFFFFF");
+  // 700,600 for fixed size, 100%,100% for resizable
+  var changesaved=true;

   var winie=false; if (document.all && window.print) { winie=true; }
   
   window.onbeforeunload=function() {
   var winie=false; if (document.all && window.print) { winie=true; }
   
   window.onbeforeunload=function() {


@@ -58,17 +63,17 @@
 
   function doSWF(lat,lon,sc) {
     if (sc < 11) sc = 11;
 
   function doSWF(lat,lon,sc) {
     if (sc < 11) sc = 11;

-    fo.addVariable('lat',lat);
-    fo.addVariable('long',lon);

     fo.addVariable('scale',sc);
     fo.addVariable('token','<%= session[:token] %>');
     fo.addVariable('scale',sc);
     fo.addVariable('token','<%= session[:token] %>');

+    if (lat) { fo.addVariable('lat',lat); }
+    if (lon) { fo.addVariable('long',lon); }

     <% if params['gpx'] %>
     <% if params['gpx'] %>

-    fo.addVariable('gpx','<%= h(params['gpx']) + "/data" %>');
+    fo.addVariable('gpx','<%= h(params['gpx']) + "/data.xml" %>');

     <% end %>
     fo.write("map");
   }
 
     <% end %>
     fo.write("map");
   }
 

-  doSWF(<%= lat %>,<%= lon %>,<%= zoom %>);
+  doSWF(<%= lat || 'null' %>,<%= lon || 'null' %>,<%= zoom %>);

 
   function setPosition(lat, lon, zoom) {
     doSWF(lat, lon, zoom);
 
   function setPosition(lat, lon, zoom) {
     doSWF(lat, lon, zoom);


@@ -102,9 +107,10 @@
 
     resizeMap();
   }
 
     resizeMap();
   }

+  
+  handleResize();

 
 

-  window.onresize = handleResize;

   window.onload = handleResize;
   window.onload = handleResize;

-
+  window.onresize = handleResize;

 </script>
 <% end %>
 </script>
 <% end %>