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

Refactoring: allow to reuse units, move all units into central file

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-12-12 03:46:51 +01:00
parent 067fb549c1
commit 94e07d5b13
30 changed files with 1495 additions and 1307 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,56 +1,67 @@
<script lang="ts">
import { Unit } from "../../Models/Unit"
import { Store, UIEventSource } from "../../Logic/UIEventSource"
import Tr from "../Base/Tr.svelte"
import { onDestroy } from "svelte"
import { Unit } from "../../Models/Unit";
import { Store, UIEventSource } from "../../Logic/UIEventSource";
import Tr from "../Base/Tr.svelte";
import { onDestroy, onMount } from "svelte";
import { Denomination } from "../../Models/Denomination";
export let unit: Unit
export let unit: Unit;
/**
* The current value of the input field
* Not necessarily a correct number
* Not necessarily a correct number, should not contain the denomination
*/
export let textValue: UIEventSource<string>
export let textValue: UIEventSource<string>;
/**
* The actual _valid_ value that is upstreamed
* The actual _valid_ value that is upstreamed, including the denomination
*/
export let upstreamValue: Store<string>
export let upstreamValue: Store<string>;
let isSingle: Store<boolean> = textValue.map((v) => Number(v) === 1)
let isSingle: Store<boolean> = textValue.map((v) => Number(v) === 1);
export let selectedUnit: UIEventSource<string> = new UIEventSource<string>(undefined)
export let getCountry = () => "be"
console.log("Unit", unit)
export let selectedUnit: UIEventSource<string> = new UIEventSource<string>(undefined);
export let getCountry = () => "?";
onMount(() => {
console.log("Setting selected unit based on country", getCountry(), upstreamValue.data)
if(upstreamValue.data === undefined || upstreamValue.data === ""){
// Init the selected unit
let denomination: Denomination = unit.getDefaultDenomination(getCountry);
console.log("Found denom", denomination.canonical)
selectedUnit.setData(denomination.canonical)
}
})
onDestroy(
upstreamValue.addCallbackAndRun((v) => {
if (v === undefined) {
if (!selectedUnit.data) {
selectedUnit.setData(unit.getDefaultDenomination(getCountry).canonical)
}
if(v === undefined || v === ""){
return
}
const selected = unit.findDenomination(v, getCountry)
if (selected === undefined) {
selectedUnit.setData(unit.getDefaultDenomination(getCountry).canonical)
return
let denomination: Denomination = unit.getDefaultDenomination(getCountry);
const selected = unit.findDenomination(v, getCountry);
if(selected){
denomination = selected[1];
}
const [value, denomination] = selected
selectedUnit.setData(denomination.canonical)
return
selectedUnit.setData(denomination.canonical);
})
)
);
onDestroy(
textValue.addCallbackAndRunD((v) => {
// Fallback in case that the user manually types a denomination
const [value, denomination] = unit.findDenomination(v, getCountry)
const [value, denomination] = unit.findDenomination(v, getCountry);
if (value === undefined || denomination === undefined) {
return
return;
}
textValue.setData(value)
selectedUnit.setData(denomination.canonical)
if(value === v){
// The input value actually didn't have a denomination typed out - so lets ignore this one
// If a denomination is given, it is the default value anyway
return;
}
textValue.setData(value);
selectedUnit.setData(denomination.canonical);
})
)
);
</script>
<select bind:value={$selectedUnit}>
@ -59,7 +70,7 @@
{#if $isSingle}
<Tr t={denom.humanSingular} />
{:else}
<Tr t={denom.human} />
<Tr t={denom.human.Subs({quantity: ""})} />
{/if}
</option>
{/each}