mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-22 13:10:29 +00:00
feat(tours): import a ski track from GPX and keep it as recorded
SKI-02. Ski joins the types a GPX file can be imported as, offered in the import preview's type field only: TREK routes no ski track, so the planner never offers it. The preview asks for the discipline on purpose (alpine, snowboard, cross-country or ski touring, none chosen at first) and, for cross-country, the technique (classic, skating or unknown); Import waits until both are named, and the technique stays in sight but dimmed for the other disciplines. The track is stored exactly as recorded, with its file name as provenance, its distance and heights from the file and no time: no ski time is worked out and no hiking estimate stands in for one. Opened in the planner, a ski track gets a rail card with its discipline on a tinted tile, a cross-country technique as a badge beside it, the ski time said as not worked out, and an info dot on what TREK does not say (snow, avalanches, open runs, and that the 3D gradient colours are no difficulty or avalanche rating). Change opens a dialog to classify the track again; only the classification changes, through the offline core, with the revision it was made at. Planning over the import is not offered for ski. The existing 3D terrain view, the elevation profile and its focus work on the track as for any import, with the standard map, topo and satellite and no via ferratas. Lists, the day plan and the detail show the discipline as a frosted corner badge on the tile and as a pill with the technique inside; day assignment, copies and take-overs work as for any tour. The corner badge is now one component that the winter label shares. The server keeps tours.ski_discipline and tours.ski_technique (CHECK lists, NULL on every other type), switches the ski type on without a routing profile, refuses a ski import without its discipline, a technique outside cross-country and ski fields on any other type, and takes a planned save's classification off. PUT /api/trips/:tripId/tours/:placeId/ski classifies a ski track again (place_edit, 409 on a stale revision, 400 for a tour that is no ski track) and broadcasts tours:changed. GPX export names the discipline (alpine_skiing, snowboarding, cross_country_skiing, backcountry_skiing), and list_tours describes both fields with what a ski track does not say. Ski is labelled plainly as Ski in every language, so it no longer reads as ski touring.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
// FE-REPO-TOUR-001 to FE-REPO-TOUR-014, FE-REPO-TOUR-042, FE-REPO-TOUR-043
|
||||
// FE-REPO-TOUR-001 to FE-REPO-TOUR-014, FE-REPO-TOUR-042 to FE-REPO-TOUR-045
|
||||
// Tours through the offline core: read-through to Dexie, offline create and
|
||||
// edit written there and queued, and the online paths keeping the copy fresh.
|
||||
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
|
||||
@@ -327,6 +327,48 @@ describe('tourRepo writes and the revision (P2C-03)', () => {
|
||||
})
|
||||
})
|
||||
|
||||
describe('tourRepo.classifySki (SKI-02)', () => {
|
||||
const skiTour = (overrides: Partial<TourListItem> = {}) =>
|
||||
tour({ tour_type: 'ski', has_waypoints: false, duration: null, max_hiking_difficulty: null, ski_discipline: 'cross_country', ski_technique: 'unknown', ...overrides })
|
||||
|
||||
it('FE-REPO-TOUR-044: online, the classification goes to the server with its revision and the answer is cached', async () => {
|
||||
let sentBody: Record<string, unknown> | null = null
|
||||
server.use(http.put('/api/trips/3/tours/40/ski', async ({ request }) => {
|
||||
sentBody = await request.json() as Record<string, unknown>
|
||||
return HttpResponse.json({ tour: skiTour({ ski_technique: 'skating', revision: 2 }), waypoints: [] })
|
||||
}))
|
||||
|
||||
const result = await tourRepo.classifySki(3, 40, { ski_discipline: 'cross_country', ski_technique: 'skating', expected_revision: 1 })
|
||||
|
||||
expect(sentBody).toEqual({ ski_discipline: 'cross_country', ski_technique: 'skating', expected_revision: 1 })
|
||||
expect(result.tour).toMatchObject({ ski_technique: 'skating', revision: 2 })
|
||||
expect(await offlineDb.tours.get(40)).toMatchObject({ trip_id: 3, ski_technique: 'skating' })
|
||||
})
|
||||
|
||||
it('FE-REPO-TOUR-045: offline, the cached track takes the classification at once and the write waits without its revision', async () => {
|
||||
setOnline(false)
|
||||
const provenance = {
|
||||
origin: 'gpx' as const,
|
||||
createdAt: '2027-02-01 09:00:00',
|
||||
source: { kind: 'gpx' as const, fileName: 'hut.gpx' },
|
||||
derivedFrom: null,
|
||||
plannedOver: false,
|
||||
editedLocally: null,
|
||||
}
|
||||
await offlineDb.tours.put({ ...skiTour(), trip_id: 3, provenance })
|
||||
|
||||
const result = await tourRepo.classifySki(3, 40, { ski_discipline: 'alpine', expected_revision: 1 })
|
||||
|
||||
expect(result.tour).toMatchObject({ ski_discipline: 'alpine', ski_technique: null, distance: 8 })
|
||||
expect(result.provenance).toEqual(provenance)
|
||||
expect(await offlineDb.tours.get(40)).toMatchObject({ ski_discipline: 'alpine', ski_technique: null })
|
||||
const [mutation] = await offlineDb.mutationQueue.toArray()
|
||||
expect(mutation).toMatchObject({ method: 'PUT', url: '/trips/3/tours/40/ski', resource: 'tours', entityId: 40 })
|
||||
expect(mutation.body).toEqual({ ski_discipline: 'alpine' })
|
||||
await expect(tourRepo.classifySki(3, 99, { ski_discipline: 'alpine' })).rejects.toThrow('Tour not available offline')
|
||||
})
|
||||
})
|
||||
|
||||
describe('replaceTripTours', () => {
|
||||
it('FE-REPO-TOUR-013: keeps control points only while the route reads the same, drops what the server no longer lists, keeps unsynced tours', async () => {
|
||||
await offlineDb.tours.bulkPut([
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
import { computeTourMetrics, estimatePaddleTime, paddleCheckSummaryOf, paddleLayoutOfTrack, paddleMovingSeconds, recommendedPaddleSpeedKmh, type GeometryPoint, type TourObstacleCheck, type TourObstacleReviewsRequest, type TourPaddlePlanRequest, type TourCreateRequest, type TourCreateResponse, type TourDetailResponse, type TourGpxImportFields, type TourGpxPreviewResponse, type TourImportGpxResponse, type TourListItem, type TourWaypoint, walkStationFacts } from '@trek/shared'
|
||||
import { computeTourMetrics, estimatePaddleTime, paddleCheckSummaryOf, paddleLayoutOfTrack, paddleMovingSeconds, recommendedPaddleSpeedKmh, type GeometryPoint, type TourObstacleCheck, type TourObstacleReviewsRequest, type TourPaddlePlanRequest, type TourSkiClassificationRequest, type TourCreateRequest, type TourCreateResponse, type TourDetailResponse, type TourGpxImportFields, type TourGpxPreviewResponse, type TourImportGpxResponse, type TourListItem, type TourWaypoint, walkStationFacts } from '@trek/shared'
|
||||
import { toursApi } from '../api/client'
|
||||
import { tourGpxApi } from '../api/tourGpx'
|
||||
import { recordedTrackApi } from '../api/recordedTrack'
|
||||
import { tourPaddlePlanApi } from '../api/tourPaddlePlan'
|
||||
import { tourSkiApi } from '../api/tourSki'
|
||||
import { tourCopiesApi } from '../api/tourCopies'
|
||||
import { tourGpxExportApi } from '../api/tourGpxExport'
|
||||
import { tourObstacleReviewsApi } from '../api/tourObstacleReviews'
|
||||
@@ -281,6 +282,38 @@ export const tourRepo = {
|
||||
return result
|
||||
},
|
||||
|
||||
/**
|
||||
* SKI-02: a ski track classified again. Made offline, the cached tour takes
|
||||
* the classification at once and the write waits in the queue; nothing of
|
||||
* the track changes either way.
|
||||
*/
|
||||
async classifySki(tripId: number | string, placeId: number, body: TourSkiClassificationRequest): Promise<TourDetailResponse> {
|
||||
if (await mutationQueue.mustQueue('tours', placeId)) {
|
||||
const existing = await offlineDb.tours.get(placeId)
|
||||
if (!existing) throw new Error('Tour not available offline')
|
||||
const tour: CachedTour = { ...existing, ski_discipline: body.ski_discipline, ski_technique: body.ski_technique ?? null }
|
||||
await offlineDb.tours.put(tour)
|
||||
await mutationQueue.enqueue({
|
||||
id: generateUUID(),
|
||||
tripId: Number(tripId),
|
||||
method: 'PUT',
|
||||
url: `/trips/${tripId}/tours/${placeId}/ski`,
|
||||
body: withoutRevisionBase(body),
|
||||
resource: 'tours',
|
||||
entityId: placeId,
|
||||
})
|
||||
mutationQueue.sendSoon()
|
||||
return {
|
||||
tour: toListItem(tour),
|
||||
waypoints: existing.waypoints ?? [],
|
||||
...(existing.provenance ? { provenance: existing.provenance } : {}),
|
||||
}
|
||||
}
|
||||
const result = await tourSkiApi.classify(tripId, placeId, body)
|
||||
await cacheTourAnswer(Number(tripId), result)
|
||||
return result
|
||||
},
|
||||
|
||||
/** Online only, like the import: the recorded track is kept on the server, not in the cache. */
|
||||
async restoreRecorded(tripId: number | string, placeId: number): Promise<TourDetailResponse> {
|
||||
const result = await recordedTrackApi.restore(tripId, placeId)
|
||||
|
||||
Reference in New Issue
Block a user