Fix export

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index c96d18afd31e57dfd364ac6ec8f2a238b29b9a3b..9a975c11c1d4884c7f3adf2e00e7961e7c2bdd99 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -161,6 +161,7 @@ $(document).ready(function () {
     $("#query").focus();
   }
 
     $("#query").focus();
   }
 

+  initializeExport(map);

   initializeBrowse(map);
   initializeNotes(map);
 });
   initializeBrowse(map);
   initializeNotes(map);
 });

diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js
index 3715cbf9970a57a185dafe3c8f0ee1c68f832722..2baab4d4b10f82a5025104ee49992f6f6c67cd68 100644 (file)
--- a/app/assets/javascripts/index/export.js
+++ b/app/assets/javascripts/index/export.js
@@ -1,4 +1,4 @@
-$(document).ready(function () {
+function initializeExport(map) {

   $("#exportanchor").click(function (e) {
     $.ajax({ url: $(this).data('url'), success: function (sidebarHtml) {
       startExport(sidebarHtml);
   $("#exportanchor").click(function (e) {
     $.ajax({ url: $(this).data('url'), success: function (sidebarHtml) {
       startExport(sidebarHtml);


@@ -38,7 +38,7 @@ $(document).ready(function () {
 
     openSidebar();
 
 
     openSidebar();
 

-    if (getMapBaseLayerId() == "mapnik") {
+    if (getMapBaseLayerId(map) == "mapnik") {

       $("#format_mapnik").prop("checked", true);
     }
 
       $("#format_mapnik").prop("checked", true);
     }
 


@@ -186,7 +186,7 @@ $(document).ready(function () {
 
     function htmlUrlChanged() {
       var bounds = getBounds();
 
     function htmlUrlChanged() {
       var bounds = getBounds();

-      var layerName = getMapBaseLayerId();
+      var layerName = getMapBaseLayerId(map);

 
       var url = "http://" + OSM.SERVER_URL + "/export/embed.html?bbox=" + bounds.toBBoxString() + "&layer=" + layerName;
       var markerUrl = "";
 
       var url = "http://" + OSM.SERVER_URL + "/export/embed.html?bbox=" + bounds.toBBoxString() + "&layer=" + layerName;
       var markerUrl = "";


@@ -203,7 +203,7 @@ $(document).ready(function () {
 
       var zoom = map.getBoundsZoom(bounds);
 
 
       var zoom = map.getBoundsZoom(bounds);
 

-      var layers = getMapLayers();
+      var layers = getMapLayers(map);

 
       var text = I18n.t('export.start_rjs.view_larger_map');
       var escaped = [];
 
       var text = I18n.t('export.start_rjs.view_larger_map');
       var escaped = [];


@@ -281,4 +281,4 @@ $(document).ready(function () {
       validateControls();
     }
   }
       validateControls();
     }
   }

-});
+}