Merge branch 'master' of github.com:motis-project/motis

# Conflicts: # .pkg.lock
motis-project · Nov 28, 2024 · d6a85fe · d6a85fe
2 parents 16dd432 + 76a1ec1
commit d6a85fe
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 5 deletions.
diff --git a/.pkg b/.pkg
@@ -1,7 +1,7 @@
 [nigiri]
   [email protected]:motis-project/nigiri.git
   branch=master
-  commit=802aaea228b22fe9c8a60301e74070e7f935ccae
+  commit=23e619793c9b33a8df9280c031511c5f5adada34
 [cista]
   [email protected]:felixguendling/cista.git
   branch=master

diff --git a/.pkg.lock b/.pkg.lock
@@ -1,4 +1,4 @@
-3340476478538678897
+15050826661088915963
 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

diff --git 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<adr::area_database>{
@@ -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();

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -244,7 +244,7 @@
 		<Control position="top-left">
 			<Card class="w-[500px] bg-background rounded-lg">
 				<div class="w-full flex justify-between items-center shadow-md pl-1 mb-1">
-					<h2 class="ml-2 text-base font-semibold">Journey Details</h2>
+					<h2 class="ml-2 text-base font-semibold">{t.journeyDetails}</h2>
 					<Button
 						variant="ghost"
 						onclick={() => {