diff --git a/client/src/api/valhallaRelay.ts b/client/src/api/valhallaRelay.ts new file mode 100644 index 000000000..85501690b --- /dev/null +++ b/client/src/api/valhallaRelay.ts @@ -0,0 +1,19 @@ +import type { ValhallaRelayAction } from '@trek/shared'; + +/** + * POST /api/routing/valhalla/:action: a question for the TREK services' + * Valhalla, which this server asks with the installation key. The answer is + * Valhalla's own, its status included, so it is handed back as a Response and + * read like the answer of any other Valhalla. Plain fetch on purpose: the + * shared client would turn a 401 into a sign-in redirect and a 429 into a + * toast, where the planner only wants to ask FOSSGIS instead. + */ +export function postValhallaRelay(action: ValhallaRelayAction, body: unknown, signal?: AbortSignal): Promise { + return fetch(`/api/routing/valhalla/${action}`, { + method: 'POST', + credentials: 'include', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(body), + signal, + }); +} diff --git a/client/src/components/Admin/RoutingInstanceFields.tsx b/client/src/components/Admin/RoutingInstanceFields.tsx index c3b99068a..3353686ef 100644 --- a/client/src/components/Admin/RoutingInstanceFields.tsx +++ b/client/src/components/Admin/RoutingInstanceFields.tsx @@ -1,4 +1,5 @@ import { useId, useState } from 'react' +import type { ValhallaProvider } from '@trek/shared' import { useTranslation } from '../../i18n/TranslationContext' import { fs } from '../shared/DialogShell' import { INPUT, LABEL } from '../shared/dialogParts' @@ -6,6 +7,7 @@ import { INPUT, LABEL } from '../shared/dialogParts' export interface RoutingDefaults { routing_base_url?: string valhalla_base_url?: string + routing_valhalla_provider?: ValhallaProvider } interface RoutingFieldsProps { @@ -25,6 +27,14 @@ const ROUTERS = [ { key: 'valhalla_base_url', label: 'settings.valhallaBase', hint: 'settings.valhallaBaseHint', placeholder: 'https://valhalla.example.org' }, ] as const +// '' is no choice of the admin: the instance then decides as before the choice existed. +const PROVIDERS = [ + { value: '', label: 'settings.valhallaProviderOption.auto' }, + { value: 'trek', label: 'settings.valhallaProviderOption.trek' }, + { value: 'fossgis', label: 'settings.valhallaProviderOption.fossgis' }, + { value: 'custom', label: 'settings.valhallaProviderOption.custom' }, +] as const + // The phone screen's look, unchanged: MAdminDefaultUserSettings passes its own hint class. const PHONE = { wrap: 'min-w-0 space-y-1.5', @@ -43,6 +53,12 @@ const DESKTOP = { input: INPUT, } +function FieldHint({ id, text, hintClassName }: { id: string; text: string; hintClassName?: string }) { + return hintClassName !== undefined + ?

{text}

+ :

{text}

+} + function RoutingUrlField({ router, defaults, onSave, onReset, hintClassName }: RoutingFieldsProps & { router: typeof ROUTERS[number] }) { const { t } = useTranslation() const id = useId() @@ -81,14 +97,45 @@ function RoutingUrlField({ router, defaults, onSave, onReset, hintClassName }: R aria-describedby={`${id}-hint`} className={look.input} /> - {phone - ?

{t(router.hint)}

- :

{t(router.hint)}

} + + + ) +} + +/** Which Valhalla answers what OSRM cannot; picking "automatic" clears the choice. */ +function RoutingProviderField({ defaults, onSave, onReset, hintClassName }: RoutingFieldsProps) { + const { t } = useTranslation() + const id = useId() + const [saving, setSaving] = useState(false) + const phone = hintClassName !== undefined + const look = phone ? PHONE : DESKTOP + const pick = async (value: string) => { + setSaving(true) + try { + if (value === '') await onReset('routing_valhalla_provider') + else await onSave({ routing_valhalla_provider: value as ValhallaProvider }) + } finally { setSaving(false) } + } + return ( +
+
+ +
+ +
) } export default function RoutingInstanceFields(props: RoutingFieldsProps) { const phone = props.hintClassName !== undefined - return
{ROUTERS.map(router => )}
+ return ( +
+ + {ROUTERS.map(router => )} +
+ ) } diff --git a/client/src/components/Map/valhallaRoute.test.ts b/client/src/components/Map/valhallaRoute.test.ts index a356929af..c4e760f26 100644 --- a/client/src/components/Map/valhallaRoute.test.ts +++ b/client/src/components/Map/valhallaRoute.test.ts @@ -5,6 +5,8 @@ import { useSettingsStore } from '../../store/settingsStore' import { valhallaBase, valhallaAvailable, valhallaTurn, resetValhallaTurns, valhallaRouteAvoiding, valhallaRun, valhallaRunOnFoot, valhallaAlternates, alternatesFrom, runFrom, legAvoids, valhallaTraceAttributes } from './valhallaRoute' const FOSSGIS_VALHALLA = 'https://valhalla1.openstreetmap.de/route' +/** The relay to the TREK services' Valhalla, the base asked when nothing else is configured. */ +const TREK_VALHALLA = '/api/routing/valhalla' /** * A real polyline6, encoded from three known points and verified by decoding it back. @@ -36,7 +38,7 @@ const setSettings = (patch: Record) => useSettingsStore.setState(st => ({ settings: { ...st.settings, ...patch } })) afterEach(() => { - setSettings({ routing_base_url: '', valhalla_base_url: '' }) + setSettings({ routing_base_url: '', valhalla_base_url: '', routing_valhalla_provider: '' }) resetValhallaTurns() }) @@ -92,11 +94,20 @@ const HAMBURG = { lat: 53.5511, lng: 9.9937 } const BERLIN = { lat: 52.52, lng: 13.405 } describe('valhallaBase', () => { - it('VALHALLA-BASE-001: falls back to the public instance when nothing is configured', () => { - expect(valhallaBase()).toBe('https://valhalla1.openstreetmap.de') + it('VALHALLA-BASE-001: asks the TREK services through the relay when nothing is configured', () => { + expect(valhallaBase()).toBe(TREK_VALHALLA) expect(valhallaAvailable()).toBe(true) }) + it('VALHALLA-BASE-005: keeps the admin choice of a routing service', () => { + setSettings({ routing_valhalla_provider: 'fossgis', valhalla_base_url: 'https://v.example.org' }) + expect(valhallaBase()).toBe('https://valhalla1.openstreetmap.de') + setSettings({ routing_valhalla_provider: 'custom' }) + expect(valhallaBase()).toBe('https://v.example.org') + setSettings({ routing_valhalla_provider: 'trek', valhalla_base_url: '', routing_base_url: 'https://osrm.example.org' }) + expect(valhallaBase()).toBe(TREK_VALHALLA) + }) + it('VALHALLA-BASE-002: uses the configured instance and drops its trailing slashes', () => { setSettings({ valhalla_base_url: 'https://valhalla.example.org//' }) expect(valhallaBase()).toBe('https://valhalla.example.org') @@ -705,3 +716,81 @@ describe('crossings by boat on a walk (CW-12)', () => { expect(await valhallaRunOnFoot(points, undefined, { use_ferry: 0 }, { exclude_ferry: true })).toBeNull() }) }) + +describe('through the TREK services (routing relay)', () => { + const RELAY = '/api/routing/valhalla/:action' + + it('VALHALLA-RELAY-001: asks the relay first, and FOSSGIS is not asked while it answers', async () => { + const relayed: Array<{ action: string; body: Record }> = [] + let fossgis = 0 + server.use( + http.post(RELAY, async ({ params, request }) => { + relayed.push({ action: String(params.action), body: await request.json() as Record }) + return HttpResponse.json(answer({ has_toll: false })) + }), + http.post(FOSSGIS_VALHALLA, () => { fossgis++; return HttpResponse.json(answer()) }), + ) + const leg = await valhallaRouteAvoiding(HAMBURG, BERLIN, 'driving', 'toll') + expect(leg).not.toBeNull() + expect(leg!.distance).toBeCloseTo(295700, 0) + expect(relayed).toHaveLength(1) + expect(relayed[0].action).toBe('route') + expect(relayed[0].body).toMatchObject({ costing: 'auto', costing_options: { auto: { use_tolls: 0 } } }) + expect(fossgis).toBe(0) + }) + + it('VALHALLA-RELAY-002: turns to FOSSGIS without a word where the relay cannot answer, and leaves it alone a while', async () => { + for (const status of [401, 429, 503]) { + resetValhallaTurns() + let relayCalls = 0 + let fossgis = 0 + server.use( + http.post(RELAY, () => { relayCalls++; return HttpResponse.json({ error: 'no' }, { status }) }), + http.post(FOSSGIS_VALHALLA, () => { fossgis++; return HttpResponse.json(answer()) }), + ) + await expect(valhallaRouteAvoiding(HAMBURG, BERLIN, 'driving', 'toll')).resolves.not.toBeNull() + expect(valhallaBase()).toBe('https://valhalla1.openstreetmap.de') + vi.useFakeTimers({ toFake: ['Date'] }) + vi.setSystemTime(Date.now() + 2000) + await valhallaRouteAvoiding(HAMBURG, BERLIN, 'driving', 'ferry') + vi.useRealTimers() + expect([status, relayCalls, fossgis]).toEqual([status, 1, 2]) + } + }) + + it('VALHALLA-RELAY-003: asks the relay again once the rest is over', async () => { + let relayCalls = 0 + server.use( + http.post(RELAY, () => { relayCalls++; return HttpResponse.json({ error: 'no' }, { status: 503 }) }), + http.post(FOSSGIS_VALHALLA, () => HttpResponse.json(answer())), + ) + await valhallaRouteAvoiding(HAMBURG, BERLIN, 'driving', 'toll') + vi.useFakeTimers({ toFake: ['Date'] }) + vi.setSystemTime(Date.now() + 11 * 60_000) + expect(valhallaBase()).toBe(TREK_VALHALLA) + vi.useRealTimers() + }) + + it("VALHALLA-RELAY-004: reads Valhalla's own refusal through the relay as no way, without asking FOSSGIS", async () => { + let fossgis = 0 + server.use( + http.post(RELAY, () => HttpResponse.json({ error_code: 442, error: 'No path could be found for input' }, { status: 400 })), + http.post(FOSSGIS_VALHALLA, () => { fossgis++; return HttpResponse.json(answer()) }), + ) + const points = [HAMBURG, BERLIN] + expect(await valhallaRunOnFoot(points, undefined, { use_ferry: 0 }, { exclude_ferry: true })).toEqual({ noPath: true }) + expect(fossgis).toBe(0) + expect(valhallaBase()).toBe(TREK_VALHALLA) + }) + + it('VALHALLA-RELAY-005: describes a line through the relay as a polyline', async () => { + const bodies: Record[] = [] + server.use(http.post(RELAY, async ({ request }) => { + bodies.push(await request.json() as Record) + return HttpResponse.json({ edges: [] }) + })) + await expect(valhallaTraceAttributes(SHAPE_POINTS)).resolves.toEqual({ edges: [] }) + expect(bodies[0]).not.toHaveProperty('shape') + expect(bodies[0]).toMatchObject({ encoded_polyline: expect.any(String), costing: 'bicycle', shape_match: 'map_snap' }) + }) +}) diff --git a/client/src/components/Map/valhallaRoute.ts b/client/src/components/Map/valhallaRoute.ts index 03eb43a50..57934fc61 100644 --- a/client/src/components/Map/valhallaRoute.ts +++ b/client/src/components/Map/valhallaRoute.ts @@ -1,3 +1,5 @@ +import { resolveValhallaProvider, type ValhallaRelayAction } from '@trek/shared' +import { valhallaRelayRepo } from '../../repo/valhallaRelayRepo' import { useSettingsStore } from '../../store/settingsStore' import { decodePolyline } from './transitGeometry' import { haversineKm } from '../../utils/geo' @@ -38,6 +40,18 @@ import type { Waypoint, SnappedWaypoint, RouteAvoidClass } from '../../types' /** The public instance, matching how the OSRM defaults are shipped rather than configured. */ const FOSSGIS_VALHALLA = 'https://valhalla1.openstreetmap.de' +/** + * The TREK services' Valhalla, reached through this server's relay: same origin, so no + * connect-src to add, and the installation key stays on the server. + */ +const TREK_VALHALLA = '/api/routing/valhalla' + +/** + * How long this tab leaves the relay alone after it could not answer: signed out on a + * shared page, the allowance spent, the services down. FOSSGIS answers meanwhile. + */ +const RELAY_REST_MS = 10 * 60_000 + /** * How far Valhalla may look for a road under a point, in metres. * @@ -169,21 +183,33 @@ export interface ValhallaRun { snapped: SnappedWaypoint[] } +/** Until when this tab asks FOSSGIS instead of a relay that could not answer. */ +let relayRestingUntil = 0 + /** * The instance's Valhalla, or null when it should not ask one. * - * Blank falls back to the public instance, the same reading `routing_base_url` gets — + * The admin's choice (`routing_valhalla_provider`) stands. Without one, an own Valhalla + * is asked, and otherwise the TREK services through the relay, with FOSSGIS behind it — * with one condition. An operator who filled in their OWN router chose deliberately * against the public hosts, usually because their instance is not supposed to talk to - * third parties at all, and quietly adding a second public host they never asked for - * would undo that choice. They lose nothing: a self-hosted OSRM built through the MLD + * third parties at all, and quietly adding a second host they never asked for would + * undo that choice. They lose nothing: a self-hosted OSRM built through the MLD * pipeline answers `exclude` on its own, which is exactly the fallback below. */ export function valhallaBase(): string | null { const settings = useSettingsStore.getState().settings - const configured = settings.valhalla_base_url?.trim() - if (configured) return configured.replace(/\/+$/, '') - return settings.routing_base_url?.trim() ? null : FOSSGIS_VALHALLA + const own = settings.valhalla_base_url?.trim().replace(/\/+$/, '') ?? '' + const provider = resolveValhallaProvider({ + provider: settings.routing_valhalla_provider, + valhallaUrl: own, + routingUrl: settings.routing_base_url, + // Whether the TREK services can answer is the relay's to say; until it said no, ask it. + trekAvailable: Date.now() >= relayRestingUntil, + }) + if (provider === 'custom') return own + if (provider === 'trek') return TREK_VALHALLA + return provider === 'fossgis' ? FOSSGIS_VALHALLA : null } /** True when this engine can be asked at all, so callers can skip building a request. */ @@ -355,9 +381,57 @@ export async function valhallaTurn(base: string, signal?: AbortSignal): Promise< lastPublicAskAt = Date.now() } -/** Forget the last turn, for tests that start from a quiet host. */ +/** Forget the last turn and a resting relay, for tests that start from a quiet host. */ export function resetValhallaTurns(): void { lastPublicAskAt = 0 + relayRestingUntil = 0 +} + +/** + * The relay's statuses that say it cannot answer for the TREK services right now: no + * session (a shared page), no key, a body it does not take, an allowance spent, a host + * that is down. A 400 is Valhalla's own refusal of the way and is read as such. + */ +function relayCannotAnswer(status: number): boolean { + return status === 401 || status === 403 || status === 413 || status === 429 || status >= 500 +} + +async function askRelay(action: ValhallaRelayAction, body: object, signal?: AbortSignal): Promise { + try { + const response = await valhallaRelayRepo.ask(action, body, signal) + if (!relayCannotAnswer(response.status)) return response + } catch (err) { + if (signal?.aborted) throw err + } + relayRestingUntil = Date.now() + RELAY_REST_MS + return null +} + +/** + * One question to a Valhalla, in its turn where the host is the public one. The relay + * is asked first where it is the base; where it cannot answer, the same question goes + * to FOSSGIS without a word, so a route never fails because of it. + */ +export async function valhallaPost( + base: string, + action: ValhallaRelayAction, + body: object, + signal?: AbortSignal, +): Promise { + if (base === TREK_VALHALLA && Date.now() >= relayRestingUntil) { + const relayed = await askRelay(action, body, signal) + if (relayed) return relayed + } + const host = base === TREK_VALHALLA ? FOSSGIS_VALHALLA : base + await valhallaTurn(host, signal) + return fetch(`${host}/${action}`, { + method: 'POST', + // A browser cannot set User-Agent, so this is the whole of what FOSSGIS asks a + // client to identify itself with. It costs a preflight, which is answered. + headers: { 'Content-Type': 'application/json', 'X-Client-Id': 'trek' }, + body: JSON.stringify(body), + signal, + }) } /** @@ -418,16 +492,7 @@ function routeBody( /** The parsed answer to one POST, `NO_PATH` when the router found no way, or null for every other failure. */ async function postRoute(base: string, body: Record, signal?: AbortSignal): Promise { try { - await valhallaTurn(base, signal) - if (signal?.aborted) return null - const response = await fetch(`${base}/route`, { - method: 'POST', - // A browser cannot set User-Agent, so this is the whole of what FOSSGIS asks a - // client to identify itself with. It costs a preflight, which is answered. - headers: { 'Content-Type': 'application/json', 'X-Client-Id': 'trek' }, - body: JSON.stringify(body), - signal, - }) + const response = await valhallaPost(base, 'route', body, signal) if (!response.ok) { // 404 and 405 mean this URL is not a Valhalla — an OSRM pointed at by mistake, // or a proxy that swallowed the path. Every other status is about this request: @@ -506,22 +571,15 @@ export async function valhallaTraceAttributes( const shape = line.filter((_, index) => index % step === 0 || index === line.length - 1).map(([lat, lon]) => ({ lat, lon })) const bounded = signal ? AbortSignal.any([signal, AbortSignal.timeout(TRACE_TIMEOUT_MS)]) : AbortSignal.timeout(TRACE_TIMEOUT_MS) try { - await valhallaTurn(base, signal) - if (signal?.aborted) return null - const response = await fetch(`${base}/trace_attributes`, { - method: 'POST', - headers: { 'Content-Type': 'application/json', 'X-Client-Id': 'trek' }, - body: JSON.stringify({ - shape, - ...TRACE_COSTING[matching], - shape_match: 'map_snap', - filters: { - attributes: traceAttributesFor(matching), - action: 'include', - }, - }), - signal: bounded, - }) + const response = await valhallaPost(base, 'trace_attributes', { + shape, + ...TRACE_COSTING[matching], + shape_match: 'map_snap', + filters: { + attributes: traceAttributesFor(matching), + action: 'include', + }, + }, bounded) if (!response.ok) return null return await response.json() } catch { diff --git a/client/src/components/Tours/planner/tourRouting.test.ts b/client/src/components/Tours/planner/tourRouting.test.ts index ab100eacf..0e235494d 100644 --- a/client/src/components/Tours/planner/tourRouting.test.ts +++ b/client/src/components/Tours/planner/tourRouting.test.ts @@ -1,17 +1,17 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -const { valhallaBase, valhallaRun, valhallaRunOnFoot, valhallaTurn } = vi.hoisted(() => ({ +const { valhallaBase, valhallaPost, valhallaRun, valhallaRunOnFoot } = vi.hoisted(() => ({ valhallaBase: vi.fn(), + valhallaPost: vi.fn(), valhallaRun: vi.fn(), valhallaRunOnFoot: vi.fn(), - valhallaTurn: vi.fn(async () => {}), })) vi.mock('../../Map/valhallaRoute', () => ({ valhallaBase, + valhallaPost, valhallaRun, valhallaRunOnFoot, - valhallaTurn, })) import { enrichTourElevations, parseValhallaElevation, routeBikeTour, routeCityWalk, routeRun, routeWalkingTour, type TourRouteResult } from './tourRouting' @@ -146,10 +146,10 @@ describe('routeWalkingTour', () => { ) it('keeps valid route coordinates and explicit missing samples when height data is partial', async () => { - vi.stubGlobal('fetch', vi.fn().mockResolvedValue({ + valhallaPost.mockReset().mockResolvedValue({ ok: true, json: async () => ({ range_height: [[0, 0], [1, null], [2, ' ']] }), - })) + }) const coordinates: [number, number][] = [[48, 11], [48.01, 11.01], [48.02, 11.02]] await expect(enrichTourElevations(coordinates)).resolves.toEqual([ @@ -157,35 +157,36 @@ describe('routeWalkingTour', () => { ]) }) - it('waits for its turn at the host before every height question', async () => { - const order: string[] = [] - valhallaTurn.mockImplementation(async () => { order.push('turn') }) - vi.stubGlobal('fetch', vi.fn(async (_url: string, init: { body: string }) => { - order.push('fetch') - const shape = (JSON.parse(init.body) as { shape: unknown[] }).shape - return { ok: true, json: async () => ({ range_height: shape.map((_, i) => [i, 100]) }) } + it('asks the heights of its host piece by piece, through the one door every Valhalla question takes', async () => { + valhallaPost.mockReset().mockImplementation(async (_base: string, _action: string, body: { shape: unknown[] }) => ({ + ok: true, + json: async () => ({ range_height: body.shape.map((_, i) => [i, 100]) }), })) const coordinates = Array.from({ length: 600 }, (_, i) => [48 + i / 1000, 11] as [number, number]) const result = await enrichTourElevations(coordinates) - expect(order).toEqual(['turn', 'fetch', 'turn', 'fetch']) - expect(valhallaTurn).toHaveBeenCalledWith('https://valhalla.test', undefined) + expect(valhallaPost).toHaveBeenCalledTimes(2) + expect(valhallaPost.mock.calls.map(([base, action, body]) => [base, action, body.shape.length, body.range])).toEqual([ + ['https://valhalla.test', 'height', 500, true], + ['https://valhalla.test', 'height', 101, true], + ]) expect(result!.every(point => point.length === 3)).toBe(true) }) - it('asks nothing once the caller gave up while waiting for its turn', async () => { + it('gives up without heights once the caller gave up', async () => { const controller = new AbortController() - valhallaTurn.mockImplementation(async () => { controller.abort() }) - const fetchSpy = vi.fn() - vi.stubGlobal('fetch', fetchSpy) + valhallaPost.mockReset().mockImplementation(async () => { + controller.abort() + throw new DOMException('The operation was aborted.', 'AbortError') + }) await expect(enrichTourElevations([[48, 11], [48.01, 11.01]], controller.signal)).resolves.toBeNull() - expect(fetchSpy).not.toHaveBeenCalled() + expect(valhallaPost).toHaveBeenCalledTimes(1) }) it('keeps the full route as 2D geometry when height enrichment is unavailable', async () => { - vi.stubGlobal('fetch', vi.fn().mockResolvedValue({ ok: false, json: async () => ({}) })) + valhallaPost.mockReset().mockResolvedValue({ ok: false, json: async () => ({}) }) const coordinates: [number, number][] = [[48, 11], [48.01, 11.01]] await expect(enrichTourElevations(coordinates)).resolves.toEqual(coordinates) diff --git a/client/src/components/Tours/planner/tourRouting.ts b/client/src/components/Tours/planner/tourRouting.ts index f936ff94c..9f4b5e9c2 100644 --- a/client/src/components/Tours/planner/tourRouting.ts +++ b/client/src/components/Tours/planner/tourRouting.ts @@ -14,9 +14,9 @@ import { import type { Waypoint } from '../../../types' import { valhallaBase, + valhallaPost, valhallaRun, valhallaRunOnFoot, - valhallaTurn, type CostingOptions, type FerrySpan, type SearchFilter, @@ -416,19 +416,12 @@ export async function enrichTourElevations( if (chunk.length === 1 && offset > 0) break try { // The route came from the same host a moment ago, and the public one allows a - // request a second: without the wait the first height question is refused and - // the tour cannot be saved for want of elevation. - await valhallaTurn(base, signal) - if (signal?.aborted) return null - const response = await fetch(`${base}/height`, { - method: 'POST', - headers: { 'Content-Type': 'application/json', 'X-Client-Id': 'trek' }, - body: JSON.stringify({ - shape: chunk.map(([lat, lng]) => ({ lat, lon: lng })), - range: true, - }), - signal, - }) + // request a second: valhallaPost waits that turn, or the first height question is + // refused and the tour cannot be saved for want of elevation. + const response = await valhallaPost(base, 'height', { + shape: chunk.map(([lat, lng]) => ({ lat, lon: lng })), + range: true, + }, signal) if (!response.ok) break const chunkElevations = parseElevations(await response.json() as HeightResponse, chunk.length) if (!chunkElevations) break diff --git a/client/src/repo/valhallaRelayRepo.ts b/client/src/repo/valhallaRelayRepo.ts new file mode 100644 index 000000000..d256e8045 --- /dev/null +++ b/client/src/repo/valhallaRelayRepo.ts @@ -0,0 +1,14 @@ +import { compactValhallaRequest, type ValhallaRelayAction } from '@trek/shared'; +import { postValhallaRelay } from '../api/valhallaRelay'; + +/** + * Routing through the TREK services. **Deliberately online-only and without a + * Dexie table:** a route is asked for while planning, and the routes worth + * keeping are kept by the route cache, whichever router drew them. A line to + * describe goes as a polyline, which keeps a long one under the relay's limit. + */ +export const valhallaRelayRepo = { + ask(action: ValhallaRelayAction, body: object, signal?: AbortSignal): Promise { + return postValhallaRelay(action, compactValhallaRequest(action, body), signal); + }, +}; diff --git a/client/src/store/settingsStore.ts b/client/src/store/settingsStore.ts index 82c78f366..43f1a9dcc 100644 --- a/client/src/store/settingsStore.ts +++ b/client/src/store/settingsStore.ts @@ -62,9 +62,11 @@ export const DEFAULT_SETTINGS: Settings = { map_tile_url: '', // Empty = the public routing hosts TREK ships with. routing_base_url: '', - // Empty = the public Valhalla, unless routing_base_url names an own router, in which - // case no second engine is asked at all. See valhallaBase(). + // Empty = no own Valhalla. Which one is asked then is valhallaBase()'s to say. valhalla_base_url: '', + // Empty = not chosen: the TREK services, FOSSGIS where they cannot answer, none + // beside an own router alone. See valhallaBase(). + routing_valhalla_provider: '', // Empty = not said, and then a stop of either kind fills up. See refuelsRange(). roadtrip_vehicle: '', // Off = the rail routes a day at a time, the way the day plan stores it, and the road diff --git a/client/src/types.ts b/client/src/types.ts index 7c25879ef..2020bcb86 100644 --- a/client/src/types.ts +++ b/client/src/types.ts @@ -30,6 +30,7 @@ import type { Tag, Category, AppearanceConfig, + ValhallaProvider, WeekStart, } from '@trek/shared' @@ -126,6 +127,11 @@ export interface Settings { * operator turned the second engine off and "other ways" goes back to OSRM alone. */ valhalla_base_url?: string + /** + * Which Valhalla answers: the public FOSSGIS one, the TREK services' one through the + * server's relay, or `valhalla_base_url`. Empty means not chosen; see valhallaBase(). + */ + routing_valhalla_provider?: ValhallaProvider | '' dark_mode: boolean | string /** Display currency for Costs. Empty/null = follow each trip's own currency. */ default_currency: string | null diff --git a/client/tests/helpers/msw/handlers/index.ts b/client/tests/helpers/msw/handlers/index.ts index fa2157469..b7710b6ab 100644 --- a/client/tests/helpers/msw/handlers/index.ts +++ b/client/tests/helpers/msw/handlers/index.ts @@ -18,6 +18,7 @@ import { toursHandlers } from './tours'; import { adminHandlers } from './admin'; import { sharedHandlers } from './shared'; import { externalHandlers } from './external'; +import { routingHandlers } from './routing'; export const defaultHandlers = [ ...authHandlers, @@ -40,4 +41,5 @@ export const defaultHandlers = [ ...adminHandlers, ...sharedHandlers, ...externalHandlers, + ...routingHandlers, ]; diff --git a/client/tests/helpers/msw/handlers/routing.ts b/client/tests/helpers/msw/handlers/routing.ts new file mode 100644 index 000000000..fe3baec97 --- /dev/null +++ b/client/tests/helpers/msw/handlers/routing.ts @@ -0,0 +1,13 @@ +import { http, HttpResponse } from 'msw'; + +/** + * The routing relay to the TREK services' Valhalla, answered the way a server + * without an installation key answers it: 503, so the planner turns to the + * public Valhalla as it does there. A test about the relay overrides this + * with server.use(). + */ +export const routingHandlers = [ + http.post('/api/routing/valhalla/:action', () => + HttpResponse.json({ error: 'The TREK routing service is not available on this instance' }, { status: 503 }) + ), +]; diff --git a/client/tests/unit/mobile/admin/MAdminDefaultUserSettings.test.tsx b/client/tests/unit/mobile/admin/MAdminDefaultUserSettings.test.tsx index eb3fd7c4e..72f360879 100644 --- a/client/tests/unit/mobile/admin/MAdminDefaultUserSettings.test.tsx +++ b/client/tests/unit/mobile/admin/MAdminDefaultUserSettings.test.tsx @@ -1,4 +1,4 @@ -// FE-MOB-MDUS-001 to FE-MOB-MDUS-028 +// FE-MOB-MDUS-001 to FE-MOB-MDUS-030 import { describe, it, expect, beforeEach, vi } from 'vitest'; import { render, screen, waitFor, within, fireEvent } from '../../../helpers/render'; import userEvent from '@testing-library/user-event'; @@ -465,3 +465,38 @@ describe('MAdminDefaultUserSettings week start (#2029)', () => { expect(puts).toEqual([{ week_start: 'saturday' }]); }); }); + +describe('MAdminDefaultUserSettings, the routing service', () => { + beforeEach(() => { + resetAllStores(); + seedStore(useAuthStore, { isAuthenticated: true, user: buildAdmin() }); + }); + + it('FE-MOB-MDUS-029: starts on automatic, saves a chosen service and clears it again', async () => { + const { puts } = stubDefaults(); + render(); + const picker = await screen.findByRole('combobox', { name: 'Routing service' }); + expect(picker).toHaveValue(''); + + fireEvent.change(picker, { target: { value: 'trek' } }); + await waitFor(() => expect(puts).toEqual([{ routing_valhalla_provider: 'trek' }])); + await waitFor(() => expect(picker).toHaveValue('trek')); + await waitFor(() => expect(picker).toBeEnabled()); + + fireEvent.change(picker, { target: { value: '' } }); + await waitFor(() => expect(puts[1]).toEqual({ routing_valhalla_provider: null })); + await waitFor(() => expect(picker).toHaveValue('')); + }); + + it('FE-MOB-MDUS-030: shows the stored choice and hides it on a managed instance', async () => { + stubDefaults({ routing_valhalla_provider: 'fossgis' }); + const { unmount } = render(); + expect(await screen.findByRole('combobox', { name: 'Routing service' })).toHaveValue('fossgis'); + unmount(); + + seedStore(useAuthStore, { isAuthenticated: true, user: buildAdmin(), managed: true }); + render(); + await screen.findByText('Default User Settings'); + expect(screen.queryByRole('combobox', { name: 'Routing service' })).not.toBeInTheDocument(); + }); +}); diff --git a/server/src/nest/common/managed.ts b/server/src/nest/common/managed.ts index cc0624508..d7cfb95b7 100644 --- a/server/src/nest/common/managed.ts +++ b/server/src/nest/common/managed.ts @@ -92,6 +92,7 @@ export const MANAGED_LOCKED_SETTING_KEYS = [ 'oidc_registration', 'openweather_api_key', 'routing_base_url', + 'routing_valhalla_provider', // The operator issues a managed install its key through TREK_SERVICES_KEY. 'service_key', 'smtp_from', diff --git a/server/src/nest/settings/settings.service.ts b/server/src/nest/settings/settings.service.ts index 7d4f0993a..732cd124d 100644 --- a/server/src/nest/settings/settings.service.ts +++ b/server/src/nest/settings/settings.service.ts @@ -16,6 +16,7 @@ import { compactPlannerTripViews, normalizeAppearance, plannerTripViewsSchema, + valhallaProviderSchema, type PlannerTripViews, } from '@trek/shared'; @@ -71,6 +72,14 @@ export const DEFAULTABLE_USER_SETTING_KEYS = [ * party they never asked for. */ 'valhalla_base_url', + /** + * Which Valhalla answers: `fossgis` (the public one), `trek` (the TREK services' one, + * relayed by this server with the installation key) or `custom` (valhalla_base_url). + * Unset reads as before the choice existed: an own Valhalla is custom, an own OSRM + * alone means none, and otherwise the TREK services where they can be asked + * (`resolveValhallaProvider`). Same-origin or public, so no restart is needed. + */ + 'routing_valhalla_provider', // CARTO stamps an "API KEY REQUIRED" watermark into keyless tiles (#2054), and // the key is per-instance rather than per-person: defaultable so one admin // value clears the watermark for everybody at once. @@ -104,6 +113,7 @@ const VALID_VALUES: Partial> = { dark_mode: [true, false, 'light', 'dark', 'auto'], map_provider: ['leaflet', 'mapbox-gl', 'maplibre-gl'], llm_provider: ['local', 'openai', 'anthropic'], + routing_valhalla_provider: [...valhallaProviderSchema.options], }; const BOOLEAN_KEYS = new Set([ @@ -130,6 +140,9 @@ const BOOLEAN_KEYS = new Set([ * the whole app stops routing with no catchable error. Refusing it here means * the caller finds out instead of silently breaking their own map. * + * `routing_valhalla_provider` picks between those same instance engines, so it is + * set where they are. + * * Clearing stays open to everyone: the Settings sections send an empty string * while the field is hidden, so a row written before this rule cleans itself up * on the next save instead of blocking it. @@ -139,6 +152,7 @@ export function isAdminOnlyEndpointSetting(key: string, value: unknown): boolean return typeof value === 'string' && value.trim() !== ''; } if (key === 'llm_provider') return value === 'local'; + if (key === 'routing_valhalla_provider') return typeof value === 'string' && value.trim() !== ''; return false; } diff --git a/server/tests/unit/nest/managed-keys.test.ts b/server/tests/unit/nest/managed-keys.test.ts index 5c1d92233..08d0a1096 100644 --- a/server/tests/unit/nest/managed-keys.test.ts +++ b/server/tests/unit/nest/managed-keys.test.ts @@ -69,6 +69,7 @@ describe('managed key assignment', () => { 'oidc_registration', 'openweather_api_key', 'routing_base_url', + 'routing_valhalla_provider', 'service_key', 'smtp_from', 'smtp_host', diff --git a/server/tests/unit/nest/settings.service.test.ts b/server/tests/unit/nest/settings.service.test.ts index 02b45059c..2c11031a4 100644 --- a/server/tests/unit/nest/settings.service.test.ts +++ b/server/tests/unit/nest/settings.service.test.ts @@ -10,7 +10,7 @@ import { db as testDb } from '../../../src/db/database'; import { Settings } from '../../../src/db/entities/Settings.entity'; import { Trips } from '../../../src/db/entities/Trips.entity'; -import { SettingsService } from '../../../src/nest/settings/settings.service'; +import { SettingsService, isAdminOnlyEndpointSetting } from '../../../src/nest/settings/settings.service'; import { TripMembershipModule } from '../../../src/nest/trip-membership/trip-membership.module'; import { TripMembershipService } from '../../../src/nest/trip-membership/trip-membership.service'; import { addTripMember, createTrip, createUser } from '../../helpers/factories'; @@ -394,6 +394,22 @@ describe('legacy quirk fixes', () => { expect((await svc.getAdminUserDefaults()).week_start).toBeUndefined(); }); + it('SET-SVC-041 — the routing service default takes fossgis, trek or custom and refuses anything else', async () => { + await svc.setAdminUserDefaults({ routing_valhalla_provider: 'trek' }); + expect((await svc.getAdminUserDefaults()).routing_valhalla_provider).toBe('trek'); + await expect(svc.setAdminUserDefaults({ routing_valhalla_provider: 'osrm' })).rejects.toThrow( + /Invalid value for routing_valhalla_provider/, + ); + await svc.setAdminUserDefaults({ routing_valhalla_provider: null }); + expect((await svc.getAdminUserDefaults()).routing_valhalla_provider).toBeUndefined(); + }); + + it('SET-SVC-042 — only an admin picks the routing service; clearing a personal row stays open', () => { + expect(isAdminOnlyEndpointSetting('routing_valhalla_provider', 'fossgis')).toBe(true); + expect(isAdminOnlyEndpointSetting('routing_valhalla_provider', '')).toBe(false); + expect(isAdminOnlyEndpointSetting('routing_valhalla_provider', null)).toBe(false); + }); + it('SET-SVC-028 — a nulled defaultable key falls through to the admin default', async () => { const { user } = createUser(testDb); await svc.setAdminUserDefaults({ mapbox_style: 'admin-style' }); diff --git a/shared/src/i18n/ar/settings.ts b/shared/src/i18n/ar/settings.ts index 66cb495ea..51ab4c459 100644 --- a/shared/src/i18n/ar/settings.ts +++ b/shared/src/i18n/ar/settings.ts @@ -28,7 +28,14 @@ const settings: TranslationStrings = { 'خادم OSRM خاص بك. اتركه فارغًا لاستخدام الخوادم العامة التي تسمح بطلب واحد تقريبًا في الثانية — يكفي ليوم واحد، وضيّق لرحلة برية. يسري بعد إعادة تشغيل الخادم.', 'settings.valhallaBase': 'خادم Valhalla خاص بك', 'settings.valhallaBaseHint': - 'يستخدم TREK خدمة Valhalla العامة من FOSSGIS افتراضيًا لتجنب الطرق ذات الرسوم والطرق السريعة والعبّارات. أدخل رابط خادم Valhalla الخاص بك هنا لاستخدامه بدلًا منها. إذا تم إعداد خادم توجيه خاص فقط، فلن تُستخدم خدمة Valhalla العامة. بعد إدخال رابط خاص، أعد تشغيل الخادم وحمّل الصفحة مجددًا.', + 'خادم Valhalla خاص بك، يُسأل عندما تكون خدمة التوجيه أعلاه مضبوطة عليه أو على «تلقائي». إذا لم يُضبط سوى خادم توجيه خاص ولم تُختر أي خدمة توجيه، فلا يُسأل أي خادم Valhalla. بعد إدخال الرابط، أعد تشغيل الخادم وحمّل الصفحة مجددًا.', + 'settings.valhallaProvider': 'خدمة التوجيه', + 'settings.valhallaProviderHint': + 'تجيب عمّا لا يستطيعه OSRM: مسارات بلا طرق برسوم أو طرق سريعة أو عبّارات، ومسارات الجولات وارتفاعاتها وطرقها. تُسأل خدمات TREK عبر هذا الخادم؛ وإذا تعذّر عليها الرد تتولى خدمة Valhalla العامة من FOSSGIS المهمة. يسأل الوضع التلقائي خدمات TREK ما لم يُضبط خادم Valhalla خاص أو خادم توجيه خاص فقط.', + 'settings.valhallaProviderOption.auto': 'تلقائي', + 'settings.valhallaProviderOption.trek': 'خدمات TREK', + 'settings.valhallaProviderOption.fossgis': 'Valhalla العامة (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'خادم Valhalla خاص', 'settings.mapHint': 'قالب URL لبلاطات الخريطة', 'settings.mapProvider': 'مزود الخريطة', 'settings.mapProviderHint': 'يؤثر على خرائط Trip Planner و Journey. يستخدم Atlas دائمًا Leaflet.', diff --git a/shared/src/i18n/az/settings.ts b/shared/src/i18n/az/settings.ts index d5aaae786..8bb12a16e 100644 --- a/shared/src/i18n/az/settings.ts +++ b/shared/src/i18n/az/settings.ts @@ -42,7 +42,14 @@ const settings: TranslationStrings = { 'Öz OSRM instansiyanız. Sahə boş olduqda saniyədə təxminən bir sorğuya icazə verən ictimai serverlər istifadə edilir — bu, bir günlük plan üçün kifayətdir, avtomobil səyahəti üçün isə məhdud ola bilər. Server yenidən başladıldıqdan sonra qüvvəyə minir.', 'settings.valhallaBase': 'Şəxsi Valhalla instansiyası', 'settings.valhallaBaseHint': - 'TREK ödənişli yollardan, avtomagistrallardan və bərələrdən yayınmaq üçün standart olaraq ictimai FOSSGIS Valhalla xidmətindən istifadə edir. Əvəzində öz Valhalla URL-inizdən istifadə etmək üçün onu buraya daxil edin. Yalnız fərdi marşrut instansiyası konfiqurasiya edilərsə, ictimai Valhalla istifadə olunmur. Fərdi URL daxil etdikdən sonra serveri yenidən başladın və səhifəni yeniləyin.', + 'Öz Valhalla-nız; yuxarıdakı marşrut xidməti ona və ya Avtomatik rejimə qurulduqda soruşulur. Yalnız öz marşrut instansiyanız konfiqurasiya edilibsə və marşrut xidməti seçilməyibsə, heç bir Valhalla soruşulmur. URL daxil etdikdən sonra serveri yenidən başladın və səhifəni yeniləyin.', + 'settings.valhallaProvider': 'Marşrut xidməti', + 'settings.valhallaProviderHint': + 'OSRM-in bacarmadığına cavab verir: ödənişli yollar, avtomagistrallar və ya bərələr olmadan marşrutlar, həmçinin turların marşrutları, hündürlükləri və cığırları. TREK xidmətləri bu server vasitəsilə soruşulur; cavab verə bilmədikdə ictimai FOSSGIS Valhalla əvəz edir. Avtomatik rejim, öz Valhalla-nız və ya yalnız öz marşrut instansiyanız təyin edilməyibsə, TREK xidmətlərini soruşur.', + 'settings.valhallaProviderOption.auto': 'Avtomatik', + 'settings.valhallaProviderOption.trek': 'TREK xidmətləri', + 'settings.valhallaProviderOption.fossgis': 'İctimai Valhalla (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Öz Valhalla instansiyası', 'settings.mapHint': 'Xəritə plitələri üçün URL şablonu', 'settings.mapProvider': 'Xəritə provayderi', 'settings.mapProviderHint': diff --git a/shared/src/i18n/br/settings.ts b/shared/src/i18n/br/settings.ts index b39fde35b..9552b4adc 100644 --- a/shared/src/i18n/br/settings.ts +++ b/shared/src/i18n/br/settings.ts @@ -30,7 +30,14 @@ const settings: TranslationStrings = { 'Uma instância própria do OSRM. Vazio usa os servidores públicos, que permitem cerca de uma requisição por segundo — suficiente para um dia, apertado para uma viagem de carro. Passa a valer após reiniciar o servidor.', 'settings.valhallaBase': 'Instância Valhalla própria', 'settings.valhallaBaseHint': - 'Por padrão, o TREK usa a Valhalla pública da FOSSGIS para evitar pedágios, rodovias e balsas. Insira aqui a URL da sua própria Valhalla para usá-la no lugar. Se apenas uma instância de roteamento própria estiver configurada, a Valhalla pública não será usada. Após inserir uma URL própria, reinicie o servidor e recarregue a página.', + 'Uma Valhalla própria, consultada quando o serviço de rotas acima está definido para ela ou para Automático. Se apenas uma instância de roteamento própria estiver configurada e nenhum serviço de rotas for escolhido, nenhuma Valhalla é consultada. Após inserir uma URL, reinicie o servidor e recarregue a página.', + 'settings.valhallaProvider': 'Serviço de rotas', + 'settings.valhallaProviderHint': + 'Responde ao que o OSRM não consegue: rotas sem pedágios, rodovias ou balsas, e as rotas, altitudes e caminhos dos passeios. Os serviços TREK são consultados por meio deste servidor; quando não conseguem responder, a Valhalla pública da FOSSGIS assume. Automático consulta os serviços TREK, a menos que uma Valhalla própria ou apenas uma instância de roteamento própria esteja configurada.', + 'settings.valhallaProviderOption.auto': 'Automático', + 'settings.valhallaProviderOption.trek': 'Serviços TREK', + 'settings.valhallaProviderOption.fossgis': 'Valhalla pública (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Instância Valhalla própria', 'settings.mapHint': 'URL do modelo de blocos do mapa', 'settings.mapProvider': 'Provedor de mapa', 'settings.mapProviderHint': 'Afeta os mapas do Planejador de Viagem e Diário. Atlas sempre usa Leaflet.', diff --git a/shared/src/i18n/ca/settings.ts b/shared/src/i18n/ca/settings.ts index 60d80e2f2..a646ac2c7 100644 --- a/shared/src/i18n/ca/settings.ts +++ b/shared/src/i18n/ca/settings.ts @@ -19,7 +19,14 @@ const settings: TranslationStrings = { 'Una instància pròpia d’OSRM. Buit fa servir els servidors públics, que permeten aproximadament una petició per segon: prou per a un dia, just per a un viatge llarg. Té efecte després de reiniciar el servidor.', 'settings.valhallaBase': 'Instància Valhalla pròpia', 'settings.valhallaBaseHint': - 'TREK utilitza per defecte la Valhalla pública de FOSSGIS per evitar peatges, autopistes i ferris. Introdueix aquí l’URL de la teva Valhalla per utilitzar-la en lloc de la pública. Si només hi ha una instància d’encaminament pròpia configurada, no s’utilitza la Valhalla pública. Després d’introduir una URL pròpia, reinicia el servidor i torna a carregar la pàgina.', + 'Una Valhalla pròpia, consultada quan el servei de rutes de dalt hi està configurat o està en Automàtic. Si només hi ha una instància d’encaminament pròpia configurada i no s’ha triat cap servei de rutes, no es consulta cap Valhalla. Després d’introduir una URL, reinicia el servidor i torna a carregar la pàgina.', + 'settings.valhallaProvider': 'Servei de rutes', + 'settings.valhallaProviderHint': + 'Respon el que OSRM no pot: rutes sense peatges, autopistes ni ferris, i les rutes, altituds i camins de les excursions. Els serveis de TREK es consulten a través d’aquest servidor; si no poden respondre, pren el relleu la Valhalla pública de FOSSGIS. Automàtic consulta els serveis de TREK, tret que hi hagi configurada una Valhalla pròpia o només una instància d’encaminament pròpia.', + 'settings.valhallaProviderOption.auto': 'Automàtic', + 'settings.valhallaProviderOption.trek': 'Serveis de TREK', + 'settings.valhallaProviderOption.fossgis': 'Valhalla pública (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Instància de Valhalla pròpia', 'settings.mapHint': "Plantilla d'URL per als mosaics del mapa", 'settings.mapProvider': 'Proveïdor de mapa', 'settings.mapProviderHint': 'Afecta els mapes de Trip Planner i Journey. Atles sempre utilitza Leaflet.', diff --git a/shared/src/i18n/cs/settings.ts b/shared/src/i18n/cs/settings.ts index 06d17d602..d6ab0755f 100644 --- a/shared/src/i18n/cs/settings.ts +++ b/shared/src/i18n/cs/settings.ts @@ -29,7 +29,14 @@ const settings: TranslationStrings = { 'Vlastní instance OSRM. Prázdné použije veřejné servery s limitem asi jednoho požadavku za sekundu — na den to stačí, na road trip je to málo. Projeví se po restartu serveru.', 'settings.valhallaBase': 'Vlastní instance Valhalla', 'settings.valhallaBaseHint': - 'TREK ve výchozím nastavení používá veřejnou Valhallu FOSSGIS k vyhýbání se mýtnému, dálnicím a trajektům. Zde můžete zadat URL vlastní Valhally a používat ji místo veřejné. Pokud je nastavena pouze vlastní směrovací instance, veřejná Valhalla se nepoužije. Po zadání vlastní URL restartujte server a znovu načtěte stránku.', + 'Vlastní Valhalla, dotazovaná, když je směrovací služba výše nastavena na ni nebo na Automaticky. Pokud je nastavena jen vlastní směrovací instance a žádná směrovací služba není zvolena, žádná Valhalla se nedotazuje. Po zadání URL restartujte server a znovu načtěte stránku.', + 'settings.valhallaProvider': 'Směrovací služba', + 'settings.valhallaProviderHint': + 'Odpovídá na to, co OSRM neumí: trasy bez mýtného, dálnic nebo trajektů a trasy, výšky a cesty výletů. Služby TREK se dotazují přes tento server; když nemohou odpovědět, převezme to veřejná Valhalla FOSSGIS. Automaticky se ptá služeb TREK, pokud není nastavena vlastní Valhalla nebo jen vlastní směrovací instance.', + 'settings.valhallaProviderOption.auto': 'Automaticky', + 'settings.valhallaProviderOption.trek': 'Služby TREK', + 'settings.valhallaProviderOption.fossgis': 'Veřejná Valhalla (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Vlastní instance Valhally', 'settings.mapHint': 'URL šablony pro mapové dlaždice', 'settings.mapProvider': 'Poskytovatel mapy', 'settings.mapProviderHint': 'Ovlivňuje mapy v Trip Planneru a Journey. Atlas vždy používá Leaflet.', diff --git a/shared/src/i18n/de/settings.ts b/shared/src/i18n/de/settings.ts index 574bc2028..8ec3a4ab6 100644 --- a/shared/src/i18n/de/settings.ts +++ b/shared/src/i18n/de/settings.ts @@ -30,7 +30,14 @@ const settings: TranslationStrings = { 'Eine eigene OSRM-Instanz. Leer nutzt die öffentlichen Server, die etwa eine Anfrage pro Sekunde erlauben — für einen Tag genug, für einen Roadtrip knapp. Wirkt erst nach einem Serverneustart.', 'settings.valhallaBase': 'Eigene Valhalla-Instanz', 'settings.valhallaBaseHint': - 'Zum Meiden von Mautstraßen, Autobahnen und Fähren nutzt TREK standardmäßig die öffentliche FOSSGIS-Valhalla. Hier kannst du stattdessen eine eigene Valhalla-URL eintragen. Ist nur eine eigene Routing-Instanz konfiguriert, wird die öffentliche Valhalla nicht verwendet. Nach dem Eintragen einer eigenen URL den Server neu starten und die Seite neu laden.', + 'Eine eigene Valhalla, gefragt, wenn der Routing-Dienst oben auf sie oder auf Automatisch steht. Ist nur eine eigene Routing-Instanz konfiguriert und kein Routing-Dienst gewählt, wird keine Valhalla gefragt. Nach dem Eintragen einer URL den Server neu starten und die Seite neu laden.', + 'settings.valhallaProvider': 'Routing-Dienst', + 'settings.valhallaProviderHint': + 'Beantwortet, was OSRM nicht kann: Routen ohne Maut, Autobahn oder Fähre sowie Routen, Höhen und Wege von Touren. Die TREK-Dienste werden über diesen Server gefragt; wo sie nicht antworten können, springt die öffentliche FOSSGIS-Valhalla ein. Automatisch fragt die TREK-Dienste, außer eine eigene Valhalla oder nur eine eigene Routing-Instanz ist eingetragen.', + 'settings.valhallaProviderOption.auto': 'Automatisch', + 'settings.valhallaProviderOption.trek': 'TREK-Dienste', + 'settings.valhallaProviderOption.fossgis': 'Öffentliche Valhalla (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Eigene Valhalla-Instanz', 'settings.mapHint': 'URL-Template für die Kartenkacheln', 'settings.mapProvider': 'Kartenanbieter', 'settings.mapProviderHint': 'Gilt für Trip Planner und Journey. Atlas nutzt immer Leaflet.', diff --git a/shared/src/i18n/en/settings.ts b/shared/src/i18n/en/settings.ts index 124612a4a..8d89066e3 100644 --- a/shared/src/i18n/en/settings.ts +++ b/shared/src/i18n/en/settings.ts @@ -38,7 +38,14 @@ const settings: TranslationStrings = { 'An OSRM instance of your own. Empty uses the public servers, which allow about one request a second — enough for a day, tight for a road trip. Takes effect after a server restart.', 'settings.valhallaBase': 'Own Valhalla instance', 'settings.valhallaBaseHint': - 'TREK uses the public FOSSGIS Valhalla by default to avoid toll roads, motorways and ferries. Enter your own Valhalla URL here to use it instead. If only a custom routing instance is configured, the public Valhalla is not used. After entering a custom URL, restart the server and reload the page.', + 'A Valhalla of your own, asked when the routing service above is set to it or to automatic. If only an own routing engine is configured and no routing service is chosen, no Valhalla is asked. After entering a URL, restart the server and reload the page.', + 'settings.valhallaProvider': 'Routing service', + 'settings.valhallaProviderHint': + 'Answers what OSRM cannot: routes that avoid tolls, motorways or ferries, and the routes, heights and ways of tours. The TREK services are asked through this server; where they cannot answer, the public FOSSGIS Valhalla takes over. Automatic asks the TREK services unless an own Valhalla or only an own routing engine is set.', + 'settings.valhallaProviderOption.auto': 'Automatic', + 'settings.valhallaProviderOption.trek': 'TREK services', + 'settings.valhallaProviderOption.fossgis': 'Public Valhalla (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Own Valhalla instance', 'settings.mapHint': 'URL template for map tiles', 'settings.mapProvider': 'Map Provider', 'settings.mapProviderHint': 'Affects Trip Planner and Journey maps. Atlas always uses Leaflet.', diff --git a/shared/src/i18n/es/settings.ts b/shared/src/i18n/es/settings.ts index 0f48cb609..c74cbb539 100644 --- a/shared/src/i18n/es/settings.ts +++ b/shared/src/i18n/es/settings.ts @@ -29,7 +29,14 @@ const settings: TranslationStrings = { 'Una instancia propia de OSRM. Vacío usa los servidores públicos, que permiten cerca de una petición por segundo: suficiente para un día, justo para una ruta larga. Surte efecto tras reiniciar el servidor.', 'settings.valhallaBase': 'Instancia de Valhalla propia', 'settings.valhallaBaseHint': - 'TREK usa por defecto la Valhalla pública de FOSSGIS para evitar peajes, autopistas y ferris. Introduce aquí la URL de tu propia Valhalla para usarla en su lugar. Si solo se configura una instancia de rutas propia, no se utiliza la Valhalla pública. Tras introducir una URL propia, reinicia el servidor y recarga la página.', + 'Una Valhalla propia, consultada cuando el servicio de rutas de arriba está ajustado a ella o en Automático. Si solo se configura una instancia de rutas propia y no se elige ningún servicio de rutas, no se consulta ninguna Valhalla. Tras introducir una URL, reinicia el servidor y recarga la página.', + 'settings.valhallaProvider': 'Servicio de rutas', + 'settings.valhallaProviderHint': + 'Responde a lo que OSRM no puede: rutas sin peajes, autopistas ni ferris, y las rutas, altitudes y caminos de las excursiones. Los servicios de TREK se consultan a través de este servidor; si no pueden responder, la Valhalla pública de FOSSGIS toma el relevo. Automático consulta los servicios de TREK, salvo que haya configurada una Valhalla propia o solo una instancia de rutas propia.', + 'settings.valhallaProviderOption.auto': 'Automático', + 'settings.valhallaProviderOption.trek': 'Servicios de TREK', + 'settings.valhallaProviderOption.fossgis': 'Valhalla pública (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Instancia de Valhalla propia', 'settings.mapHint': 'Plantilla de URL para los mosaicos del mapa', 'settings.mapProvider': 'Proveedor de mapa', 'settings.mapProviderHint': 'Afecta a los mapas de Trip Planner y Journey. Atlas siempre usa Leaflet.', diff --git a/shared/src/i18n/et/settings.ts b/shared/src/i18n/et/settings.ts index 1f1517d10..0d5ae79bd 100644 --- a/shared/src/i18n/et/settings.ts +++ b/shared/src/i18n/et/settings.ts @@ -38,7 +38,14 @@ const settings: TranslationStrings = { 'Sinu enda OSRM-server. Tühja välja korral kasutatakse avalikke servereid, mis lubavad umbes ühe päringu sekundis — piisav ühe päeva, kuid napp autoreisi jaoks. Jõustub pärast serveri taaskäivitamist.', 'settings.valhallaBase': 'Oma Valhalla server', 'settings.valhallaBaseHint': - 'TREK kasutab tasuliste teede, kiirteede ja praamide vältimiseks vaikimisi avalikku FOSSGIS Valhallat. Enda Valhalla kasutamiseks sisesta siia selle URL. Kui seadistatud on ainult oma marsruutimisserver, avalikku Valhallat ei kasutata. Pärast oma URL-i sisestamist taaskäivita server ja laadi leht uuesti.', + 'Oma Valhalla, millelt küsitakse, kui ülal olev marsruutimisteenus on seatud sellele või automaatsele. Kui seadistatud on ainult oma marsruutimisserver ja teenust pole valitud, ei küsita ühelgi Valhallal. Pärast URL-i sisestamist taaskäivita server ja laadi leht uuesti.', + 'settings.valhallaProvider': 'Marsruutimisteenus', + 'settings.valhallaProviderHint': + 'Vastab sellele, mida OSRM ei oska: marsruudid ilma teemaksu, kiirteede või praamideta ning matkade marsruudid, kõrgused ja rajad. TREKi teenustelt küsitakse selle serveri kaudu; kui need ei saa vastata, võtab üle FOSSGIS-i avalik Valhalla. Automaatne küsib TREKi teenustelt, kui pole seadistatud oma Valhallat või ainult oma marsruutimisserverit.', + 'settings.valhallaProviderOption.auto': 'Automaatne', + 'settings.valhallaProviderOption.trek': 'TREKi teenused', + 'settings.valhallaProviderOption.fossgis': 'Avalik Valhalla (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Oma Valhalla server', 'settings.mapHint': 'Kaardipaanide URL-i mall', 'settings.mapProvider': 'Kaarditeenus', 'settings.mapProviderHint': 'Mõjutab reisiplaneerija ja reisilugude kaarte. Atlas kasutab alati Leafleti.', diff --git a/shared/src/i18n/fr/settings.ts b/shared/src/i18n/fr/settings.ts index e2214b652..2eed01d40 100644 --- a/shared/src/i18n/fr/settings.ts +++ b/shared/src/i18n/fr/settings.ts @@ -29,7 +29,14 @@ const settings: TranslationStrings = { 'Votre propre instance OSRM. Vide utilise les serveurs publics, limités à environ une requête par seconde : suffisant pour une journée, juste pour un road trip. Prend effet après un redémarrage du serveur.', 'settings.valhallaBase': 'Instance Valhalla propre', 'settings.valhallaBaseHint': - 'TREK utilise par défaut la Valhalla publique de FOSSGIS pour éviter les péages, autoroutes et ferries. Saisissez ici l’URL de votre propre Valhalla pour l’utiliser à la place. Si seule une instance de routage personnalisée est configurée, la Valhalla publique n’est pas utilisée. Après avoir saisi une URL personnalisée, redémarrez le serveur et rechargez la page.', + 'Une Valhalla personnelle, interrogée lorsque le service d’itinéraire ci-dessus est réglé sur elle ou sur Automatique. Si seule une instance de routage personnalisée est configurée et qu’aucun service d’itinéraire n’est choisi, aucune Valhalla n’est interrogée. Après avoir saisi une URL, redémarrez le serveur et rechargez la page.', + 'settings.valhallaProvider': 'Service d’itinéraire', + 'settings.valhallaProviderHint': + 'Répond à ce qu’OSRM ne sait pas faire : des itinéraires sans péages, autoroutes ni ferries, ainsi que les itinéraires, altitudes et chemins des randonnées. Les services TREK sont interrogés via ce serveur ; s’ils ne peuvent pas répondre, la Valhalla publique de FOSSGIS prend le relais. Automatique interroge les services TREK, sauf si une Valhalla personnelle ou seulement une instance de routage personnalisée est configurée.', + 'settings.valhallaProviderOption.auto': 'Automatique', + 'settings.valhallaProviderOption.trek': 'Services TREK', + 'settings.valhallaProviderOption.fossgis': 'Valhalla publique (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Instance Valhalla personnelle', 'settings.mapHint': "Modèle d'URL pour les tuiles de carte", 'settings.mapProvider': 'Fournisseur de carte', 'settings.mapProviderHint': 'Affecte les cartes Trip Planner et Journey. Atlas utilise toujours Leaflet.', diff --git a/shared/src/i18n/gr/settings.ts b/shared/src/i18n/gr/settings.ts index 731bf6a81..1319a7ad5 100644 --- a/shared/src/i18n/gr/settings.ts +++ b/shared/src/i18n/gr/settings.ts @@ -30,7 +30,14 @@ const settings: TranslationStrings = { 'Δική σας εγκατάσταση OSRM. Κενό σημαίνει τους δημόσιους διακομιστές, που επιτρέπουν περίπου ένα αίτημα ανά δευτερόλεπτο: αρκεί για μία ημέρα, λίγο για ένα οδικό ταξίδι. Ισχύει μετά από επανεκκίνηση του διακομιστή.', 'settings.valhallaBase': 'Δική σας υπηρεσία Valhalla', 'settings.valhallaBaseHint': - 'Το TREK χρησιμοποιεί από προεπιλογή τη δημόσια Valhalla της FOSSGIS για την αποφυγή διοδίων, αυτοκινητοδρόμων και πορθμείων. Εισαγάγετε εδώ τη διεύθυνση URL της δικής σας Valhalla για να τη χρησιμοποιήσετε αντί της δημόσιας. Αν έχει ρυθμιστεί μόνο ιδιωτική υπηρεσία δρομολόγησης, η δημόσια Valhalla δεν χρησιμοποιείται. Αφού εισαγάγετε ιδιωτική διεύθυνση URL, επανεκκινήστε τον διακομιστή και φορτώστε ξανά τη σελίδα.', + 'Μια δική σας Valhalla, που ερωτάται όταν η υπηρεσία δρομολόγησης παραπάνω έχει οριστεί σε αυτήν ή στο Αυτόματα. Αν έχει ρυθμιστεί μόνο δική σας υπηρεσία δρομολόγησης και δεν έχει επιλεγεί υπηρεσία, δεν ερωτάται καμία Valhalla. Αφού εισαγάγετε διεύθυνση URL, επανεκκινήστε τον διακομιστή και φορτώστε ξανά τη σελίδα.', + 'settings.valhallaProvider': 'Υπηρεσία δρομολόγησης', + 'settings.valhallaProviderHint': + 'Απαντά σε ό,τι δεν μπορεί το OSRM: διαδρομές χωρίς διόδια, αυτοκινητοδρόμους ή πορθμεία, καθώς και τις διαδρομές, τα υψόμετρα και τα μονοπάτια των εκδρομών. Οι υπηρεσίες TREK ερωτώνται μέσω αυτού του διακομιστή· όταν δεν μπορούν να απαντήσουν, αναλαμβάνει η δημόσια Valhalla της FOSSGIS. Η αυτόματη επιλογή ρωτά τις υπηρεσίες TREK, εκτός αν έχει οριστεί δική σας Valhalla ή μόνο δική σας υπηρεσία δρομολόγησης.', + 'settings.valhallaProviderOption.auto': 'Αυτόματα', + 'settings.valhallaProviderOption.trek': 'Υπηρεσίες TREK', + 'settings.valhallaProviderOption.fossgis': 'Δημόσια Valhalla (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Δική σας Valhalla', 'settings.mapHint': 'Πρότυπο URL για πλακίδια χάρτη', 'settings.mapProvider': 'Πάροχος Χάρτη', 'settings.mapProviderHint': diff --git a/shared/src/i18n/hu/settings.ts b/shared/src/i18n/hu/settings.ts index 71687d230..9cc720e27 100644 --- a/shared/src/i18n/hu/settings.ts +++ b/shared/src/i18n/hu/settings.ts @@ -29,7 +29,14 @@ const settings: TranslationStrings = { 'Saját OSRM-példány. Üresen hagyva a nyilvános kiszolgálókat használja, amelyek másodpercenként körülbelül egy kérést engednek — egy napra elég, egy autós útra kevés. A kiszolgáló újraindítása után lép életbe.', 'settings.valhallaBase': 'Saját Valhalla-példány', 'settings.valhallaBaseHint': - 'A TREK alapértelmezés szerint a FOSSGIS nyilvános Valhalláját használja a fizetős utak, autópályák és kompok elkerüléséhez. Itt megadhatja saját Valhallája URL-jét, hogy azt használja helyette. Ha csak saját útvonaltervező van beállítva, a nyilvános Valhalla nem használatos. Saját URL megadása után indítsa újra a szervert, és töltse újra az oldalt.', + 'Saját Valhalla, amelyet akkor kérdez, ha a fenti útvonaltervező szolgáltatás rá vagy Automatikusra van állítva. Ha csak saját útvonaltervező van beállítva, és nincs kiválasztva szolgáltatás, egyik Valhalla sem kap kérdést. URL megadása után indítsa újra a szervert, és töltse újra az oldalt.', + 'settings.valhallaProvider': 'Útvonaltervező szolgáltatás', + 'settings.valhallaProviderHint': + 'Arra válaszol, amire az OSRM nem képes: fizetős utak, autópályák vagy kompok nélküli útvonalakra, valamint a túrák útvonalaira, magasságaira és ösvényeire. A TREK-szolgáltatásokat ez a szerver kérdezi meg; ha nem tudnak válaszolni, a FOSSGIS nyilvános Valhallája veszi át. Az Automatikus a TREK-szolgáltatásokat kérdezi, hacsak nincs megadva saját Valhalla vagy csak saját útvonaltervező.', + 'settings.valhallaProviderOption.auto': 'Automatikus', + 'settings.valhallaProviderOption.trek': 'TREK-szolgáltatások', + 'settings.valhallaProviderOption.fossgis': 'Nyilvános Valhalla (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Saját Valhalla-példány', 'settings.mapHint': 'URL sablon a térképcsempékhez', 'settings.mapProvider': 'Térkép szolgáltató', 'settings.mapProviderHint': 'A Trip Planner és Journey térképekre érvényes. Az Atlas mindig Leafletet használ.', diff --git a/shared/src/i18n/id/settings.ts b/shared/src/i18n/id/settings.ts index 4e9e2edec..1ea62b350 100644 --- a/shared/src/i18n/id/settings.ts +++ b/shared/src/i18n/id/settings.ts @@ -29,7 +29,14 @@ const settings: TranslationStrings = { 'Instans OSRM milik sendiri. Kosong berarti server publik, yang mengizinkan sekitar satu permintaan per detik — cukup untuk sehari, mepet untuk perjalanan darat. Berlaku setelah server dimulai ulang.', 'settings.valhallaBase': 'Instans Valhalla sendiri', 'settings.valhallaBaseHint': - 'Secara bawaan, TREK menggunakan Valhalla publik FOSSGIS untuk menghindari tol, jalan bebas hambatan, dan feri. Masukkan URL Valhalla Anda sendiri di sini untuk menggunakannya sebagai pengganti. Jika hanya instans perutean sendiri yang dikonfigurasi, Valhalla publik tidak digunakan. Setelah memasukkan URL sendiri, mulai ulang server dan muat ulang halaman.', + 'Valhalla milik Anda sendiri, ditanyakan saat layanan perutean di atas diatur ke sana atau ke Otomatis. Jika hanya instans perutean sendiri yang dikonfigurasi dan tidak ada layanan perutean yang dipilih, tidak ada Valhalla yang ditanyakan. Setelah memasukkan URL, mulai ulang server dan muat ulang halaman.', + 'settings.valhallaProvider': 'Layanan perutean', + 'settings.valhallaProviderHint': + 'Menjawab apa yang tidak bisa dilakukan OSRM: rute tanpa tol, jalan bebas hambatan, atau feri, serta rute, ketinggian, dan jalur tur. Layanan TREK ditanyakan melalui server ini; jika tidak dapat menjawab, Valhalla publik FOSSGIS mengambil alih. Otomatis menanyakan layanan TREK, kecuali Valhalla sendiri atau hanya instans perutean sendiri yang diatur.', + 'settings.valhallaProviderOption.auto': 'Otomatis', + 'settings.valhallaProviderOption.trek': 'Layanan TREK', + 'settings.valhallaProviderOption.fossgis': 'Valhalla publik (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Instans Valhalla sendiri', 'settings.mapHint': 'Template URL untuk tile peta', 'settings.mapProvider': 'Penyedia peta', 'settings.mapProviderHint': 'Berlaku untuk peta Trip Planner dan Journey. Atlas selalu menggunakan Leaflet.', diff --git a/shared/src/i18n/it/settings.ts b/shared/src/i18n/it/settings.ts index 4336277a9..396157510 100644 --- a/shared/src/i18n/it/settings.ts +++ b/shared/src/i18n/it/settings.ts @@ -29,7 +29,14 @@ const settings: TranslationStrings = { 'Una tua istanza OSRM. Vuoto usa i server pubblici, che consentono circa una richiesta al secondo: sufficiente per un giorno, poco per un viaggio in auto. Ha effetto dopo il riavvio del server.', 'settings.valhallaBase': 'Istanza Valhalla propria', 'settings.valhallaBaseHint': - 'TREK usa per impostazione predefinita la Valhalla pubblica di FOSSGIS per evitare pedaggi, autostrade e traghetti. Inserisci qui l’URL della tua Valhalla per usarla al suo posto. Se è configurata solo un’istanza di routing personalizzata, la Valhalla pubblica non viene usata. Dopo aver inserito un URL personalizzato, riavvia il server e ricarica la pagina.', + 'Una Valhalla personale, interrogata quando il servizio di percorsi qui sopra è impostato su di essa o su Automatico. Se è configurata solo un’istanza di routing personalizzata e non è scelto alcun servizio di percorsi, nessuna Valhalla viene interrogata. Dopo aver inserito un URL, riavvia il server e ricarica la pagina.', + 'settings.valhallaProvider': 'Servizio di percorsi', + 'settings.valhallaProviderHint': + 'Risponde a ciò che OSRM non sa fare: percorsi senza pedaggi, autostrade o traghetti, e i percorsi, le altitudini e i sentieri delle escursioni. I servizi TREK vengono interrogati tramite questo server; se non possono rispondere, subentra la Valhalla pubblica di FOSSGIS. Automatico interroga i servizi TREK, a meno che non sia configurata una Valhalla propria o solo un’istanza di routing personalizzata.', + 'settings.valhallaProviderOption.auto': 'Automatico', + 'settings.valhallaProviderOption.trek': 'Servizi TREK', + 'settings.valhallaProviderOption.fossgis': 'Valhalla pubblica (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Istanza Valhalla personale', 'settings.mapHint': 'Modello URL per i tile della mappa', 'settings.mapProvider': 'Provider mappa', 'settings.mapProviderHint': 'Influisce sulle mappe Trip Planner e Journey. Atlas usa sempre Leaflet.', diff --git a/shared/src/i18n/ja/settings.ts b/shared/src/i18n/ja/settings.ts index ce0dea7ce..7086ddbd9 100644 --- a/shared/src/i18n/ja/settings.ts +++ b/shared/src/i18n/ja/settings.ts @@ -29,7 +29,14 @@ const settings: TranslationStrings = { '自前の OSRM インスタンス。空欄なら公開サーバーを使いますが、毎秒 1 リクエスト程度の制限があり、1 日分には足りてもロードトリップには足りません。サーバー再起動後に反映されます。', 'settings.valhallaBase': '自前の Valhalla インスタンス', 'settings.valhallaBaseHint': - 'TREKは、有料道路、高速道路、フェリーを避けるために、標準でFOSSGISの公開Valhallaを使用します。独自のValhallaを代わりに使う場合は、ここにURLを入力してください。独自のルーティングサーバーのみが設定されている場合、公開Valhallaは使用されません。独自のURLを入力した後は、サーバーを再起動し、ページを再読み込みしてください。', + '独自のValhallaです。上のルーティングサービスがこれか「自動」に設定されているときに問い合わせます。独自のルーティングサーバーのみが設定され、ルーティングサービスが選ばれていない場合、Valhallaには問い合わせません。URLを入力した後は、サーバーを再起動し、ページを再読み込みしてください。', + 'settings.valhallaProvider': 'ルーティングサービス', + 'settings.valhallaProviderHint': + 'OSRMにできないことに答えます:有料道路・高速道路・フェリーを避けるルートと、ツアーのルート・標高・道です。TREKサービスへの問い合わせはこのサーバー経由で行われ、応答できない場合はFOSSGISの公開Valhallaが引き継ぎます。「自動」は、独自のValhallaや独自のルーティングサーバーのみが設定されていない限り、TREKサービスに問い合わせます。', + 'settings.valhallaProviderOption.auto': '自動', + 'settings.valhallaProviderOption.trek': 'TREKサービス', + 'settings.valhallaProviderOption.fossgis': '公開Valhalla(FOSSGIS)', + 'settings.valhallaProviderOption.custom': '独自のValhalla', 'settings.mapHint': '地図タイルのURLテンプレート', 'settings.mapProvider': '地図プロバイダー', 'settings.mapProviderHint': '旅程プランナーと日記地図に影響します。Atlas は常に Leaflet を使用します。', diff --git a/shared/src/i18n/ko/settings.ts b/shared/src/i18n/ko/settings.ts index a67000639..495ad1d35 100644 --- a/shared/src/i18n/ko/settings.ts +++ b/shared/src/i18n/ko/settings.ts @@ -29,7 +29,14 @@ const settings: TranslationStrings = { '자체 OSRM 인스턴스입니다. 비워 두면 초당 약 한 번의 요청만 허용하는 공개 서버를 사용합니다. 하루치는 충분하지만 로드트립에는 빠듯합니다. 서버를 다시 시작해야 적용됩니다.', 'settings.valhallaBase': '자체 Valhalla 인스턴스', 'settings.valhallaBaseHint': - 'TREK은 기본적으로 유료 도로, 고속도로, 페리를 피하기 위해 FOSSGIS의 공개 Valhalla를 사용합니다. 대신 자체 Valhalla를 사용하려면 여기에 URL을 입력하세요. 자체 라우팅 서버만 설정된 경우 공개 Valhalla는 사용되지 않습니다. 자체 URL을 입력한 후 서버를 재시작하고 페이지를 새로고침하세요.', + '자체 Valhalla입니다. 위의 경로 서비스가 이것 또는 자동으로 설정되어 있을 때 요청합니다. 자체 라우팅 서버만 설정되어 있고 경로 서비스를 선택하지 않았다면 어떤 Valhalla에도 요청하지 않습니다. URL을 입력한 후 서버를 재시작하고 페이지를 새로고침하세요.', + 'settings.valhallaProvider': '경로 서비스', + 'settings.valhallaProviderHint': + 'OSRM이 할 수 없는 일을 처리합니다: 유료 도로, 고속도로, 페리를 피하는 경로와 투어의 경로, 고도, 길. TREK 서비스는 이 서버를 통해 요청되며, 응답할 수 없으면 FOSSGIS의 공개 Valhalla가 대신합니다. 자동은 자체 Valhalla나 자체 라우팅 서버만 설정되어 있지 않으면 TREK 서비스에 요청합니다.', + 'settings.valhallaProviderOption.auto': '자동', + 'settings.valhallaProviderOption.trek': 'TREK 서비스', + 'settings.valhallaProviderOption.fossgis': '공개 Valhalla (FOSSGIS)', + 'settings.valhallaProviderOption.custom': '자체 Valhalla', 'settings.mapHint': '지도 타일 URL 템플릿', 'settings.mapProvider': '지도 공급자', 'settings.mapProviderHint': '여행 플래너 및 Journey 지도에 영향을 줍니다. Atlas는 항상 Leaflet을 사용합니다.', diff --git a/shared/src/i18n/nl/settings.ts b/shared/src/i18n/nl/settings.ts index 7694c7a10..90cc82d7d 100644 --- a/shared/src/i18n/nl/settings.ts +++ b/shared/src/i18n/nl/settings.ts @@ -30,7 +30,14 @@ const settings: TranslationStrings = { 'Een eigen OSRM-server. Leeg gebruikt de publieke servers, die ongeveer één verzoek per seconde toestaan — genoeg voor een dag, krap voor een roadtrip. Werkt na een herstart van de server.', 'settings.valhallaBase': 'Eigen Valhalla-instantie', 'settings.valhallaBaseHint': - 'TREK gebruikt standaard de publieke Valhalla van FOSSGIS om tolwegen, snelwegen en veerboten te vermijden. Vul hier de URL van je eigen Valhalla in om die te gebruiken. Als alleen een eigen routeringsinstantie is ingesteld, wordt de publieke Valhalla niet gebruikt. Herstart na het invoeren van een eigen URL de server en laad de pagina opnieuw.', + 'Een eigen Valhalla, gevraagd als de routeringsdienst hierboven daarop of op Automatisch staat. Als alleen een eigen routeringsinstantie is ingesteld en geen routeringsdienst gekozen, wordt geen Valhalla gevraagd. Herstart na het invoeren van een URL de server en laad de pagina opnieuw.', + 'settings.valhallaProvider': 'Routeringsdienst', + 'settings.valhallaProviderHint': + 'Beantwoordt wat OSRM niet kan: routes zonder tol, snelwegen of veerboten, en de routes, hoogtes en paden van tochten. De TREK-diensten worden via deze server gevraagd; als ze niet kunnen antwoorden, neemt de publieke Valhalla van FOSSGIS het over. Automatisch vraagt de TREK-diensten, tenzij een eigen Valhalla of alleen een eigen routeringsinstantie is ingesteld.', + 'settings.valhallaProviderOption.auto': 'Automatisch', + 'settings.valhallaProviderOption.trek': 'TREK-diensten', + 'settings.valhallaProviderOption.fossgis': 'Publieke Valhalla (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Eigen Valhalla-instantie', 'settings.mapHint': 'URL-sjabloon voor kaarttegels', 'settings.mapProvider': 'Kaartprovider', 'settings.mapProviderHint': 'Geldt voor Trip Planner en Journey kaarten. Atlas gebruikt altijd Leaflet.', diff --git a/shared/src/i18n/pl/settings.ts b/shared/src/i18n/pl/settings.ts index 46877190a..6b6579e49 100644 --- a/shared/src/i18n/pl/settings.ts +++ b/shared/src/i18n/pl/settings.ts @@ -29,7 +29,14 @@ const settings: TranslationStrings = { 'Własna instancja OSRM. Puste używa serwerów publicznych, które pozwalają na około jedno zapytanie na sekundę — wystarczy na dzień, mało na road trip. Działa po restarcie serwera.', 'settings.valhallaBase': 'Własna instancja Valhalli', 'settings.valhallaBaseHint': - 'TREK domyślnie używa publicznej Valhalli FOSSGIS do omijania opłat, autostrad i promów. Wpisz tutaj URL własnej Valhalli, aby używać jej zamiast publicznej. Jeśli skonfigurowano tylko własną instancję wyznaczania tras, publiczna Valhalla nie jest używana. Po wpisaniu własnego adresu URL uruchom ponownie serwer i odśwież stronę.', + 'Własna Valhalla, pytana, gdy usługa wyznaczania tras powyżej jest ustawiona na nią lub na Automatycznie. Jeśli skonfigurowano tylko własną instancję wyznaczania tras i nie wybrano usługi, żadna Valhalla nie jest pytana. Po wpisaniu adresu URL uruchom ponownie serwer i odśwież stronę.', + 'settings.valhallaProvider': 'Usługa wyznaczania tras', + 'settings.valhallaProviderHint': + 'Odpowiada na to, czego OSRM nie potrafi: trasy bez opłat, autostrad i promów oraz trasy, wysokości i ścieżki wycieczek. Usługi TREK są pytane przez ten serwer; gdy nie mogą odpowiedzieć, zastępuje je publiczna Valhalla FOSSGIS. Automatycznie pyta usługi TREK, chyba że ustawiono własną Valhallę albo tylko własną instancję wyznaczania tras.', + 'settings.valhallaProviderOption.auto': 'Automatycznie', + 'settings.valhallaProviderOption.trek': 'Usługi TREK', + 'settings.valhallaProviderOption.fossgis': 'Publiczna Valhalla (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Własna instancja Valhalli', 'settings.mapHint': 'Szablon URL dla kafelków mapy', 'settings.mapProvider': 'Dostawca mapy', 'settings.mapProviderHint': 'Dotyczy map Trip Planner i Journey. Atlas zawsze używa Leaflet.', diff --git a/shared/src/i18n/ru/settings.ts b/shared/src/i18n/ru/settings.ts index 79b53628e..38371d7f3 100644 --- a/shared/src/i18n/ru/settings.ts +++ b/shared/src/i18n/ru/settings.ts @@ -29,7 +29,14 @@ const settings: TranslationStrings = { 'Собственный экземпляр OSRM. Пусто — используются публичные серверы с ограничением около одного запроса в секунду: на день хватает, для автопутешествия мало. Вступает в силу после перезапуска сервера.', 'settings.valhallaBase': 'Свой сервер Valhalla', 'settings.valhallaBaseHint': - 'По умолчанию TREK использует публичную Valhalla FOSSGIS для объезда платных дорог, автомагистралей и паромов. Введите здесь URL собственной Valhalla, чтобы использовать её вместо публичной. Если настроен только собственный сервер маршрутизации, публичная Valhalla не используется. После ввода собственного URL перезапустите сервер и обновите страницу.', + 'Собственная Valhalla, к которой обращаются, если сервис маршрутизации выше установлен на неё или на «Автоматически». Если настроен только собственный сервер маршрутизации и сервис не выбран, ни к какой Valhalla не обращаются. После ввода URL перезапустите сервер и обновите страницу.', + 'settings.valhallaProvider': 'Сервис маршрутизации', + 'settings.valhallaProviderHint': + 'Отвечает на то, чего не умеет OSRM: маршруты без платных дорог, автомагистралей и паромов, а также маршруты, высоты и тропы походов. Сервисы TREK опрашиваются через этот сервер; если они не могут ответить, их заменяет публичная Valhalla FOSSGIS. «Автоматически» опрашивает сервисы TREK, если не задана собственная Valhalla или только собственный сервер маршрутизации.', + 'settings.valhallaProviderOption.auto': 'Автоматически', + 'settings.valhallaProviderOption.trek': 'Сервисы TREK', + 'settings.valhallaProviderOption.fossgis': 'Публичная Valhalla (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Собственный экземпляр Valhalla', 'settings.mapHint': 'URL-шаблон для тайлов карты', 'settings.mapProvider': 'Провайдер карты', 'settings.mapProviderHint': 'Применяется к Trip Planner и Journey. Atlas всегда использует Leaflet.', diff --git a/shared/src/i18n/sk/settings.ts b/shared/src/i18n/sk/settings.ts index 908e6e9cd..1ac40d045 100644 --- a/shared/src/i18n/sk/settings.ts +++ b/shared/src/i18n/sk/settings.ts @@ -38,7 +38,14 @@ const settings: TranslationStrings = { 'Vlastná inštancia OSRM. Prázdne použije verejné servery s limitom približne jedného požiadavku za sekundu — na deň to stačí, na road trip je to málo. Prejaví sa po reštarte servera.', 'settings.valhallaBase': 'Vlastná inštancia Valhalla', 'settings.valhallaBaseHint': - 'TREK v predvolenom nastavení používa verejnú Valhallu FOSSGIS na vyhýbanie sa mýtnym cestám, diaľniciam a trajektom. Sem zadajte URL vlastnej Valhally a používajte ju namiesto verejnej. Ak je nastavená iba vlastná smerovacia inštancia, verejná Valhalla sa nepoužije. Po zadaní vlastnej URL reštartujte server a znovu načítajte stránku.', + 'Vlastná Valhalla, ktorej sa pýta, keď je smerovacia služba vyššie nastavená na ňu alebo na Automaticky. Ak je nastavená iba vlastná smerovacia inštancia a nie je zvolená žiadna smerovacia služba, žiadna Valhalla sa nepýta. Po zadaní URL reštartujte server a znovu načítajte stránku.', + 'settings.valhallaProvider': 'Smerovacia služba', + 'settings.valhallaProviderHint': + 'Odpovedá na to, čo OSRM nevie: trasy bez mýta, diaľnic alebo trajektov a trasy, výšky a cesty výletov. Služby TREK sa pýtajú cez tento server; keď nemôžu odpovedať, prevezme to verejná Valhalla FOSSGIS. Automaticky sa pýta služieb TREK, pokiaľ nie je nastavená vlastná Valhalla alebo iba vlastná smerovacia inštancia.', + 'settings.valhallaProviderOption.auto': 'Automaticky', + 'settings.valhallaProviderOption.trek': 'Služby TREK', + 'settings.valhallaProviderOption.fossgis': 'Verejná Valhalla (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Vlastná inštancia Valhally', 'settings.mapHint': 'URL šablóna pre mapové dlaždice', 'settings.mapProvider': 'Poskytovateľ mapy', 'settings.mapProviderHint': 'Ovplyvňuje mapy v Trip Planneri a Journey. Atlas vždy používa Leaflet.', diff --git a/shared/src/i18n/sv/settings.ts b/shared/src/i18n/sv/settings.ts index f4ab8f4be..76ec2d759 100644 --- a/shared/src/i18n/sv/settings.ts +++ b/shared/src/i18n/sv/settings.ts @@ -29,7 +29,14 @@ const settings: TranslationStrings = { 'En egen OSRM-instans. Tomt använder de publika servrarna, som tillåter ungefär en förfrågan per sekund – nog för en dag, knappt för en bilresa. Träder i kraft efter omstart av servern.', 'settings.valhallaBase': 'Egen Valhalla-instans', 'settings.valhallaBaseHint': - 'TREK använder som standard FOSSGIS publika Valhalla för att undvika vägtullar, motorvägar och färjor. Ange URL:en till din egen Valhalla här för att använda den i stället. Om bara en egen ruttserver är konfigurerad används inte den publika Valhalla. Starta om servern och ladda om sidan efter att du angett en egen URL.', + 'En egen Valhalla, som tillfrågas när ruttjänsten ovan är inställd på den eller på Automatiskt. Om bara en egen ruttserver är konfigurerad och ingen ruttjänst är vald tillfrågas ingen Valhalla. Starta om servern och ladda om sidan efter att du angett en URL.', + 'settings.valhallaProvider': 'Ruttjänst', + 'settings.valhallaProviderHint': + 'Svarar på det OSRM inte kan: rutter utan vägtullar, motorvägar eller färjor, samt rutter, höjder och stigar för turer. TREK-tjänsterna tillfrågas via den här servern; när de inte kan svara tar FOSSGIS publika Valhalla över. Automatiskt frågar TREK-tjänsterna, om inte en egen Valhalla eller bara en egen ruttserver är angiven.', + 'settings.valhallaProviderOption.auto': 'Automatiskt', + 'settings.valhallaProviderOption.trek': 'TREK-tjänster', + 'settings.valhallaProviderOption.fossgis': 'Publik Valhalla (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Egen Valhalla-instans', 'settings.mapHint': 'URL-mall för kartrutor', 'settings.mapProvider': 'Kartleverantör', 'settings.mapProviderHint': 'Påverkar resplaneraren och resedagbokens kartor. Atlas använder alltid Leaflet.', diff --git a/shared/src/i18n/th/settings.ts b/shared/src/i18n/th/settings.ts index 1c197ae22..c994e5bb0 100644 --- a/shared/src/i18n/th/settings.ts +++ b/shared/src/i18n/th/settings.ts @@ -601,7 +601,14 @@ const settings: TranslationStrings = { 'อินสแตนซ์ OSRM ของคุณเอง หากเว้นว่างจะใช้เซิร์ฟเวอร์สาธารณะ ซึ่งรองรับราวหนึ่งคำขอต่อวินาที — เพียงพอสำหรับหนึ่งวันแต่ค่อนข้างจำกัดสำหรับโรดทริป มีผลหลังรีสตาร์ตเซิร์ฟเวอร์', 'settings.valhallaBase': 'อินสแตนซ์ Valhalla ของคุณเอง', 'settings.valhallaBaseHint': - 'โดยค่าเริ่มต้น TREK ใช้ FOSSGIS Valhalla สาธารณะเพื่อหลีกเลี่ยงถนนเก็บค่าผ่านทาง ทางด่วน และเรือเฟอร์รี่ ป้อน URL Valhalla ของคุณเองที่นี่เพื่อใช้แทน หากตั้งค่าเฉพาะอินสแตนซ์เส้นทางแบบกำหนดเอง จะไม่ใช้ Valhalla สาธารณะ หลังป้อน URL แบบกำหนดเอง ให้รีสตาร์ตเซิร์ฟเวอร์และโหลดหน้านี้ใหม่', + 'Valhalla ของคุณเอง จะถูกถามเมื่อบริการเส้นทางด้านบนตั้งเป็นตัวนี้หรือเป็นอัตโนมัติ หากตั้งค่าเฉพาะเซิร์ฟเวอร์เส้นทางของคุณเองและไม่ได้เลือกบริการเส้นทาง จะไม่ถาม Valhalla ใดเลย หลังป้อน URL ให้รีสตาร์ตเซิร์ฟเวอร์และโหลดหน้านี้ใหม่', + 'settings.valhallaProvider': 'บริการเส้นทาง', + 'settings.valhallaProviderHint': + 'ตอบในสิ่งที่ OSRM ทำไม่ได้: เส้นทางที่เลี่ยงทางเก็บค่าผ่านทาง ทางด่วน หรือเรือเฟอร์รี่ รวมถึงเส้นทาง ระดับความสูง และทางเดินของทัวร์ บริการ TREK จะถูกถามผ่านเซิร์ฟเวอร์นี้ หากตอบไม่ได้ Valhalla สาธารณะของ FOSSGIS จะรับช่วงต่อ โหมดอัตโนมัติจะถามบริการ TREK เว้นแต่ตั้งค่า Valhalla ของคุณเองหรือเฉพาะเซิร์ฟเวอร์เส้นทางของคุณเอง', + 'settings.valhallaProviderOption.auto': 'อัตโนมัติ', + 'settings.valhallaProviderOption.trek': 'บริการ TREK', + 'settings.valhallaProviderOption.fossgis': 'Valhalla สาธารณะ (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Valhalla ของคุณเอง', 'settings.notifyCollectionInvite': 'คำเชิญเข้าคอลเลกชัน', 'settings.notifySynologySessionCleared': 'ล้างเซสชัน Synology แล้ว', 'settings.notifyPluginNotification': 'การแจ้งเตือนจากปลั๊กอิน', diff --git a/shared/src/i18n/tr/settings.ts b/shared/src/i18n/tr/settings.ts index 3f9be2efc..9139d097a 100644 --- a/shared/src/i18n/tr/settings.ts +++ b/shared/src/i18n/tr/settings.ts @@ -29,7 +29,14 @@ const settings: TranslationStrings = { 'Kendi OSRM sunucunuz. Boş bırakılırsa saniyede yaklaşık bir istek veren genel sunucular kullanılır: bir gün için yeter, uzun yolculuk için az. Sunucu yeniden başlatıldığında etkin olur.', 'settings.valhallaBase': 'Kendi Valhalla sunucunuz', 'settings.valhallaBaseHint': - 'TREK, ücretli yolları, otoyolları ve feribotları önlemek için varsayılan olarak FOSSGIS’in herkese açık Valhalla hizmetini kullanır. Bunun yerine kendi Valhalla sunucunuzu kullanmak için URL’sini buraya girin. Yalnızca özel bir rota sunucusu yapılandırılmışsa herkese açık Valhalla kullanılmaz. Özel URL girdikten sonra sunucuyu yeniden başlatın ve sayfayı yenileyin.', + 'Kendi Valhalla sunucunuz; yukarıdaki rota hizmeti ona ya da Otomatik’e ayarlıyken sorulur. Yalnızca kendi rota sunucunuz yapılandırılmışsa ve rota hizmeti seçilmemişse hiçbir Valhalla’ya sorulmaz. URL girdikten sonra sunucuyu yeniden başlatın ve sayfayı yenileyin.', + 'settings.valhallaProvider': 'Rota hizmeti', + 'settings.valhallaProviderHint': + 'OSRM’nin yapamadığını yanıtlar: ücretli yollar, otoyollar veya feribotlar olmadan rotalar ile turların rotaları, yükseklikleri ve yolları. TREK hizmetlerine bu sunucu üzerinden sorulur; yanıt veremezlerse FOSSGIS’in herkese açık Valhalla’sı devreye girer. Otomatik, kendi Valhalla’nız ya da yalnızca kendi rota sunucunuz ayarlanmadıkça TREK hizmetlerine sorar.', + 'settings.valhallaProviderOption.auto': 'Otomatik', + 'settings.valhallaProviderOption.trek': 'TREK hizmetleri', + 'settings.valhallaProviderOption.fossgis': 'Herkese açık Valhalla (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Kendi Valhalla sunucunuz', 'settings.mapHint': 'Harita kutucukları için URL şablonu', 'settings.mapProvider': 'Harita Sağlayıcısı', 'settings.mapProviderHint': 'Seyahat planlayıcı ve Journey haritalarını etkiler. Atlas her zaman Leaflet kullanır.', diff --git a/shared/src/i18n/uk/settings.ts b/shared/src/i18n/uk/settings.ts index c757e7429..328df1337 100644 --- a/shared/src/i18n/uk/settings.ts +++ b/shared/src/i18n/uk/settings.ts @@ -30,7 +30,14 @@ const settings: TranslationStrings = { 'Власний примірник OSRM. Порожньо — використовуються публічні сервери з обмеженням близько одного запиту на секунду: на день вистачає, для автоподорожі мало. Діє після перезапуску сервера.', 'settings.valhallaBase': 'Власний сервер Valhalla', 'settings.valhallaBaseHint': - 'За замовчуванням TREK використовує публічну Valhalla FOSSGIS для уникнення платних доріг, автомагістралей і поромів. Введіть тут URL власної Valhalla, щоб використовувати її замість публічної. Якщо налаштовано лише власний сервер маршрутизації, публічна Valhalla не використовується. Після введення власного URL перезапустіть сервер і оновіть сторінку.', + 'Власна Valhalla, до якої звертаються, якщо сервіс маршрутизації вище встановлено на неї або на «Автоматично». Якщо налаштовано лише власний сервер маршрутизації і сервіс не вибрано, жодна Valhalla не опитується. Після введення URL перезапустіть сервер і оновіть сторінку.', + 'settings.valhallaProvider': 'Сервіс маршрутизації', + 'settings.valhallaProviderHint': + 'Відповідає на те, чого не вміє OSRM: маршрути без платних доріг, автомагістралей і поромів, а також маршрути, висоти й стежки походів. Сервіси TREK опитуються через цей сервер; якщо вони не можуть відповісти, їх замінює публічна Valhalla FOSSGIS. «Автоматично» опитує сервіси TREK, якщо не задано власну Valhalla або лише власний сервер маршрутизації.', + 'settings.valhallaProviderOption.auto': 'Автоматично', + 'settings.valhallaProviderOption.trek': 'Сервіси TREK', + 'settings.valhallaProviderOption.fossgis': 'Публічна Valhalla (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Власний екземпляр Valhalla', 'settings.mapHint': 'URL-шаблон для тайлів карти', 'settings.mapProvider': 'Провайдер карти', 'settings.mapProviderHint': 'Застосовується до Trip Planner та Journey. Atlas завжди використовує Leaflet.', diff --git a/shared/src/i18n/vi/settings.ts b/shared/src/i18n/vi/settings.ts index 60c5d1fba..c6d6a68f9 100644 --- a/shared/src/i18n/vi/settings.ts +++ b/shared/src/i18n/vi/settings.ts @@ -29,7 +29,14 @@ const settings: TranslationStrings = { 'Máy chủ OSRM của riêng bạn. Để trống sẽ dùng máy chủ công cộng, cho phép khoảng một yêu cầu mỗi giây — đủ cho một ngày, chật cho chuyến đi dài. Có hiệu lực sau khi khởi động lại máy chủ.', 'settings.valhallaBase': 'Máy chủ Valhalla riêng', 'settings.valhallaBaseHint': - 'Theo mặc định, TREK dùng Valhalla công cộng của FOSSGIS để tránh đường thu phí, đường cao tốc và phà. Nhập URL Valhalla riêng tại đây để dùng thay thế. Nếu chỉ cấu hình máy chủ định tuyến riêng, Valhalla công cộng sẽ không được dùng. Sau khi nhập URL riêng, hãy khởi động lại máy chủ và tải lại trang.', + 'Valhalla riêng của bạn, được hỏi khi dịch vụ định tuyến ở trên được đặt cho nó hoặc Tự động. Nếu chỉ cấu hình máy chủ định tuyến riêng và không chọn dịch vụ định tuyến, sẽ không hỏi Valhalla nào. Sau khi nhập URL, hãy khởi động lại máy chủ và tải lại trang.', + 'settings.valhallaProvider': 'Dịch vụ định tuyến', + 'settings.valhallaProviderHint': + 'Trả lời những gì OSRM không làm được: lộ trình tránh đường thu phí, đường cao tốc hoặc phà, cùng lộ trình, độ cao và đường đi của các chuyến đi. Dịch vụ TREK được hỏi qua máy chủ này; khi không thể trả lời, Valhalla công cộng của FOSSGIS sẽ thay thế. Tự động sẽ hỏi dịch vụ TREK, trừ khi đã đặt Valhalla riêng hoặc chỉ máy chủ định tuyến riêng.', + 'settings.valhallaProviderOption.auto': 'Tự động', + 'settings.valhallaProviderOption.trek': 'Dịch vụ TREK', + 'settings.valhallaProviderOption.fossgis': 'Valhalla công cộng (FOSSGIS)', + 'settings.valhallaProviderOption.custom': 'Valhalla riêng', 'settings.mapHint': 'Mẫu URL cho ô bản đồ', 'settings.mapProvider': 'Nhà cung cấp bản đồ', 'settings.mapProviderHint': diff --git a/shared/src/i18n/zh-TW/settings.ts b/shared/src/i18n/zh-TW/settings.ts index 43641b31f..32a7f65fd 100644 --- a/shared/src/i18n/zh-TW/settings.ts +++ b/shared/src/i18n/zh-TW/settings.ts @@ -29,7 +29,14 @@ const settings: TranslationStrings = { '你自己的 OSRM 實例。留空則使用公共伺服器,約每秒一個請求 — 單日夠用,長途自駕則吃緊。需重新啟動伺服器後生效。', 'settings.valhallaBase': '自建 Valhalla 執行個體', 'settings.valhallaBaseHint': - 'TREK 預設使用 FOSSGIS 的公共 Valhalla 來避開收費道路、高速公路和渡輪。若要改用自己的 Valhalla,請在此輸入網址。如果只設定了自己的路線規劃伺服器,就不會使用公共 Valhalla。輸入自己的網址後,請重新啟動伺服器並重新載入頁面。', + '你自己的 Valhalla,當上方的路線服務設為它或設為「自動」時使用。如果只設定了自己的路線規劃伺服器且未選擇路線服務,就不會請求任何 Valhalla。輸入網址後,請重新啟動伺服器並重新載入頁面。', + 'settings.valhallaProvider': '路線服務', + 'settings.valhallaProviderHint': + '處理 OSRM 做不到的事:避開收費道路、高速公路或渡輪的路線,以及行程的路線、海拔和道路。TREK 服務透過此伺服器請求;無法回應時,由 FOSSGIS 的公共 Valhalla 接手。「自動」會請求 TREK 服務,除非已設定自己的 Valhalla 或只設定了自己的路線規劃伺服器。', + 'settings.valhallaProviderOption.auto': '自動', + 'settings.valhallaProviderOption.trek': 'TREK 服務', + 'settings.valhallaProviderOption.fossgis': '公共 Valhalla(FOSSGIS)', + 'settings.valhallaProviderOption.custom': '自己的 Valhalla', 'settings.mapHint': '地圖瓦片 URL 模板', 'settings.mapProvider': '地圖提供商', 'settings.mapProviderHint': '影響行程規劃和旅程地圖。Atlas 始終使用 Leaflet。', diff --git a/shared/src/i18n/zh/settings.ts b/shared/src/i18n/zh/settings.ts index 89a3119e9..f455d10f2 100644 --- a/shared/src/i18n/zh/settings.ts +++ b/shared/src/i18n/zh/settings.ts @@ -29,7 +29,14 @@ const settings: TranslationStrings = { '你自己的 OSRM 实例。留空则使用公共服务器,约每秒一个请求 — 单日够用,长途自驾则吃紧。需重启服务器后生效。', 'settings.valhallaBase': '自建 Valhalla 实例', 'settings.valhallaBaseHint': - 'TREK 默认使用 FOSSGIS 的公共 Valhalla 来避开收费道路、高速公路和渡轮。若要改用自己的 Valhalla,请在此输入网址。如果只配置了自己的路线规划服务器,就不会使用公共 Valhalla。输入自己的网址后,请重启服务器并重新加载页面。', + '你自己的 Valhalla,当上方的路线服务设为它或设为“自动”时使用。如果只配置了自己的路线规划服务器且未选择路线服务,则不会请求任何 Valhalla。输入网址后,请重启服务器并重新加载页面。', + 'settings.valhallaProvider': '路线服务', + 'settings.valhallaProviderHint': + '处理 OSRM 做不到的事:避开收费道路、高速公路或渡轮的路线,以及行程的路线、海拔和道路。TREK 服务通过此服务器请求;无法应答时,由 FOSSGIS 的公共 Valhalla 接手。“自动”会请求 TREK 服务,除非已设置自己的 Valhalla 或只设置了自己的路线规划服务器。', + 'settings.valhallaProviderOption.auto': '自动', + 'settings.valhallaProviderOption.trek': 'TREK 服务', + 'settings.valhallaProviderOption.fossgis': '公共 Valhalla(FOSSGIS)', + 'settings.valhallaProviderOption.custom': '自己的 Valhalla', 'settings.mapHint': '地图瓦片 URL 模板', 'settings.mapProvider': '地图提供商', 'settings.mapProviderHint': '影响行程规划器和旅程地图。足迹始终使用 Leaflet。', diff --git a/wiki/Admin-User-Defaults.md b/wiki/Admin-User-Defaults.md index 355d6b8ba..6fbf3af35 100644 --- a/wiki/Admin-User-Defaults.md +++ b/wiki/Admin-User-Defaults.md @@ -46,9 +46,20 @@ Used for every user who has not entered their own key, so the whole instance get The address of an OSRM instance of your own, for example `https://osrm.example.org`. Empty uses the public servers, which allow about one request a second: enough for a day plan, tight for a road trip. +### Routing service + +Which Valhalla answers what OSRM cannot: driving around toll roads, motorways and ferries, and the routes, heights and ways of tours. + +- **Automatic** (nothing chosen): the TREK services, or **Own Valhalla instance** when one is set. If only **Own routing engine** is set, no Valhalla is asked. +- **TREK services**: the Valhalla at `valhalla.liketrek.com` (or `TREK_VALHALLA_URL`). This server asks it with the installation key, so the browser never talks to it and no restart is needed. Where it cannot answer (no key yet, the day's allowance spent, the service down, or a shared page without a sign-in), TREK asks the public FOSSGIS Valhalla instead, without a message. +- **Public Valhalla (FOSSGIS)**: `valhalla1.openstreetmap.de`, as before. +- **Own Valhalla instance**: the address below. + +The allowance the TREK services count for routing is shown in the TREK API card under **Admin → Settings**. + ### Own Valhalla instance -The address of a Valhalla instance of your own, for example `https://valhalla.example.org`. TREK uses the public FOSSGIS Valhalla by default to avoid toll roads, motorways and ferries. If only **Own routing engine** is set, the public Valhalla is not used. +The address of a Valhalla instance of your own, for example `https://valhalla.example.org`. It is asked when **Routing service** is set to it, or left on **Automatic**. Both routing fields save when you leave them (or press **Enter**), and only an admin can set them. After changing either one, **restart the server and reload the page**: the browser only talks to routing hosts the server names in its security policy, and that policy is built once at start. There is no environment variable for either engine. See [Road-Trip](Road-Trip#routing-engines) for what each combination does and what your own instances need. diff --git a/wiki/Road-Trip.md b/wiki/Road-Trip.md index e2353c1f0..99b7bdbbd 100644 --- a/wiki/Road-Trip.md +++ b/wiki/Road-Trip.md @@ -231,7 +231,7 @@ Routing needs two engines, and both have public defaults, so the addon works wit | Engine | Used for | Public default | Own instance | |---|---|---|---| | **OSRM** | every road route TREK draws: the road trip, the day plan, the routed booking lines | the FOSSGIS servers at `routing.openstreetmap.de` | **Own routing engine** | -| **Valhalla** | driving around toll roads, motorways and ferries, and the **No motorway**, **No tolls** and **No ferry** offers | the FOSSGIS Valhalla at `valhalla1.openstreetmap.de` | **Own Valhalla instance** | +| **Valhalla** | driving around toll roads, motorways and ferries, and the **No motorway**, **No tolls** and **No ferry** offers | the TREK services' Valhalla through this server, the FOSSGIS Valhalla at `valhalla1.openstreetmap.de` where it cannot answer (**Routing service**) | **Own Valhalla instance** | The public OSRM servers allow roughly one request a second. That is enough for a day plan and tight for a road trip, which routes every leg of every day: TREK spaces its requests and retries a refused one, but a long trip takes a while to fill in. An instance with many road trippers is better off with its own.