X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9c10e6703e6945c4737c6b7682c6f1d606453294..85d17f257c338f668a1d17d9fc62a2f48ec84230:/app/assets/javascripts/map.js.erb diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb index b45e6b7b5..f23972104 100644 --- a/app/assets/javascripts/map.js.erb +++ b/app/assets/javascripts/map.js.erb @@ -20,10 +20,11 @@ function createMap(divName, options) { units: "m", maxResolution: 156543.0339, numZoomLevels: 20, - displayProjection: new OpenLayers.Projection("EPSG:4326") + displayProjection: new OpenLayers.Projection("EPSG:4326"), + theme: "<%= asset_path 'theme/default/style.css' %>" }); - var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.mapnik"), { + var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.standard"), { attribution: "", keyid: "mapnik", displayOutsideMaxExtent: true, @@ -32,17 +33,8 @@ function createMap(divName, options) { }); map.addLayer(mapnik); - var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), { - attribution: "", - keyid: "osmarender", - displayOutsideMaxExtent: true, - wrapDateLine: true, - layerCode: "O" - }); - map.addLayer(osmarender); - var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), { - attribution: "", + attribution: "Tiles courtesy of Andy Allan", keyid: "cyclemap", displayOutsideMaxExtent: true, wrapDateLine: true, @@ -51,7 +43,7 @@ function createMap(divName, options) { map.addLayer(cyclemap); var transportmap = new OpenLayers.Layer.OSM.TransportMap(i18n("javascripts.map.base.transport_map"), { - attribution: "", + attribution: "Tiles courtesy of Andy Allan", keyid: "transportmap", displayOutsideMaxExtent: true, wrapDateLine: true, @@ -74,11 +66,9 @@ function createMap(divName, options) { }); map.addLayer(mapquest); - var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels); - markers = new OpenLayers.Layer.Markers("Markers", { displayInLayerSwitcher: false, - numZoomLevels: numZoomLevels, + numZoomLevels: 20, maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508), maxResolution: 156543, units: "m", @@ -268,7 +258,7 @@ function setMapLayers(layerConfig) { } else { map.layers[i].setVisibility(true); } - } else { + } else if (!map.layers[i].isBaseLayer) { map.layers[i].setVisibility(false); } }