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

Refactoring: port unit picker

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-06-11 01:32:30 +02:00
parent 622df2df19
commit 2b05d79dbb
8 changed files with 188 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Models/Denomination.ts
View file

@ -23,7 +23,7 @@ export class Denomination {
}
this._canonicalSingular = json.canonicalDenominationSingular?.trim()
json.alternativeDenomination.forEach((v, i) => {
json.alternativeDenomination?.forEach((v, i) => {
if ((v?.trim() ?? "") === "") {
throw `${context}.alternativeDenomination.${i}: invalid alternative denomination: undefined, null or only whitespace`
}
@ -51,12 +51,6 @@ export class Denomination {
return (this._humanSingular ?? this._human).Clone()
}
getToggledHuman(isSingular: Store<boolean>): BaseUIElement {
if (this._humanSingular === undefined) {
return this.human
}
return new Toggle(this.humanSingular, this.human, isSingular)
}
/**
* Create a representation of the given value
@ -165,7 +159,7 @@ export class Denomination {
return null
}
isDefaultUnit(country: () => string) {
isDefaultDenomination(country: () => string) {
if (this.useIfNoUnitGiven === true) {
return true
}

2
Models/Unit.ts
View file

@ -199,7 +199,7 @@ export class Unit {
) {
continue
}
let countries: string | string[] = country()
let countries: string | string[] = country() ?? []
if (typeof countries === "string") {
countries = countries.split(",")
}