X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a796c41881c26e6da8828a71dbfb533613e5a83f..1f0884a34c078ae955c0466fbcdddadfab9dca33:/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 6c84bef55..14cddafce 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 = '';
@@ -236,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;
}
});
@@ -245,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, {