Adding a new URI for GPX technical data and changing the index of wpt, rte and trk.

This commit is contained in:
vdv committed 2022-11-15 14:39:52 +01:00
1 parent 5fdd63103e
commit 947f4dff3a
10 files changed
+79 -94

No files matched your search

+14 -14
View File
@@ -14,30 +14,30 @@ describe('Checking some DocURI features', () => {
describe('Checking a multilevel route', () => {
test(', using the two levels', () => {
const gpx = route('gpx/:gpx/2trk/:trk');
expect(gpx({ gpx: 10, trk: 0 })).toBe('gpx/10/2trk/0');
const gpx = route('gpx/:gpx/3trk/:trk');
expect(gpx({ gpx: 10, trk: 0 })).toBe('gpx/10/3trk/0');
});
test(', using the two levels (vive-versa)', () => {
const gpx = route('gpx/:gpx/2trk/:trk');
expect(gpx('gpx/10/2trk/0')).toMatchObject({ gpx: '10', trk: '0' });
const gpx = route('gpx/:gpx/3trk/:trk');
expect(gpx('gpx/10/3trk/0')).toMatchObject({ gpx: '10', trk: '0' });
});
});
describe('Checking a multilevel route with optional part', () => {
test(', using the two levels', () => {
const gpx = route('gpx/:gpx(/2trk/:trk)');
expect(gpx({ gpx: 10, trk: 0 })).toBe('gpx/10/2trk/0');
const gpx = route('gpx/:gpx(/3trk/:trk)');
expect(gpx({ gpx: 10, trk: 0 })).toBe('gpx/10/3trk/0');
});
test(', using the two levels (vive-versa)', () => {
const gpx = route('gpx/:gpx(/2trk/:trk)');
expect(gpx('gpx/10/2trk/0')).toMatchObject({ gpx: '10', trk: '0' });
const gpx = route('gpx/:gpx(/3trk/:trk)');
expect(gpx('gpx/10/3trk/0')).toMatchObject({ gpx: '10', trk: '0' });
});
test(', using only one level', () => {
const gpx = route('gpx/:gpx(/2trk/:trk)');
expect(gpx({ gpx: 10 })).toBe('gpx/10/2trk/'); //Unfortunately !
const gpx = route('gpx/:gpx(/3trk/:trk)');
expect(gpx({ gpx: 10 })).toBe('gpx/10/3trk/'); //Unfortunately !
});
test(', using only one level (vive-versa)', () => {
const gpx = route('gpx/:gpx(/2trk/:trk)');
const gpx = route('gpx/:gpx(/3trk/:trk)');
expect(gpx('gpx/10')).toMatchObject({ gpx: '10' });
});
});
@@ -62,7 +62,7 @@ describe('Checking trk ids', () => {
gpx: 1234567890123456,
trk: 123456,
};
const key = 'gpx/1234567890123456/2trk/123456';
const key = 'gpx/1234567890123456/3trk/123456';
test(', vice', () => {
const rte = uri('trk', id);
expect(rte).toBe(key);
@@ -79,7 +79,7 @@ describe('Checking trkseg ids', () => {
trk: 0,
trkseg: 3,
};
const key = 'gpx/0000000000000111/2trk/000000/000003';
const key = 'gpx/0000000000000111/3trk/000000/000003';
test(', vice', () => {
const rte = uri('trkseg', id);
expect(rte).toBe(key);
@@ -97,7 +97,7 @@ describe('Checking trkpt ids', () => {
trkseg: 0,
trkpt: 155,
};
const key = 'gpx/0000000000000025/2trk/000008/000000/000155';
const key = 'gpx/0000000000000025/3trk/000008/000000/000155';
test(', vice', () => {
const rte = uri('trkpt', id);
expect(rte).toBe(key);
+7 -6
View File
@@ -28,12 +28,13 @@ const routes = {
dbdef: route('dbdef', coding),
settings: route('settings', coding),
gpx: route('gpx/:gpx', coding),
wpt: route('gpx/:gpx/0wpt/:wpt', coding),
rte: route('gpx/:gpx/1rte/:rte', coding),
rtept: route('gpx/:gpx/1rte/:rte/:rtept', coding),
trk: route('gpx/:gpx/2trk/:trk', coding),
trkseg: route('gpx/:gpx/2trk/:trk/:trkseg', coding),
trkpt: route('gpx/:gpx/2trk/:trk/:trkseg/:trkpt', coding),
tech: route('gpx/:gpx/0tech', coding),
wpt: route('gpx/:gpx/1wpt/:wpt', coding),
rte: route('gpx/:gpx/2rte/:rte', coding),
rtept: route('gpx/:gpx/2rte/:rte/:rtept', coding),
trk: route('gpx/:gpx/3trk/:trk', coding),
trkseg: route('gpx/:gpx/3trk/:trk/:trkseg', coding),
trkpt: route('gpx/:gpx/3trk/:trk/:trkseg/:trkpt', coding),
};
type RouteKey = keyof typeof routes;