Osmwithspace/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 {AllKnownLayouts} from "../../../Customizations/AllKnownLayouts";
import {SubstitutedTranslation} from "../../../UI/SubstitutedTranslation";
import Translations from "../../../UI/i18n/Translations";
export interface DesugaringContext {
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() {
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.
* Note: this minimap can be hidden by conditions
*/
private static hasMinimap(renderingConfig: TagRenderingConfigJson): boolean {
const translations: Translation[] = Utils.NoNull([renderingConfig.render, ...(renderingConfig.mappings ?? []).map(m => m.then)]);
public static hasMinimap(renderingConfig: TagRenderingConfigJson): boolean {
const translations: any[] = Utils.NoNull([renderingConfig.render, ...(renderingConfig.mappings ?? []).map(m => m.then)])
.map(Translations.T);
for (const translation of translations) {
for (const key in translation.translations) {
if (!translation.translations.hasOwnProperty(key)) {