Bastian-Greshake-Tzovaras/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Improvements to the climbing theme

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-04-06 19:16:55 +02:00
parent a9aff5e16e
commit 5a94e9d239
6 changed files with 65 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Models/Denomination.ts
View file

@ -73,12 +73,25 @@ export class Denomination {
* en: "meter"
* }
* }, "test")
* unit.canonicalValue("42m") // =>"42 m"
* unit.canonicalValue("42m") // =>"42 m"
* unit.canonicalValue("42") // =>"42 m"
* unit.canonicalValue("42 m") // =>"42 m"
* unit.canonicalValue("42 meter") // =>"42 m"
*
*
* // Should be trimmed if canonical is empty
* const unit = new Denomination({
* canonicalDenomination: "",
* alternativeDenomination: ["meter","m],
* 'default': true,
* human: {
* en: "meter"
* }
* }, "test")
* unit.canonicalValue("42m") // =>"42"
* unit.canonicalValue("42") // =>"42"
* unit.canonicalValue("42 m") // =>"42"
* unit.canonicalValue("42 meter") // =>"42"
*/
public canonicalValue(value: string, actAsDefault?: boolean) : string {
if (value === undefined) {
@ -89,9 +102,9 @@ export class Denomination {
return null;
}
if (stripped === "1" && this._canonicalSingular !== undefined) {
return "1 " + this._canonicalSingular
return ("1 " + this._canonicalSingular).trim()
}
return stripped + " " + this.canonical;
return (stripped + " " + this.canonical).trim();
}
/**