X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/eab2eeaa47b2aa8c7f52371f9bfdd60711a41fb6..44a0835487875777401342b16fee73da68589cf5:/app/assets/javascripts/leaflet.map.js.erb?ds=inline diff --git a/app/assets/javascripts/leaflet.map.js.erb b/app/assets/javascripts/leaflet.map.js.erb index 35370ae99..14cddafce 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") @@ -241,7 +241,20 @@ 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); + }, + + setSidebarOverlaid: function(overlaid) { + if (overlaid && !$("#content").hasClass("overlay-sidebar")) { + $("#content").addClass("overlay-sidebar"); + this.invalidateSize({pan: false}) + .panBy([-350, 0], {animate: false}); + } else if (!overlaid && $("#content").hasClass("overlay-sidebar")) { + this.panBy([350, 0], {animate: false}); + $("#content").removeClass("overlay-sidebar"); + this.invalidateSize({pan: false}); + } + return this; } }); @@ -250,8 +263,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, {