diff --git a/Logic/Actors/OverpassFeatureSource.ts b/Logic/Actors/OverpassFeatureSource.ts index 710086da9..adba84b8e 100644 --- a/Logic/Actors/OverpassFeatureSource.ts +++ b/Logic/Actors/OverpassFeatureSource.ts @@ -148,7 +148,6 @@ export default class OverpassFeatureSource implements FeatureSource { const bounds = this._leafletMap.data?.getBounds(); if(bounds === undefined){ - console.log("Leaflet map not yet initialized; retrying later") return; } @@ -189,7 +188,6 @@ export default class OverpassFeatureSource implements FeatureSource { function countDown() { window?.setTimeout( function () { - console.log("Countdown: ", self.timeout.data) if (self.timeout.data > 1) { self.timeout.setData(self.timeout.data - 1); window.setTimeout( diff --git a/Models/Constants.ts b/Models/Constants.ts index 65a1da5f8..7d3620d3d 100644 --- a/Models/Constants.ts +++ b/Models/Constants.ts @@ -2,7 +2,7 @@ import { Utils } from "../Utils"; export default class Constants { - public static vNumber = "0.9.4"; + public static vNumber = "0.9.5"; // The user journey states thresholds when a new feature gets unlocked public static userJourney = { diff --git a/Models/ThemeConfig/FilterConfig.ts b/Models/ThemeConfig/FilterConfig.ts index d5992d370..9ecda1aec 100644 --- a/Models/ThemeConfig/FilterConfig.ts +++ b/Models/ThemeConfig/FilterConfig.ts @@ -18,6 +18,7 @@ export default class FilterConfig { if(json.options.map === undefined){ throw `A filter was given where the options aren't a list at ${context}` } + this.options = json.options.map((option, i) => { const question = Translations.T( option.question, @@ -27,6 +28,9 @@ export default class FilterConfig { option.osmTags ?? {and: []}, `${context}.options-[${i}].osmTags` ); + if(question === undefined){ + throw `Invalid filter: no question given at ${context}[${i}]` + } return {question: question, osmTags: osmTags}; }); diff --git a/Models/ThemeConfig/LayoutConfig.ts b/Models/ThemeConfig/LayoutConfig.ts index 65b9cdade..a11c46f95 100644 --- a/Models/ThemeConfig/LayoutConfig.ts +++ b/Models/ThemeConfig/LayoutConfig.ts @@ -7,6 +7,7 @@ import {Utils} from "../../Utils"; import LayerConfig from "./LayerConfig"; import {Unit} from "../Unit"; import {Denomination} from "../Denomination"; +import {LayerConfigJson} from "./Json/LayerConfigJson"; export default class LayoutConfig { public readonly id: string; @@ -208,8 +209,7 @@ export default class LayoutConfig { if (shared === undefined) { throw `Unknown shared/builtin layer ${name} at ${context}.layers[${i}]. Available layers are ${Array.from(AllKnownLayers.sharedLayersJson.keys()).join(", ")}`; } - // @ts-ignore - let newLayer: LayerConfigJson = Utils.Merge(layer.override, JSON.parse(JSON.stringify(shared))); // We make a deep copy of the shared layer, in order to protect it from changes + let newLayer: LayerConfigJson = Utils.Merge(layer["override"], JSON.parse(JSON.stringify(shared))); // We make a deep copy of the shared layer, in order to protect it from changes if (json.overrideAll !== undefined) { newLayer = Utils.Merge(json.overrideAll, newLayer); } diff --git a/UI/OpeningHours/OpeningHoursPickerTable.ts b/UI/OpeningHours/OpeningHoursPickerTable.ts index f9a430ce3..1e6067bdc 100644 --- a/UI/OpeningHours/OpeningHoursPickerTable.ts +++ b/UI/OpeningHours/OpeningHoursPickerTable.ts @@ -180,7 +180,6 @@ export default class OpeningHoursPickerTable extends InputElement oh.endMinutes = 0; } self.source.data.push(oh); - console.log("Created ", oh) } self.source.ping(); diff --git a/Utils.ts b/Utils.ts index 9b0d04b7f..a4e4fae2d 100644 --- a/Utils.ts +++ b/Utils.ts @@ -221,9 +221,7 @@ export class Utils { const sourceV = source[key]; const targetV = target[key] - if (sourceV?.length !== undefined && targetV?.length !== undefined && key.startsWith("+")) { - target[key] = targetV.concat(sourceV) - } else if (typeof sourceV === "object") { + if (typeof sourceV === "object") { if (sourceV === null) { target[key] = null } else if (targetV === undefined) {