X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/79447e75497601444a9d4de25220f24a609d2780..9657b92faddc9fa9bf765fc7de06aa0a9042e8e9:/app/assets/javascripts/leaflet.map.js diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js index d47b89617..105b03ed6 100644 --- a/app/assets/javascripts/leaflet.map.js +++ b/app/assets/javascripts/leaflet.map.js @@ -18,6 +18,7 @@ L.OSM.Map = L.Map.extend({ var copyright = I18n.t("javascripts.map.copyright", { copyright_url: "/copyright" }); var donate = I18n.t("javascripts.map.donate_link_text", { donate_url: "https://donate.openstreetmap.org" }); var terms = I18n.t("javascripts.map.terms", { terms_url: "https://wiki.osmfoundation.org/wiki/Terms_of_Use" }); + var cyclosm = I18n.t("javascripts.map.cyclosm", { cyclosm_url: "https://www.cyclosm.org", osmfrance_url: "https://openstreetmap.fr/" }); var thunderforest = I18n.t("javascripts.map.thunderforest", { thunderforest_url: "https://www.thunderforest.com/" }); var memomaps = I18n.t("javascripts.map.opnvkarte", { memomaps_url: "https://memomaps.de/" }); var hotosm = I18n.t("javascripts.map.hotosm", { hotosm_url: "https://www.hotosm.org/", osmfrance_url: "https://openstreetmap.fr/" }); @@ -31,6 +32,13 @@ L.OSM.Map = L.Map.extend({ name: I18n.t("javascripts.map.base.standard") })); + this.baseLayers.push(new L.OSM.CyclOSM({ + attribution: copyright + ". " + cyclosm + ". " + terms, + code: "Y", + keyid: "cyclosm", + name: I18n.t("javascripts.map.base.cyclosm") + })); + if (OSM.THUNDERFOREST_KEY) { this.baseLayers.push(new L.OSM.CycleMap({ attribution: copyright + ". " + thunderforest + ". " + terms, @@ -292,12 +300,17 @@ L.OSM.Map = L.Map.extend({ }, setSidebarOverlaid: function (overlaid) { + var sidebarWidth = 350; if (overlaid && !$("#content").hasClass("overlay-sidebar")) { $("#content").addClass("overlay-sidebar"); - this.invalidateSize({ pan: false }) - .panBy([-350, 0], { animate: false }); + this.invalidateSize({ pan: false }); + if ($("html").attr("dir") !== "rtl") { + this.panBy([-sidebarWidth, 0], { animate: false }); + } } else if (!overlaid && $("#content").hasClass("overlay-sidebar")) { - this.panBy([350, 0], { animate: false }); + if ($("html").attr("dir") !== "rtl") { + this.panBy([sidebarWidth, 0], { animate: false }); + } $("#content").removeClass("overlay-sidebar"); this.invalidateSize({ pan: false }); }