Skip to content
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

Jump to bottom

On change of map layer, save new layer to local storage #4165

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

On change of map layer, save new layer to local storage #4165

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97c8ad6
On change of map provider/layer save change to local storage
ddrury Jan 18, 2022
ed4e614
Simplify code & track upstream
ddrury Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 13 additions & 5 deletions resources/js/webtrees.js
View file
Open in desktop
Expand Up @@ -652,27 +652,33 @@
},
});

const preferredLayer = localStorage.getItem('map_default_layer');
let defaultLayer = null;

for (let [, provider] of Object.entries(config.mapProviders)) {
for (let [, child] of Object.entries(provider.children)) {
child.name = provider.label + '-' + child.label;

if ('bingMapsKey' in child) {
child.layer = L.tileLayer.bing(child);
} else {
child.layer = L.tileLayer(child.url, child);
}
if (provider.default && child.default) {

if (defaultLayer === null && provider.default && child.default) {
defaultLayer = child.layer;
}
if (preferredLayer === child.name) {
defaultLayer = child.layer;
}
}
}

if (defaultLayer === null) {
console.log('No default map layer defined - using the first one.');
let defaultLayer = config.mapProviders[0].children[0].layer;
defaultLayer = config.mapProviders[0].children[0].layer;
}


// Create the map with all controls and layers
return L.map(id, {
zoomControl: false,
Expand All @@ -683,8 +689,10 @@
.addControl(L.control.layers.tree(config.mapProviders, null, {
closedSymbol: config.icons.expand,
openedSymbol: config.icons.collapse,
}));

}))
.on('baselayerchange', (l) => {
localStorage.setItem('map_default_layer', l.layer.options.name);
});
};

/**
Expand Down