From 31669d8aac858758845d6be396638f34e2bfb963 Mon Sep 17 00:00:00 2001 From: evlist Date: Fri, 10 Feb 2023 06:35:10 +0100 Subject: [PATCH] Adapting the address fetcher for rtes. --- .../DisplayOrGetAddress.tsx | 27 +++++--------- .../DisplayOrGetStartEndAddresses.tsx | 36 +++++++++++++++++++ .../display-or-get-address/index.ts | 1 + src/components/rte/RteViewer.tsx | 20 ++++------- src/db/rte.ts | 3 +- src/db/rtept.test.ts | 10 +++--- src/db/rtept.ts | 12 +++---- src/workers/dispatcher-worker.ts | 2 ++ 8 files changed, 67 insertions(+), 44 deletions(-) create mode 100644 src/components/display-or-get-address/DisplayOrGetStartEndAddresses.tsx diff --git a/src/components/display-or-get-address/DisplayOrGetAddress.tsx b/src/components/display-or-get-address/DisplayOrGetAddress.tsx index f7eec7f..a5b1b2f 100644 --- a/src/components/display-or-get-address/DisplayOrGetAddress.tsx +++ b/src/components/display-or-get-address/DisplayOrGetAddress.tsx @@ -8,43 +8,34 @@ import { useI18n } from '@solid-primitives/i18n'; import dispatch from '../../workers/dispatcher-main'; interface Props { - target: () => any; - putAction: string; - putParamName: string; + wpt: () => Wpt; + dispatchParams: (wpt: Wpt) => { action: string; params: any }; } -const DisplayOrGetAddress: Component = ({ - target, - putAction, - putParamName, -}) => { +const DisplayOrGetAddress: Component = ({ wpt, dispatchParams }) => { const [t, { add, locale, dict }] = useI18n(); const findClickHandler = async () => { - const address = await findAddress(target().$.lon, target().$.lat, locale); - const updatedTarget = cloneDeep(target()); + console.log({ caller: 'findClickHandler', wpt: wpt() }); + const address = await findAddress(wpt().$.lon, wpt().$.lat, locale); + const updatedTarget = cloneDeep(wpt()); if (updatedTarget.extensions === undefined) { updatedTarget.extensions = {}; } updatedTarget.extensions.address = address; - const params: any = { id: target().id }; - params[putParamName] = updatedTarget; - dispatch({ - action: putAction, - params, - }); + dispatch(dispatchParams(updatedTarget)); }; return ( } > - <>{getVillageOrTown(target().extensions?.address)} + <>{getVillageOrTown(wpt()?.extensions?.address)} ); }; diff --git a/src/components/display-or-get-address/DisplayOrGetStartEndAddresses.tsx b/src/components/display-or-get-address/DisplayOrGetStartEndAddresses.tsx new file mode 100644 index 0000000..318cb68 --- /dev/null +++ b/src/components/display-or-get-address/DisplayOrGetStartEndAddresses.tsx @@ -0,0 +1,36 @@ +import { Component } from 'solid-js'; +import { useI18n } from '@solid-primitives/i18n'; +import DisplayOrGetAddress from '.'; + +interface Props { + id: string; + wpts: () => Wpt[]; + putAction: string; +} + +const DisplayOrGetStartEndAddresses: Component = (props) => { + const { id, wpts, putAction } = props; + const [t, { add, locale, dict }] = useI18n(); + + const dispatchParamsFactory = (index: number) => (wpt: Wpt) => ({ + action: putAction, + params: { id, index, wpt }, + }); + + return ( + <> + {t('from')}{' '} + wpts()?.at(0)} + dispatchParams={dispatchParamsFactory(0)} + />{' '} + {t('to')}{' '} + wpts()?.at(-1)} + dispatchParams={dispatchParamsFactory(-1)} + /> + + ); +}; + +export default DisplayOrGetStartEndAddresses; diff --git a/src/components/display-or-get-address/index.ts b/src/components/display-or-get-address/index.ts index bd61935..e5f48a1 100644 --- a/src/components/display-or-get-address/index.ts +++ b/src/components/display-or-get-address/index.ts @@ -1 +1,2 @@ export { default } from './DisplayOrGetAddress'; +export { default as DisplayOrGetStartEndAddresses } from './DisplayOrGetStartEndAddresses'; diff --git a/src/components/rte/RteViewer.tsx b/src/components/rte/RteViewer.tsx index 962c98e..7c302e7 100644 --- a/src/components/rte/RteViewer.tsx +++ b/src/components/rte/RteViewer.tsx @@ -7,7 +7,9 @@ import DeleteIcon from '@suid/icons-material/Delete'; import QuestionMarkIcon from '@suid/icons-material/QuestionMark'; import Tree from '../tree'; import { LineString } from 'ol/geom'; -import DisplayOrGetAddress from '../display-or-get-address'; +import DisplayOrGetAddress, { + DisplayOrGetStartEndAddresses, +} from '../display-or-get-address'; import { getFormatedLength } from '../../lib/ol'; import Alert from '../alert'; import dispatch from '../../workers/dispatcher-main'; @@ -73,19 +75,11 @@ const RteViewer: Component = ({ rteId }) => { content={ <>
- {getFormatedLength(lineString)} {t('from')}{' '} - - rte().rtept.at(0)} - putAction='putRtept' - putParamName='rtept' - />{' '} - - {t('to')}{' '} - rte().rtept.at(-1)} + {getFormatedLength(lineString)} + rte().rtept} putAction='putRtept' - putParamName='rtept' />
diff --git a/src/db/rte.ts b/src/db/rte.ts index 68fa9ce..927d8b1 100644 --- a/src/db/rte.ts +++ b/src/db/rte.ts @@ -74,7 +74,6 @@ export const getRteDocs: ({ }) => Promise<{ docs: any; rte: Rte }> = async (params) => { const { id } = params; const docs = await getFamily(id, { include_docs: true }); - console.log({ caller: 'getRteDocs', id, docs }); let rte: Rte; if (docs.rows.length === 1) { rte = docs.rows[0].doc.doc; @@ -91,7 +90,7 @@ export const getRteDocs: ({ caller: 'getRteDocs', id, docs, - nbRteptIn: docs.rows[0].doc.rtept?.length, + nbRteptIn: docs.rows[0].doc.doc.rtept?.length, nbRteptTotal: rte?.rtept?.length, }); return { docs, rte }; diff --git a/src/db/rtept.test.ts b/src/db/rtept.test.ts index d28d982..2e3af35 100644 --- a/src/db/rtept.test.ts +++ b/src/db/rtept.test.ts @@ -69,7 +69,7 @@ describe('The rtept module with a real db', () => { const rtePut = await putRte({ id: idRte, rte: rte0 }); expect(rtePut).toEqual(rte0); - const rtePutRtept = await putRtept({ idRte, index: 1, rtept }); + const rtePutRtept = await putRtept({ id: idRte, index: 1, wpt: rtept }); const rteGetRtept = await getRte({ id: idRte }); expect(rteGetRtept).toEqual(rte1); }); @@ -123,9 +123,9 @@ describe('The rtept module with a real db', () => { await put(idRtept, 'rtept', () => rtept3, emptyWpt); expect(await getRte({ id: idRte })).toEqual(rte1); await putRtept({ - idRte, + id: idRte, index: 2, - rtept: rtept4, + wpt: rtept4, }); expect((await getFamily(idRte)).rows.length).toEqual(2); expect(await getRte({ id: idRte })).toEqual(rte2); @@ -179,9 +179,9 @@ describe('The rtept module with a real db', () => { const rtePut = await putRte({ id: idRte, rte: rte0 }); await put(idRtept, 'rtept', () => rtept3, emptyWpt); await putRtept({ - idRte, + id: idRte, index: -1, - rtept: rtept4, + wpt: rtept4, }); expect(await getRte({ id: idRte })).toEqual(rte2); expect((await get(idRtept)).doc).toEqual(rtept4); diff --git a/src/db/rtept.ts b/src/db/rtept.ts index efb6410..d6af72e 100644 --- a/src/db/rtept.ts +++ b/src/db/rtept.ts @@ -26,8 +26,8 @@ export const emptyRtept: Wpt = { }; export const putRtept = async (params: any) => { - const { idRte, index, rtept } = params; - const { docs } = await getRteDocs({ id: idRte }); + const { id, index, wpt } = params; + const { docs } = await getRteDocs({ id: id }); const rte = docs.rows[0].doc.doc; const nbRteptInRte = rte && rte.rtept ? rte.rtept.length : 0; const nbRteptOutRte = docs.rows.length - 1; @@ -41,11 +41,11 @@ export const putRtept = async (params: any) => { // positiveIndex, // }); if (positiveIndex < nbRteptInRte) { - rte.rtept[positiveIndex] = rtept; - await putRte({ id: idRte, rte }); + rte.rtept[positiveIndex] = wpt; + await putRte({ id, rte }); } else { const reptId = docs.rows[1 + positiveIndex - nbRteptInRte].doc._id; - await put(reptId, 'rtept', () => rtept, emptyRtept); + await put(reptId, 'rtept', () => wpt, emptyRtept); } - return rtept; + return wpt; }; diff --git a/src/workers/dispatcher-worker.ts b/src/workers/dispatcher-worker.ts index 7e77e8e..fb140db 100644 --- a/src/workers/dispatcher-worker.ts +++ b/src/workers/dispatcher-worker.ts @@ -14,6 +14,7 @@ import { } from '../db/gpx'; import { putOverlays } from '../db/overlays'; import { deleteRte, putRte } from '../db/rte'; +import { putRtept } from '../db/rtept'; import { getSettings, putSettings } from '../db/settings'; import { getState, setState } from '../db/state'; import { deleteTrk, getTrk, putNewTrk } from '../db/trk'; @@ -52,6 +53,7 @@ onmessage = async function (e) { putWpt, putRte, putTrkpt, + putRtept, deleteTrk, deleteRte,