Merge branch 'master' into openid
This commit is contained in:
commit
945d60ea5a
2 changed files with 2 additions and 2 deletions
|
@ -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 = "";
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue