Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix broken minimap detection

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-01-21 02:15:53 +01:00
parent 9148775c9a
commit 65dbcb4f12
2 changed files with 57 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Models/ThemeConfig/Conversion/LegacyJsonConvert.ts
View file

@ -10,6 +10,7 @@ import {LayerConfigJson} from "../Json/LayerConfigJson";
import Constants from "../../Constants"; import Constants from "../../Constants";
import {AllKnownLayouts} from "../../../Customizations/AllKnownLayouts"; import {AllKnownLayouts} from "../../../Customizations/AllKnownLayouts";
import {SubstitutedTranslation} from "../../../UI/SubstitutedTranslation"; import {SubstitutedTranslation} from "../../../UI/SubstitutedTranslation";
import Translations from "../../../UI/i18n/Translations";
export interface DesugaringContext { export interface DesugaringContext {
tagRenderings: Map<string, TagRenderingConfigJson> tagRenderings: Map<string, TagRenderingConfigJson>
@ -154,7 +155,7 @@ class Fuse<T> extends DesugaringStep<T> {
} }
class AddMiniMap extends DesugaringStep<LayerConfigJson> { export class AddMiniMap extends DesugaringStep<LayerConfigJson> {
constructor() { constructor() {
super("Adds a default 'minimap'-element to the tagrenderings if none of the elements define such a minimap", ["tagRenderings"]); super("Adds a default 'minimap'-element to the tagrenderings if none of the elements define such a minimap", ["tagRenderings"]);
} }
@ -163,8 +164,10 @@ class AddMiniMap extends DesugaringStep<LayerConfigJson> {
* Returns true if this tag rendering has a minimap in some language. * Returns true if this tag rendering has a minimap in some language.
* Note: this minimap can be hidden by conditions * Note: this minimap can be hidden by conditions
*/ */
private static hasMinimap(renderingConfig: TagRenderingConfigJson): boolean { public static hasMinimap(renderingConfig: TagRenderingConfigJson): boolean {
const translations: Translation[] = Utils.NoNull([renderingConfig.render, ...(renderingConfig.mappings ?? []).map(m => m.then)]); const translations: any[] = Utils.NoNull([renderingConfig.render, ...(renderingConfig.mappings ?? []).map(m => m.then)])
.map(Translations.T);
for (const translation of translations) { for (const translation of translations) {
for (const key in translation.translations) { for (const key in translation.translations) {
if (!translation.translations.hasOwnProperty(key)) { if (!translation.translations.hasOwnProperty(key)) {

54
test/LegacyThemeLoader.spec.ts
View file

@ -1,5 +1,5 @@
import T from "./TestHelper"; import T from "./TestHelper";
import {FixLegacyTheme} from "../Models/ThemeConfig/Conversion/LegacyJsonConvert"; import {AddMiniMap, FixLegacyTheme} from "../Models/ThemeConfig/Conversion/LegacyJsonConvert";
import LayoutConfig from "../Models/ThemeConfig/LayoutConfig"; import LayoutConfig from "../Models/ThemeConfig/LayoutConfig";
import {LayerConfigJson} from "../Models/ThemeConfig/Json/LayerConfigJson"; import {LayerConfigJson} from "../Models/ThemeConfig/Json/LayerConfigJson";
import {TagRenderingConfigJson} from "../Models/ThemeConfig/Json/TagRenderingConfigJson"; import {TagRenderingConfigJson} from "../Models/ThemeConfig/Json/TagRenderingConfigJson";
@ -146,14 +146,62 @@ export default class LegacyThemeLoaderSpec extends T {
["Walking_node_theme", () => { ["Walking_node_theme", () => {
const config = LegacyThemeLoaderSpec.walking_node_theme const config = LegacyThemeLoaderSpec.walking_node_theme
const fixed = new FixLegacyTheme().convert({tagRenderings: new Map<string, TagRenderingConfigJson>(), sharedLayers: new Map<string, LayerConfigJson>()}, const fixed = new FixLegacyTheme().convert({
tagRenderings: new Map<string, TagRenderingConfigJson>(),
sharedLayers: new Map<string, LayerConfigJson>()
},
// @ts-ignore // @ts-ignore
config, config,
"While testing") "While testing")
T.isTrue(fixed.errors.length === 0, "Could not fix the legacy theme") T.isTrue(fixed.errors.length === 0, "Could not fix the legacy theme")
const theme = new LayoutConfig(fixed.result) const theme = new LayoutConfig(fixed.result)
}] }],
["Detect minimaps", () => {
function shouldHave(config: TagRenderingConfigJson) {
T.equals(AddMiniMap.hasMinimap(config), true, "Did _not_ dected a minimap, even though there is one in " + JSON.stringify(config))
}
function shouldNot(config: TagRenderingConfigJson) {
T.equals(AddMiniMap.hasMinimap(config), false, "Did erronously dected a minimap, even though there is none in " + JSON.stringify(config))
}
shouldHave({
render: "{minimap()}"
});
shouldHave({
render: {en:"{minimap()}"}
});
shouldHave({
render: {en:"{minimap()}",nl:"{minimap()}"}
});
shouldHave({
render: {en:"{minimap()}",nl:"No map for the dutch!"}
});
shouldHave({
render: "{minimap()}"
})
shouldHave({
render: "{minimap(18,featurelist)}"
})
shouldHave({
mappings: [
{
if: "xyz=abc",
then: "{minimap(18,featurelist)}"
}
]
})
shouldNot({
render: "Some random value {key}"
})
shouldNot({
render: "Some random value {minimap}"
})
}
]
] ]
); );
} }