k1nq/TREK
1
0
Fork 0
mirror of https://github.com/mauriceboe/TREK.git synced 2026-10-21 06:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(tours): keep the planner page hook's view model its only object return

Browse Source 
The map focus helpers split out of useTripPlannerPage returned object
literals ahead of the hook's own return, which the B4A wiring test reads as
the view model. They move to tourMapFocus.ts beside the hook.
This commit is contained in:
Maurice
2026-10-20 18:05:40 +02:00
parent b460cfd9a7
commit 58302dc9e4
2 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/pages/tripPlanner/tourMapFocus.ts
+41
View File
@@ -0,0 +1,41 @@
import type { useMapLocationSearch } from './useMapLocationSearch'
import type { useTourWorkspace } from './useTourWorkspace'
// The planner page hook's pure helpers: what the Tours map draws and frames.
// They live apart so the page hook's one object-literal return stays its view model.
type Workspace = ReturnType<typeof useTourWorkspace>
type TourPlanner = Workspace['tourPlanner']
/** PAD-05B: the paddle line in view, a recorded paddle track's or the paddle tour's being planned; none for any other. */
export function paddleLineOf(tourPlanner: TourPlanner) {
if (tourPlanner.mode.type === 'view-gpx') {
return tourPlanner.mode.tour.tour_type === 'kayak' ? tourPlanner.readOnlyGpxAnalysis?.routeCoordinates ?? null : null
}
return tourPlanner.isPaddle ? tourPlanner.route : null
}
/**
* RTE-02, RTE-03: the ways offered over the route being edited (a section's
* ways being compared, else the round hikes), the one in focus, and the frame
* round hikes ask the map for while they are looked for and shown.
*/
export function offeredWaysOf(tourPlanner: TourPlanner, offering: boolean) {
const { comparison, focus: variantFocus } = tourPlanner.legVariants
const { view: rounds, focus: roundFocus, frame: roundFrame } = tourPlanner.roundHikes
return {
ways: offering ? comparison?.variants ?? rounds?.candidates ?? null : null,
focus: comparison ? variantFocus : roundFocus,
frame: offering ? roundFrame : null,
}
}
/** What frames the map: a picked wanderer trail itself, else round hikes being framed, else the planner. */
export function mapFocusKeyOf(
wandererBrowser: Workspace['wandererBrowser'],
frame: ReturnType<typeof offeredWaysOf>['frame'],
plannerKey: ReturnType<typeof useMapLocationSearch>['mapFocusKey'],
) {
if (wandererBrowser.open && wandererBrowser.selected) return `wanderer:${wandererBrowser.selected.id}`
return frame?.key ?? plannerKey
}
client/src/pages/tripPlanner/useTripPlannerPage.ts
+1 -36
View File
@@ -14,42 +14,7 @@ import { useMapLocationSearch } from './useMapLocationSearch'
import { usePlannerFocusPoints } from './usePlannerFocusPoints'
import { useTripPlanner } from './useTripPlanner'
import { useTourWorkspace } from './useTourWorkspace'
type Workspace = ReturnType<typeof useTourWorkspace>
type TourPlanner = Workspace['tourPlanner']
/** PAD-05B: the paddle line in view, a recorded paddle track's or the paddle tour's being planned; none for any other. */
function paddleLineOf(tourPlanner: TourPlanner) {
if (tourPlanner.mode.type === 'view-gpx') {
return tourPlanner.mode.tour.tour_type === 'kayak' ? tourPlanner.readOnlyGpxAnalysis?.routeCoordinates ?? null : null
}
return tourPlanner.isPaddle ? tourPlanner.route : null
}
/**
* RTE-02, RTE-03: the ways offered over the route being edited (a section's
* ways being compared, else the round hikes), the one in focus, and the frame
* round hikes ask the map for while they are looked for and shown.
*/
function offeredWaysOf(tourPlanner: TourPlanner, offering: boolean) {
const { comparison, focus: variantFocus } = tourPlanner.legVariants
const { view: rounds, focus: roundFocus, frame: roundFrame } = tourPlanner.roundHikes
return {
ways: offering ? comparison?.variants ?? rounds?.candidates ?? null : null,
focus: comparison ? variantFocus : roundFocus,
frame: offering ? roundFrame : null,
}
}
/** What frames the map: a picked wanderer trail itself, else round hikes being framed, else the planner. */
function mapFocusKeyOf(
wandererBrowser: Workspace['wandererBrowser'],
frame: ReturnType<typeof offeredWaysOf>['frame'],
plannerKey: ReturnType<typeof useMapLocationSearch>['mapFocusKey'],
) {
if (wandererBrowser.open && wandererBrowser.selected) return `wanderer:${wandererBrowser.selected.id}`
return frame?.key ?? plannerKey
}
import { mapFocusKeyOf, offeredWaysOf, paddleLineOf } from './tourMapFocus'
export function useTripPlannerPage() {
const planner = useTripPlanner()