Resolve conflict

[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 69940c8eaf8593ff7149843fffa5285c5c97fc00..3aeafa9cf08c4cedac6a483da66e06d28c328ca3 100644 (file)
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -70,10 +70,10 @@
     }
   }
 
-  var mapParams = OSM.mapParams();
 <% if @lat && @lon -%>
-  doSWF(<%= @lat %>, <%= @lon %>, mapParams.zoom || <%= @zoom %>);
+  doSWF(<%= @lat %>, <%= @lon %>, <%= @zoom %>);
 <% else -%>
+  var mapParams = OSM.mapParams();
   doSWF(mapParams.lat, mapParams.lon, mapParams.zoom || 17);
 <% end -%>