From: Tom Hughes <tom@compton.nu>
Date: Wed, 8 Sep 2010 16:13:54 +0000 (+0100)
Subject: Use the keyid to identify the layer to using when exporting to an
X-Git-Tag: live~6298^2~1
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d8006be822a4ef8b09ed060a164fc33d636998db

Use the keyid to identify the layer to using when exporting to an
embeddable map. Fixes #3221.
---

diff --git a/app/views/export/start.rjs b/app/views/export/start.rjs
index cc4d198cd..b9e2da7f6 100644
--- a/app/views/export/start.rjs
+++ b/app/views/export/start.rjs
@@ -227,7 +227,7 @@ page << <<EOJ
 
   function htmlUrlChanged() {
     var bounds = new OpenLayers.Bounds($("minlon").value, $("minlat").value, $("maxlon").value, $("maxlat").value);
-    var layerName = map.baseLayer.name.toLowerCase();
+    var layerName = map.baseLayer.keyid;
     var url = "http://#{SERVER_URL}/export/embed.html?bbox=" + bounds.toBBOX() + "&layer=" + layerName;
     var markerUrl = "";
 
diff --git a/public/export/embed.html b/public/export/embed.html
index 35b93a2ac..bba670255 100644
--- a/public/export/embed.html
+++ b/public/export/embed.html
@@ -56,7 +56,7 @@
                    attribution: attribution
                 });
                 map.addLayer(osmarender);
-            } else if (args.layer == "cycle map") {
+            } else if (args.layer == "cyclemap" || args.layer == "cycle map") {
                 var cyclemap = new OpenLayers.Layer.OSM.CycleMap("Cycle Map", {
                    displayOutsideMaxExtent: true,
                    wrapDateLine: true,