Make setPosition reposition Potlatch 2 instead of reloading it

[rails.git] / app / views / site / _potlatch2.html.erb

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index 5b072476396e9fa9be3aa308d26ab315edd5e3bf..8256540298f6d8f0c8b104f32c23742a4042e9e2 100644 (file)
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -24,6 +24,9 @@
     fo.addParam("base","/potlatch2");
     if (lat) { fo.addVariable("lat",lat); }
     if (lon) { fo.addVariable("lon",lon); }
     fo.addParam("base","/potlatch2");
     if (lat) { fo.addVariable("lat",lat); }
     if (lon) { fo.addVariable("lon",lon); }

+    <% if params['gpx'] %>
+    fo.addVariable('gpx' ,'<%= h(params['gpx']) %>');
+    <% end %>

     fo.addVariable("zoom",zoom);
     fo.addVariable("api","http://<%= SERVER_URL %>/api/<%= API_VERSION %>/");
     fo.addVariable("policy","http://<%= SERVER_URL %>/api/crossdomain.xml");
     fo.addVariable("zoom",zoom);
     fo.addVariable("api","http://<%= SERVER_URL %>/api/<%= API_VERSION %>/");
     fo.addVariable("policy","http://<%= SERVER_URL %>/api/crossdomain.xml");


@@ -32,12 +35,14 @@
     fo.addVariable("oauth_token_secret","<%= token.secret %>");
     fo.addVariable("oauth_consumer_key","<%= token.client_application.key %>");
     fo.addVariable("oauth_consumer_secret","<%= token.client_application.secret %>");
     fo.addVariable("oauth_token_secret","<%= token.secret %>");
     fo.addVariable("oauth_consumer_key","<%= token.client_application.key %>");
     fo.addVariable("oauth_consumer_secret","<%= token.client_application.secret %>");

+    fo.addVariable("maximise_function","maximiseMap");
+    fo.addVariable("minimise_function","minimiseMap");

     fo.write("map");
   }
 
   doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
 
   function setPosition(lat, lon, zoom) {
     fo.write("map");
   }
 
   doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
 
   function setPosition(lat, lon, zoom) {

-    doSWF(lat, lon, zoom || 15);
+    $("potlatch").setPosition(lat, lon, Math.max(zoom || 15, 13));

   }
 </script>
   }
 </script>