Merge remote-tracking branch 'upstream/pull/2160'

[rails.git] / app / assets / javascripts / edit / potlatch2.js.erb

diff --git a/app/assets/javascripts/edit/potlatch2.js.erb b/app/assets/javascripts/edit/potlatch2.js.erb
index 9ef0060795c83e8af4054b3b3068e5772ae87291..d5c6ecd7d80119338a96d5c3dac9d8aea4647797 100644 (file)
--- a/app/assets/javascripts/edit/potlatch2.js.erb
+++ b/app/assets/javascripts/edit/potlatch2.js.erb
@@ -34,13 +34,13 @@ $(document).ready(function () {
   if (potlatch.data("lat") && potlatch.data("lon")) {
     flashvars.lat = potlatch.data("lat");
     flashvars.lon = potlatch.data("lon");
   if (potlatch.data("lat") && potlatch.data("lon")) {
     flashvars.lat = potlatch.data("lat");
     flashvars.lon = potlatch.data("lon");

-    flashvars.scale = potlatch.data("zoom");
+    flashvars.zoom = potlatch.data("zoom");

   } else {
     var mapParams = OSM.mapParams();
 
     flashvars.lat = mapParams.lat;
     flashvars.lon = mapParams.lon;
   } else {
     var mapParams = OSM.mapParams();
 
     flashvars.lat = mapParams.lat;
     flashvars.lon = mapParams.lon;

-    flashvars.scale = mapParams.zoom || 17;
+    flashvars.zoom = mapParams.zoom || 17;

   }
   
   if (potlatch.data("token")) {
   }
   
   if (potlatch.data("token")) {