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

Chore: sort code, improve error messages

Browse source
This commit is contained in:
Pieter Vander Vennet 2025-04-08 02:55:32 +02:00
parent cfeabe4d22
commit 6ed31b9f10
2 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/UI/InputElement/Validators.ts
View file

@ -33,36 +33,35 @@ export type ValidatorType = (typeof Validators.availableTypes)[number]
export default class Validators { export default class Validators {
public static readonly availableTypes = [ public static readonly availableTypes = [
"string",
"text",
"date",
"nat",
"int",
"distance",
"direction",
"wikidata",
"pnat",
"float",
"pfloat",
"email",
"url",
"phone",
"opening_hours",
"color", "color",
"image",
"simple_tag",
"key",
"translation",
"icon",
"fediverse",
"tag",
"fediverse",
"id",
"slope",
"velopark",
"nsi",
"currency", "currency",
"date",
"direction",
"distance",
"email",
"fediverse",
"float",
"icon",
"id",
"image",
"int",
"key",
"nat",
"nsi",
"opening_hours",
"pfloat",
"phone",
"pnat",
"regex", "regex",
"simple_tag",
"slope",
"string",
"tag",
"text",
"translation",
"url",
"velopark",
"wikidata"
] as const ] as const
public static readonly AllValidators: ReadonlyArray<Validator> = [ public static readonly AllValidators: ReadonlyArray<Validator> = [
@ -94,7 +93,7 @@ export default class Validators {
new VeloparkValidator(), new VeloparkValidator(),
new NameSuggestionIndexValidator(), new NameSuggestionIndexValidator(),
new CurrencyValidator(), new CurrencyValidator(),
new RegexValidator(), new RegexValidator()
] ]
private static _byType = Validators._byTypeConstructor() private static _byType = Validators._byTypeConstructor()

4
src/UI/Popup/UnitInput.svelte
View file

@ -23,11 +23,11 @@
export let getCountry = () => "?" export let getCountry = () => "?"
onMount(() => { onMount(() => {
console.log("Setting selected unit based on country", getCountry(), upstreamValue.data) console.log("Setting selected unit based on country", getCountry(), "and upstream value:", upstreamValue.data)
if (upstreamValue.data === undefined || upstreamValue.data === "") { if (upstreamValue.data === undefined || upstreamValue.data === "") {
// Init the selected unit // Init the selected unit
let denomination: Denomination = unit.getDefaultDenomination(getCountry) let denomination: Denomination = unit.getDefaultDenomination(getCountry)
console.log("Found denom", denomination.canonical) console.log("Found denom", denomination.canonical, "available denominations are:", unit.denominations.map(denom => denom.canonical))
selectedUnit.setData(denomination.canonical) selectedUnit.setData(denomination.canonical)
} }
}) })