X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/190d0fddfcaa3483b6be2c1d0f24ebbf6cdd3fdc..eb61cc614ff43f32721e844a343f58744cc7ff01:/app/assets/javascripts/leaflet.map.js.erb?ds=sidebyside diff --git a/app/assets/javascripts/leaflet.map.js.erb b/app/assets/javascripts/leaflet.map.js.erb index ed89e1fa5..b4767f96b 100644 --- a/app/assets/javascripts/leaflet.map.js.erb +++ b/app/assets/javascripts/leaflet.map.js.erb @@ -24,19 +24,19 @@ L.OSM.Map = L.Map.extend({ name: I18n.t("javascripts.map.base.standard") }), new L.OSM.CycleMap({ - attribution: copyright + ". Tiles courtesy of Andy Allan", + attribution: copyright + ". Tiles courtesy of Andy Allan", code: "C", keyid: "cyclemap", name: I18n.t("javascripts.map.base.cycle_map") }), new L.OSM.TransportMap({ - attribution: copyright + ". Tiles courtesy of Andy Allan", + attribution: copyright + ". Tiles courtesy of Andy Allan", code: "T", keyid: "transportmap", name: I18n.t("javascripts.map.base.transport_map") }), new L.OSM.MapQuestOpen({ - attribution: copyright + ". Tiles courtesy of MapQuest ", + attribution: copyright + ". Tiles courtesy of MapQuest ", code: "Q", keyid: "mapquest", name: I18n.t("javascripts.map.base.mapquest") @@ -91,7 +91,7 @@ L.OSM.Map = L.Map.extend({ }, getUrl: function(marker) { - var precision = zoomPrecision(this.getZoom()), + var precision = OSM.zoomPrecision(this.getZoom()), params = {}; if (marker && this.hasLayer(marker)) { @@ -148,6 +148,11 @@ L.OSM.Map = L.Map.extend({ } var params = {}; + var layers = this.getLayersCode().replace('M', ''); + + if (layers) { + params.layers = layers; + } if (marker && this.hasLayer(marker)) { params.m = ''; @@ -165,7 +170,7 @@ L.OSM.Map = L.Map.extend({ return str; }, - addObject: function(object) { + addObject: function(object, callback) { var objectStyle = { color: "#FF6200", weight: 4, @@ -215,14 +220,7 @@ L.OSM.Map = L.Map.extend({ map._objectLayer.addData(xml); map._objectLayer.addTo(map); - if (!window.location.hash) { - var bounds = map._objectLayer.getBounds(); - if (bounds.isValid()) { - OSM.router.moveListenerOff(); - map.once('moveend', OSM.router.moveListenerOn); - map.fitBounds(bounds); - } - } + if (callback) callback(map._objectLayer.getBounds()); } }); }, @@ -243,7 +241,7 @@ L.OSM.Map = L.Map.extend({ setState: function(state, options) { if (state.center) this.setView(state.center, state.zoom, options); - this.updateLayers(state.layers); + if (state.layers) this.updateLayers(state.layers); } }); @@ -252,8 +250,7 @@ L.Icon.Default.imagePath = "/images"; L.Icon.Default.imageUrls = { "/images/marker-icon.png": "<%= asset_path("images/marker-icon.png") %>", "/images/marker-icon-2x.png": "<%= asset_path("images/marker-icon-2x.png") %>", - "/images/marker-shadow.png": "<%= asset_path("images/marker-shadow.png") %>", - "/images/marker-shadow-2x.png": "<%= asset_path("images/marker-shadow-2x.png") %>" + "/images/marker-shadow.png": "<%= asset_path("images/marker-shadow.png") %>" }; L.extend(L.Icon.Default.prototype, {