midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add erase all option, formatting

Browse source
This commit is contained in:
pietervdvn 2021-06-22 12:13:44 +02:00
parent 8b2aff0244
commit 62244c02c4
5 changed files with 50 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
Customizations/JSON/Denomination.ts
View file

@ -6,54 +6,57 @@ import Combine from "../../UI/Base/Combine";
export class Unit { export class Unit {
public readonly appliesToKeys: Set<string>; public readonly appliesToKeys: Set<string>;
public readonly denominations : Denomination[]; public readonly denominations: Denomination[];
public readonly defaultDenom: Denomination; public readonly defaultDenom: Denomination;
constructor(appliesToKeys: string[], applicableUnits: Denomination[]) { public readonly eraseInvalid : boolean;
this.appliesToKeys = new Set( appliesToKeys);
constructor(appliesToKeys: string[], applicableUnits: Denomination[], eraseInvalid: boolean) {
this.appliesToKeys = new Set(appliesToKeys);
this.denominations = applicableUnits; this.denominations = applicableUnits;
this.defaultDenom = applicableUnits.filter(denom => denom.default)[0] this.defaultDenom = applicableUnits.filter(denom => denom.default)[0]
this.eraseInvalid = eraseInvalid
} }
isApplicableToKey(key: string | undefined) : boolean { isApplicableToKey(key: string | undefined): boolean {
if(key === undefined){ if (key === undefined) {
return false; return false;
} }
return this.appliesToKeys.has(key); return this.appliesToKeys.has(key);
} }
/** /**
* Finds which denomination is applicable and gives the stripped value back * Finds which denomination is applicable and gives the stripped value back
*/ */
findDenomination(valueWithDenom: string) : [string, Denomination] { findDenomination(valueWithDenom: string): [string, Denomination] {
for (const denomination of this.denominations) { for (const denomination of this.denominations) {
const bare = denomination.StrippedValue(valueWithDenom) const bare = denomination.StrippedValue(valueWithDenom)
if(bare !== null){ if (bare !== null) {
return [bare, denomination] return [bare, denomination]
} }
} }
return [undefined, undefined] return [undefined, undefined]
} }
asHumanLongValue(value: string): BaseUIElement { asHumanLongValue(value: string): BaseUIElement {
if(value === undefined){ if (value === undefined) {
return undefined; return undefined;
} }
const [stripped, denom] = this.findDenomination(value) const [stripped, denom] = this.findDenomination(value)
const human = denom.human const human = denom.human
const elems = denom.prefix ? [human, stripped] : [stripped , human]; const elems = denom.prefix ? [human, stripped] : [stripped, human];
return new Combine(elems) return new Combine(elems)
} }
} }
export class Denomination { export class Denomination {
private readonly _human: Translation;
private readonly alternativeDenominations: string [];
public readonly canonical: string; public readonly canonical: string;
readonly default: boolean; readonly default: boolean;
readonly prefix: boolean; readonly prefix: boolean;
private readonly _human: Translation;
private readonly alternativeDenominations: string [];
constructor(json: UnitConfigJson, context: string) { constructor(json: UnitConfigJson, context: string) {
context = `${context}.unit(${json.canonicalDenomination})` context = `${context}.unit(${json.canonicalDenomination})`
@ -77,13 +80,13 @@ export class Denomination {
this.prefix = json.prefix ?? false; this.prefix = json.prefix ?? false;
} }
get human() : Translation { get human(): Translation {
return this._human.Clone() return this._human.Clone()
} }
public canonicalValue(value: string, actAsDefault?: boolean) { public canonicalValue(value: string, actAsDefault?: boolean) {
if(value === undefined){ if (value === undefined) {
return undefined; return undefined;
} }
const stripped = this.StrippedValue(value, actAsDefault) const stripped = this.StrippedValue(value, actAsDefault)
@ -102,10 +105,10 @@ export class Denomination {
*/ */
public StrippedValue(value: string, actAsDefault?: boolean): string { public StrippedValue(value: string, actAsDefault?: boolean): string {
if(value === undefined){ if (value === undefined) {
return undefined; return undefined;
} }
if (this.prefix) { if (this.prefix) {
if (value.startsWith(this.canonical)) { if (value.startsWith(this.canonical)) {
return value.substring(this.canonical.length).trim(); return value.substring(this.canonical.length).trim();

6
Customizations/JSON/LayoutConfig.ts
View file

@ -99,7 +99,7 @@ export default class LayoutConfig {
if (AllKnownLayers.sharedLayersJson[layer] !== undefined) { if (AllKnownLayers.sharedLayersJson[layer] !== undefined) {
if (json.overrideAll !== undefined) { if (json.overrideAll !== undefined) {
let lyr = JSON.parse(JSON.stringify(AllKnownLayers.sharedLayersJson[layer])); let lyr = JSON.parse(JSON.stringify(AllKnownLayers.sharedLayersJson[layer]));
return new LayerConfig(Utils.Merge(json.overrideAll, lyr), this.units,`${this.id}+overrideAll.layers[${i}]`, official); return new LayerConfig(Utils.Merge(json.overrideAll, lyr), this.units, `${this.id}+overrideAll.layers[${i}]`, official);
} else { } else {
return AllKnownLayers.sharedLayers[layer] return AllKnownLayers.sharedLayers[layer]
} }
@ -190,7 +190,7 @@ export default class LayoutConfig {
} }
private static ExtractUnits(json: LayoutConfigJson, context: string) : Unit[]{ private static ExtractUnits(json: LayoutConfigJson, context: string): Unit[] {
const result: Unit[] = [] const result: Unit[] = []
if ((json.units ?? []).length !== 0) { if ((json.units ?? []).length !== 0) {
for (let i1 = 0; i1 < json.units.length; i1++) { for (let i1 = 0; i1 < json.units.length; i1++) {
@ -220,7 +220,7 @@ export default class LayoutConfig {
throw `Multiple units are set as default: they have canonical values of ${defaultSet.map(u => u.canonicalDenomination).join(", ")}` throw `Multiple units are set as default: they have canonical values of ${defaultSet.map(u => u.canonicalDenomination).join(", ")}`
} }
const applicable = unit.applicableUnits.map((u, i) => new Denomination(u, `${context}.units[${i}]`)) const applicable = unit.applicableUnits.map((u, i) => new Denomination(u, `${context}.units[${i}]`))
result.push(new Unit( appliesTo, applicable)); result.push(new Unit(appliesTo, applicable, unit.eraseInvalidValues ?? false));
} }
const seenKeys = new Set<string>() const seenKeys = new Set<string>()

8
Customizations/JSON/LayoutConfigJson.ts
View file

@ -249,7 +249,15 @@ export interface LayoutConfigJson {
*/ */
appliesToKey: string[], appliesToKey: string[],
/**
* The possible denominations
*/
applicableUnits: UnitConfigJson[] applicableUnits: UnitConfigJson[]
/**
* If set, invalid values will be erased in the MC application (but not in OSM of course!)
* Be careful with setting this
*/
eraseInvalidValues?: boolean;
}[] }[]
/** /**

18
Logic/FeatureSource/FeaturePipeline.ts
View file

@ -77,16 +77,14 @@ export default class FeaturePipeline implements FeatureSource {
]); ]);
merged.features.syncWith(allLoadedFeatures) merged.features.syncWith(allLoadedFeatures)
const source = this.features = new WayHandlingApplyingFeatureSource(flayers,
new WayHandlingApplyingFeatureSource(flayers, new FilteringFeatureSource(
new FilteringFeatureSource( flayers,
flayers, locationControl,
locationControl, selectedElement,
selectedElement, merged
merged )).features;
));
this.features = source.features;
} }
} }

7
Logic/SimpleMetaTagger.ts
View file

@ -94,9 +94,14 @@ export default class SimpleMetaTagger {
} }
const value = feature.properties[key] const value = feature.properties[key]
const [, denomination] = unit.findDenomination(value) const [, denomination] = unit.findDenomination(value)
const canonical = denomination.canonicalValue(value) let canonical = denomination.canonicalValue(value) ?? undefined;
console.log("Rewritten ", key, " from", value, "into", canonical) console.log("Rewritten ", key, " from", value, "into", canonical)
if(canonical === undefined && !unit.eraseInvalid) {
break;
}
feature.properties[key] = canonical; feature.properties[key] = canonical;
break;
} }
} }