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

Small improvements

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-09-07 00:23:00 +02:00
parent e889d1eff1
commit 780d353c8d
6 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Models/ThemeConfig/FilterConfig.ts
View file

@ -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};
});

4
Models/ThemeConfig/LayoutConfig.ts
View file

@ -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);
}