diff --git a/Models/ThemeConfig/Conversion/Conversion.ts b/Models/ThemeConfig/Conversion/Conversion.ts index 051f00465..6d93c0158 100644 --- a/Models/ThemeConfig/Conversion/Conversion.ts +++ b/Models/ThemeConfig/Conversion/Conversion.ts @@ -23,7 +23,7 @@ export abstract class Conversion { throw fixed.errors.join("\n\n"); } fixed.information?.forEach(i => console.log(" ", i)) - const yellow = (s) => "\x1b[33m"+s+"\x1b[0m" + const yellow = (s) => "\x1b[33m"+s+"\x1b[0m" const red = s => '\x1b[31m'+s+'\x1b[0m' fixed.warnings?.forEach(w => console.warn(red(` `), yellow (w))) diff --git a/Models/ThemeConfig/Conversion/PrepareTheme.ts b/Models/ThemeConfig/Conversion/PrepareTheme.ts index d3fb21519..eb0337ad8 100644 --- a/Models/ThemeConfig/Conversion/PrepareTheme.ts +++ b/Models/ThemeConfig/Conversion/PrepareTheme.ts @@ -141,24 +141,6 @@ class AddDefaultLayers extends DesugaringStep { json.layers = [...json.layers] const alreadyLoaded = new Set(json.layers.map(l => l["id"])) - if (json.id === "personal") { - json.layers = [] - for (const publicLayer of AllKnownLayouts.AllPublicLayers()) { - const id = publicLayer.id - const config = state.sharedLayers.get(id) - if (Constants.added_by_default.indexOf(id) >= 0) { - continue; - } - if (config === undefined) { - // This is a layer which is coded within a public theme, not as separate .json - continue - } - json.layers.push(config) - } - const publicIds = AllKnownLayouts.AllPublicLayers().map(l => l.id) - publicIds.map(id => state.sharedLayers.get(id)) - } - for (const layerName of Constants.added_by_default) { const v = state.sharedLayers.get(layerName) if (v === undefined) { @@ -306,7 +288,7 @@ class ApplyOverrideAll extends DesugaringStep { delete json.overrideAll const newLayers = [] for (let layer of json.layers) { - layer = {...layer} + layer = Utils.Clone(layer) Utils.Merge(overrideAll, layer) newLayers.push(layer) } @@ -419,7 +401,6 @@ class PreparePersonalTheme extends DesugaringStep { } json.layers = Array.from(this._state.sharedLayers.keys()).filter(l => Constants.priviliged_layers.indexOf(l) < 0) - return {result: json}; } diff --git a/assets/themes/personal/personal.json b/assets/themes/personal/personal.json index c9e7d8d57..b04c44eec 100644 --- a/assets/themes/personal/personal.json +++ b/assets/themes/personal/personal.json @@ -37,10 +37,10 @@ "startLon": 0, "startZoom": 0, "widenFactor": 1.2, - "#note": "The 'overpassMaxZoom' should be exactly the same as or less then the overrideAll", + "#note": "The 'overpassMaxZoom' should be exactly the same as or less then the minzzom in overrideAll", "overpassMaxZoom": 15, "overrideAll": { - "minZoom": 16, + "minzoom": 17, "syncSelection": "theme", "shownByDefault": false }, diff --git a/langs/themes/en.json b/langs/themes/en.json index 25ec3c0da..5997286d9 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -752,7 +752,7 @@ }, "6": { "override": { - "=name": "Healtch and social places without etymology information" + "=name": "Health and social places without etymology information" } }, "7": {