X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4c84709c8096293f3991af512a79ef2766fc4db8..0721a135b6dadc6e9355cbaf68c57e55c4271da0:/public/javascripts/map.js diff --git a/public/javascripts/map.js b/public/javascripts/map.js index 2685fc03a..32953c439 100644 --- a/public/javascripts/map.js +++ b/public/javascripts/map.js @@ -36,26 +36,26 @@ function createMap(divName, options) { displayProjection: new OpenLayers.Projection("EPSG:4326") }); - var mapnik = new OpenLayers.Layer.OSM.Mapnik(rails_i18n["site.layers.base.mapnik"], { + var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.mapnik"), { displayOutsideMaxExtent: true, wrapDateLine: true }); map.addLayer(mapnik); - var osmarender = new OpenLayers.Layer.OSM.Osmarender(rails_i18n["site.layers.base.osmarender"], { + var osmarender = new OpenLayers.Layer.OSM.Osmarender(i18n("javascripts.map.base.osmarender"), { displayOutsideMaxExtent: true, wrapDateLine: true }); map.addLayer(osmarender); - var cyclemap = new OpenLayers.Layer.OSM.CycleMap(rails_i18n["site.layers.base.cycle_map"], { + var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), { displayOutsideMaxExtent: true, wrapDateLine: true }); map.addLayer(cyclemap); var nonamekey = nonamekeys[document.domain]; - var noname = new OpenLayers.Layer.OSM(rails_i18n["site.layers.base.noname"], [ + var noname = new OpenLayers.Layer.OSM(i18n("javascripts.map.base.noname"), [ "http://a.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png", "http://b.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png", "http://c.tile.cloudmade.com/" + nonamekey + "/3/256/${z}/${x}/${y}.png" @@ -66,7 +66,7 @@ function createMap(divName, options) { }); map.addLayer(noname); - var maplint = new OpenLayers.Layer.OSM.Maplint(rails_i18n["site.layers.overlays.maplint"], { + var maplint = new OpenLayers.Layer.OSM.Maplint(i18n("javascripts.map.overlays.maplint"), { displayOutsideMaxExtent: true, wrapDateLine: true }); @@ -74,7 +74,7 @@ function createMap(divName, options) { var numZoomLevels = Math.max(mapnik.numZoomLevels, osmarender.numZoomLevels); - markers = new OpenLayers.Layer.Markers(rails_i18n["site.layers.overlays.markers"], { + markers = new OpenLayers.Layer.Markers("Markers", { displayInLayerSwitcher: false, numZoomLevels: numZoomLevels, maxExtent: new OpenLayers.Bounds(-20037508,-20037508,20037508,20037508), @@ -108,7 +108,7 @@ function addMarkerToMap(position, icon, description) { } function addObjectToMap(url, zoom, callback) { - var layer = new OpenLayers.Layer.GML(rails_i18n["site.layers.overlays.objects"], url, { + var layer = new OpenLayers.Layer.GML("Objects", url, { format: OpenLayers.Format.OSM, style: { strokeColor: "blue", @@ -152,9 +152,9 @@ function addObjectToMap(url, zoom, callback) { } function addBoxToMap(boxbounds) { - if(!vectors) { + if (!vectors) { // Be aware that IE requires Vector layers be initialised on page load, and not under deferred script conditions - vectors = new OpenLayers.Layer.Vector(rails_i18n["site.layers.overlays.box_layer"], { + vectors = new OpenLayers.Layer.Vector("Boxes", { displayInLayerSwitcher: false }); map.addLayer(vectors);