mirror of
https://github.com/gpxstudio/gpx.studio.git
synced 2026-04-18 01:21:19 +00:00
Fix: overlays bikerouterGravel, cyclOSMlite, mapterhornHillshade, openRailwayMap cannot be toggled in Layer settings (#329)
This commit is contained in:
committed by
GitHub
parent
54b3113480
commit
40f97b7c35
@@ -162,19 +162,19 @@ function getLayerValidator(allowed: Record<string, any>, fallback: string) {
|
||||
|
||||
function filterLayerTree(t: LayerTreeType, allowed: LayerTreeType | undefined): LayerTreeType {
|
||||
const filtered: LayerTreeType = {};
|
||||
const values = Object.values(t);
|
||||
if (values.length == 0) return filtered;
|
||||
if (typeof values[0] === 'boolean') {
|
||||
if (allowed) {
|
||||
if (!allowed) return filtered;
|
||||
Object.keys(allowed).forEach((key) => {
|
||||
if (Object.hasOwn(t, key)) {
|
||||
filtered[key] = t[key];
|
||||
const allowedVal = allowed[key];
|
||||
if (typeof allowedVal === 'boolean') {
|
||||
filtered[key] = typeof t?.[key] === 'boolean' ? t[key] : allowedVal;
|
||||
} else {
|
||||
filtered[key] = allowed[key];
|
||||
filtered[key] = filterLayerTree(
|
||||
typeof t?.[key] === 'object' ? (t[key] as LayerTreeType) : {},
|
||||
allowedVal
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
Object.entries(t).forEach(([key, value]) => {
|
||||
Object.entries(t ?? {}).forEach(([key, value]) => {
|
||||
if (
|
||||
!Object.hasOwn(filtered, key) &&
|
||||
(key.startsWith('custom-') || key.startsWith('extension-'))
|
||||
@@ -182,18 +182,6 @@ function filterLayerTree(t: LayerTreeType, allowed: LayerTreeType | undefined):
|
||||
filtered[key] = value;
|
||||
}
|
||||
});
|
||||
} else {
|
||||
Object.entries(t).forEach(([key, value]) => {
|
||||
if (typeof value === 'object') {
|
||||
filtered[key] = filterLayerTree(
|
||||
value,
|
||||
typeof allowed === 'object' && typeof allowed[key] === 'object'
|
||||
? allowed[key]
|
||||
: undefined
|
||||
);
|
||||
}
|
||||
});
|
||||
}
|
||||
return filtered;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user