X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b9473581343a24c58c6fd39458a3057232758e56..9b26dc79c64fd4fde23e03ce15591d22bac3cd98:/app/assets/javascripts/leaflet.map.js.erb diff --git a/app/assets/javascripts/leaflet.map.js.erb b/app/assets/javascripts/leaflet.map.js.erb index 7ae330d9b..b4767f96b 100644 --- a/app/assets/javascripts/leaflet.map.js.erb +++ b/app/assets/javascripts/leaflet.map.js.erb @@ -24,13 +24,13 @@ 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") @@ -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)) { @@ -241,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); } }); @@ -250,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, {