elgaard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Workaround for upstream issue: always use 'opening_hours' as using ome keys crashes the OH-parser

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-11-02 17:47:21 +01:00
parent 23ae9d39c8
commit 1db54f3c8e
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
UI/OpeningHours/OpeningHoursVisualization.ts
View file

@ -28,12 +28,18 @@ export default class OpeningHoursVisualization extends Toggle {
const ohTable = new VariableUiElement(tags const ohTable = new VariableUiElement(tags
.map(tags => { .map(tags => {
const value: string = tags[key]; const value: string = tags[key];
if (value === undefined) {
return undefined
}
if (value.startsWith(prefix) && value.endsWith(postfix)) { if (value.startsWith(prefix) && value.endsWith(postfix)) {
return value.substring(prefix.length, value.length - postfix.length) return value.substring(prefix.length, value.length - postfix.length).trim()
} }
return value; return value;
}) // This mapping will absorb all other changes to tags in order to prevent regeneration }) // This mapping will absorb all other changes to tags in order to prevent regeneration
.map(ohtext => { .map(ohtext => {
if (ohtext === undefined) {
return new FixedUiElement("No opening hours defined with key " + key).SetClass("alert")
}
try { try {
// noinspection JSPotentiallyInvalidConstructorUsage // noinspection JSPotentiallyInvalidConstructorUsage
const oh = new opening_hours(ohtext, { const oh = new opening_hours(ohtext, {
@ -41,12 +47,12 @@ export default class OpeningHoursVisualization extends Toggle {
lon: tagsDirect._lon, lon: tagsDirect._lon,
address: { address: {
country_code: tagsDirect._country country_code: tagsDirect._country
} },
}, {tag_key: key}); }, {tag_key: "opening_hours"});
return OpeningHoursVisualization.CreateFullVisualisation(oh) return OpeningHoursVisualization.CreateFullVisualisation(oh)
} catch (e) { } catch (e) {
console.log(e); console.warn(e, e.stack);
return new Combine([Translations.t.general.opening_hours.error_loading, return new Combine([Translations.t.general.opening_hours.error_loading,
new Toggle( new Toggle(
new FixedUiElement(e).SetClass("subtle"), new FixedUiElement(e).SetClass("subtle"),