Skip to content

Fix layer resetting when overlay enabled #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
1ec5 wants to merge 3 commits into
base: staging
Choose a base branch
from
Open

Fix layer resetting when overlay enabled #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f97aee7
Don't remove-readd standard layer when layerParam is not empty in map…
AntonKhorev Jan 29, 2025
b21c9d1
Add map.getMapBaseLayer()
AntonKhorev Dec 9, 2024
8faa359
Fixed slippy map tests
1ec5 Jul 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions app/assets/javascripts/leaflet.map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,20 +116,19 @@ L.OSM.Map = L.Map.extend({
},

updateLayers: function (layerParam) {
var layers = layerParam || "O",
layersAdded = "";

for (let i = this.baseLayers.length - 1; i >= 0; i--) {
if (layers.indexOf(this.baseLayers[i].options.code) >= 0) {
this.addLayer(this.baseLayers[i]);
layersAdded = layersAdded + this.baseLayers[i].options.code;
} else if (i === 0 && layersAdded === "") {
this.addLayer(this.baseLayers[i]);
} else {
this.removeLayer(this.baseLayers[i]);
const oldBaseLayer = this.getMapBaseLayer();
let newBaseLayer;

for (const layer of this.baseLayers) {
if (!newBaseLayer || layerParam.includes(layer.options.code)) {
newBaseLayer = layer;
}
}

if (newBaseLayer !== oldBaseLayer) {
if (oldBaseLayer) this.removeLayer(oldBaseLayer);
if (newBaseLayer) this.addLayer(newBaseLayer);
}
},

getLayersCode: function () {
Expand All @@ -143,11 +142,8 @@ L.OSM.Map = L.Map.extend({
},

getMapBaseLayerId: function () {
var baseLayerId;
this.eachLayer(function (layer) {
if (layer.options && layer.options.keyid) baseLayerId = layer.options.keyid;
});
return baseLayerId;
const layer = this.getMapBaseLayer();
if (layer) return layer.options.layerId;
},

getMapBaseLayer: function () {
Expand Down
4 changes: 2 additions & 2 deletions test/javascripts/osm_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,15 +339,15 @@ describe("OSM", function () {
it("creates a location cookie value", function () {
$("body").append("<div id='map'>");
const map = new L.OSM.Map("map", { center: [57.6247, -3.6845], zoom: 9 });
map.updateLayers("");
map.updateLayers("M");
expect(OSM.locationCookie(map)).to.eq("-3.685|57.625|9|M");
$("#map").remove();
});

it("respects zoomPrecision", function () {
$("body").append("<div id='map'>");
const map = new L.OSM.Map("map", { center: [57.6247, -3.6845], zoom: 9 });
map.updateLayers("");
map.updateLayers("M");
expect(OSM.locationCookie(map)).to.eq("-3.685|57.625|9|M");
// map.setZoom() doesn't update the zoom level for some reason
// using map._zoom here to update the zoom level manually
Expand Down
Loading