Add a keyid attribute to each layer and use it when requesting the

key instead of trying to use the layer name, which can be translated
which will stop it working. Closes #2876.

diff --git a/app/views/site/_key.html.erb b/app/views/site/_key.html.erb
index 22261900d60ad3ba61ce94c8378c6d7a737c9463..e990071c850b65dee3ba7dc2ac7cbbce7bb5497b 100644 (file)
--- a/app/views/site/_key.html.erb
+++ b/app/views/site/_key.html.erb
@@ -17,7 +17,7 @@
   }
 
   function updateMapKey() {
   }
 
   function updateMapKey() {

-    var layer = map.baseLayer.name.toLowerCase().replace(/\s+/g, "_");
+    var layer = map.baseLayer.keyid;

     var zoom = map.getZoom();
 
     <%= remote_function :update => "sidebar_content",
     var zoom = map.getZoom();
 
     <%= remote_function :update => "sidebar_content",

diff --git a/public/javascripts/map.js b/public/javascripts/map.js
index ab15198abf3ba411abf763928167668c1dabd34f..732dbb82350bc102462c168ce069d35085fd34ff 100644 (file)
--- a/public/javascripts/map.js
+++ b/public/javascripts/map.js
@@ -32,18 +32,21 @@ function createMap(divName, options) {
    });
 
    var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.mapnik"), {
    });
 
    var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.mapnik"), {

+      keyid; "mapnik",

       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(mapnik);
 
    var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), {
       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(mapnik);
 
    var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), {

+      keyid: "osmarender",

       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(osmarender);
 
    var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), {
       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
    map.addLayer(osmarender);
 
    var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), {

+      keyid: "cyclemap",

       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });
       displayOutsideMaxExtent: true,
       wrapDateLine: true
    });