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

Natuurpunt tweaks

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-01-31 14:34:06 +01:00
parent 618f61d3e8
commit 5a9f26081c
55 changed files with 1516 additions and 1368 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Models/ThemeConfig/Conversion/Conversion.ts
View file

@ -10,10 +10,12 @@ export interface DesugaringContext {
export abstract class Conversion<TIn, TOut> {
public readonly modifiedAttributes: string[];
protected readonly doc: string;
constructor(doc: string, modifiedAttributes: string[] = []) {
public readonly name: string
constructor(doc: string, modifiedAttributes: string[] = [], name?: string) {
this.modifiedAttributes = modifiedAttributes;
this.doc = doc + "\n\nModified attributes are\n" + modifiedAttributes.join(", ");
this.name = name ?? this.constructor.name
}
public static strict<T>(fixed: { errors: string[], warnings: string[], result?: T }): T {
@ -83,7 +85,8 @@ export class OnEveryConcat<X, T> extends DesugaringStep<T> {
private readonly step: Conversion<X, X[]>;
constructor(key: string, step: Conversion<X, X[]>) {
super(`Applies ${step.constructor.name} onto every object of the list \`${key}\`. The results are concatenated and used as new list`, [key]);
super(`Applies ${step.constructor.name} onto every object of the list \`${key}\`. The results are concatenated and used as new list`, [key],
"OnEveryConcat("+step.name+")");
this.step = step;
this.key = key;
}
@ -128,7 +131,7 @@ export class Fuse<T> extends DesugaringStep<T> {
const warnings = []
for (let i = 0; i < this.steps.length; i++) {
const step = this.steps[i];
let r = step.convert(state, json, context + "(fusion " + this.constructor.name + "." + i + ")")
let r = step.convert(state, json, "While running step " +step.name + ": " + context)
errors.push(...r.errors)
warnings.push(...r.warnings)
json = r.result