From dbdc9ce65c8e7ce99d4c6cb1ce631581f908c50d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20G=C3=BCndling?= Date: Wed, 27 Nov 2024 18:40:38 +0100 Subject: [PATCH 1/4] geocoding: enable timetable only mode, respect geocoding flags --- src/import.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/import.cc b/src/import.cc index 6599a87f5..04045f9b5 100644 --- a/src/import.cc +++ b/src/import.cc @@ -309,7 +309,10 @@ data import(config const& c, fs::path const& data_path, bool const write) { auto adr_extend = task{ "adr_extend", - [&]() { return c.timetable_.has_value(); }, + [&]() { + return c.timetable_.has_value() && + (c.geocoding_ || c.reverse_geocoding_); + }, [&]() { return d.tt_.get() != nullptr; }, [&]() { auto const area_db = d.t_ ? (std::optional{ @@ -322,6 +325,8 @@ data import(config const& c, fs::path const& data_path, bool const write) { } adr_extend_tt(*d.tt_, area_db.has_value() ? &*area_db : nullptr, *d.t_); if (write) { + auto ec = std::error_code{}; + std::filesystem::create_directories(data_path / "adr", ec); cista::write(data_path / "adr" / "t_ext.bin", *d.t_); } d.r_.reset(); From 1cad50649f1a87705c2630cd3f77409a1d99ebfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20G=C3=BCndling?= Date: Wed, 27 Nov 2024 19:02:40 +0100 Subject: [PATCH 2/4] update nigiri: more error context (path of failed dataset) --- .pkg | 2 +- .pkg.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pkg b/.pkg index f44917d4f..4ff0ca5f9 100644 --- a/.pkg +++ b/.pkg @@ -1,7 +1,7 @@ [nigiri] url=git@github.com:motis-project/nigiri.git branch=master - commit=802aaea228b22fe9c8a60301e74070e7f935ccae + commit=23e619793c9b33a8df9280c031511c5f5adada34 [cista] url=git@github.com:felixguendling/cista.git branch=master diff --git a/.pkg.lock b/.pkg.lock index 57b236613..e450fb2c9 100644 --- a/.pkg.lock +++ b/.pkg.lock @@ -1,4 +1,4 @@ -15197049630783087387 +8255910620784803857 cista 847b27100b7e730370b810ce62206a66b0bf2d79 zlib-ng 68ab3e2d80253ec5dc3c83691d9ff70477b32cd3 boost 930f38eb0365ceb7853273e03da4d9e7787abfb9 @@ -24,7 +24,7 @@ opentelemetry-cpp 60770dc9dc63e3543fc87d605b2e88fd53d7a414 pugixml 60175e80e2f5e97e027ac78f7e14c5acc009ce50 unordered_dense b33b037377ca966bbdd9cccc3417e46e88f83bfb wyhash 1e012b57fc2227a9e583a57e2eacb3da99816d99 -nigiri 802aaea228b22fe9c8a60301e74070e7f935ccae +nigiri 23e619793c9b33a8df9280c031511c5f5adada34 conf f9bf4bd83bf55a2170725707e526cbacc45dcc66 expat 636c9861e8e7c119f3626d1e6c260603ab624516 libosmium 6e6d6b3081cc8bdf25dda89730e25c36eb995516 From 32e579b50f9d6a0084aa0acaf062b5ef7e9c2374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20G=C3=BCndling?= Date: Wed, 27 Nov 2024 19:06:13 +0100 Subject: [PATCH 3/4] translate journey details --- ui/src/lib/i18n/de.ts | 1 + ui/src/lib/i18n/en.ts | 1 + ui/src/lib/i18n/fr.ts | 1 + ui/src/lib/i18n/translation.ts | 1 + ui/src/routes/+page.svelte | 4 ++-- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/src/lib/i18n/de.ts b/ui/src/lib/i18n/de.ts index 380eaa35b..d6f0a0f02 100644 --- a/ui/src/lib/i18n/de.ts +++ b/ui/src/lib/i18n/de.ts @@ -1,6 +1,7 @@ import type { Translations } from './translation'; const translations: Translations = { + journeyDetails: 'Verbindungsdetails', transfers: 'Umstiege', walk: 'Fußweg', bike: 'Fahrrad', diff --git a/ui/src/lib/i18n/en.ts b/ui/src/lib/i18n/en.ts index 4161efdb7..f62dbc3e8 100644 --- a/ui/src/lib/i18n/en.ts +++ b/ui/src/lib/i18n/en.ts @@ -1,6 +1,7 @@ import type { Translations } from './translation'; const translations: Translations = { + journeyDetails: 'Journey Details', transfers: 'transfers', walk: 'walk', bike: 'bike', diff --git a/ui/src/lib/i18n/fr.ts b/ui/src/lib/i18n/fr.ts index ee1041570..279cc923c 100644 --- a/ui/src/lib/i18n/fr.ts +++ b/ui/src/lib/i18n/fr.ts @@ -1,6 +1,7 @@ import type { Translations } from './translation'; const translations: Translations = { + journeyDetails: 'Détails du voyage', walk: 'Marche', bike: 'Vélo', car: 'Voiture', diff --git a/ui/src/lib/i18n/translation.ts b/ui/src/lib/i18n/translation.ts index b08eafc4f..2e9144361 100644 --- a/ui/src/lib/i18n/translation.ts +++ b/ui/src/lib/i18n/translation.ts @@ -4,6 +4,7 @@ import de from './de'; import fr from './fr'; export type Translations = { + journeyDetails: string; transfers: string; walk: string; bike: string; diff --git a/ui/src/routes/+page.svelte b/ui/src/routes/+page.svelte index b56f08734..64c17f628 100644 --- a/ui/src/routes/+page.svelte +++ b/ui/src/routes/+page.svelte @@ -101,7 +101,7 @@ return `${lngLatToStr(l.value.match!)},0`; } }; - let modes = $derived(['WALK', ...(bikeRental ? ['BIKE_RENTAL'] : [])] as Mode[]); + let modes = $derived(['BIKE', ...(bikeRental ? ['BIKE_RENTAL'] : [])] as Mode[]); let baseQuery = $derived( from.value.match && to.value.match ? ({ @@ -244,7 +244,7 @@
-

Journey Details

+

{t.journeyDetails}