X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2a11b9682c74c2440b80d40d379bc9861afd2f0f..c3d1123965b2d9bc34299c3a6c64d186c62c0ed2:/app/assets/javascripts/map.js.erb?ds=sidebyside diff --git a/app/assets/javascripts/map.js.erb b/app/assets/javascripts/map.js.erb index 82826ebfb..fc2f955a8 100644 --- a/app/assets/javascripts/map.js.erb +++ b/app/assets/javascripts/map.js.erb @@ -14,7 +14,7 @@ function createMap(divName, options) { new SimpleLayerSwitcher(), new OpenLayers.Control.Navigation(), new OpenLayers.Control.Zoom(), - new OpenLayers.Control.PanZoomBar(), + new OpenLayers.Control.SimplePanZoom(), new OpenLayers.Control.ScaleLine({geodesic: true}) ], numZoomLevels: 20, @@ -22,7 +22,7 @@ function createMap(divName, options) { theme: "<%= asset_path 'theme/openstreetmap/style.css' %>" }); - var mapnik = new OpenLayers.Layer.OSM.Mapnik(i18n("javascripts.map.base.standard"), { + var mapnik = new OpenLayers.Layer.OSM.Mapnik(I18n.t("javascripts.map.base.standard"), { attribution: "", keyid: "mapnik", displayOutsideMaxExtent: true, @@ -31,7 +31,7 @@ function createMap(divName, options) { }); map.addLayer(mapnik); - var cyclemap = new OpenLayers.Layer.OSM.CycleMap(i18n("javascripts.map.base.cycle_map"), { + var cyclemap = new OpenLayers.Layer.OSM.CycleMap(I18n.t("javascripts.map.base.cycle_map"), { attribution: "Tiles courtesy of Andy Allan", keyid: "cyclemap", displayOutsideMaxExtent: true, @@ -40,7 +40,7 @@ function createMap(divName, options) { }); map.addLayer(cyclemap); - var transportmap = new OpenLayers.Layer.OSM.TransportMap(i18n("javascripts.map.base.transport_map"), { + var transportmap = new OpenLayers.Layer.OSM.TransportMap(I18n.t("javascripts.map.base.transport_map"), { attribution: "Tiles courtesy of Andy Allan", keyid: "transportmap", displayOutsideMaxExtent: true, @@ -49,7 +49,7 @@ function createMap(divName, options) { }); map.addLayer(transportmap); - var mapquest = new OpenLayers.Layer.OSM(i18n("javascripts.map.base.mapquest"), [ + var mapquest = new OpenLayers.Layer.OSM(I18n.t("javascripts.map.base.mapquest"), [ "http://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", "http://otile2.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", "http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", @@ -71,6 +71,16 @@ function createMap(divName, options) { }); map.addLayer(markers); + map.dataLayer = new OpenLayers.Layer(I18n.t('browse.start_rjs.data_layer_name'), { + visibility: false, + displayInLayerSwitcher: false + }); + map.addLayer(map.dataLayer); + + $("#" + divName).on("resized", function () { + map.updateSize(); + }); + return map; } @@ -194,10 +204,6 @@ function removeMarkerFromMap(marker){ markers.removeMarker(marker); } -function removeBoxFromMap(box){ - vectors.removeFeature(box); -} - function proj(x) { return x.clone().transform(epsg4326, map.getProjectionObject()); }