From 7f23e866ec16288e1edcc7dd0b7bab22c7c40514 Mon Sep 17 00:00:00 2001 From: Traines Date: Mon, 10 Feb 2025 17:13:56 +0000 Subject: [PATCH 1/2] prolong default http_timeout, typo --- docs/setup.md | 2 +- include/motis/config.h | 4 ++-- ui/src/lib/i18n/de.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/setup.md b/docs/setup.md index 1d0484109..55f752b36 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -51,7 +51,7 @@ timetable: # if not set, no timetable will be loaded merge_dupes_inter_src: false # duplicates withing different datasets will be merged link_stop_distance: 100 # stops will be linked by footpaths if they're less than X meters (default=100m) apart update_interval: 60 # real-time updates are polled every `update_interval` seconds - http_timeout: 10 # timeout for the HTTP server to respond with a package + http_timeout: 30 # maximum time in seconds the real-time feed download may take incremental_rt_update: false # false = real-time updates are applied to a clean slate, true = no data will be dropped max_footpath_length: 15 # maximum footpath length when transitively connecting stops or for routing footpaths if `osr_footpath` is set to true datasets: # map of tag -> dataset diff --git a/include/motis/config.h b/include/motis/config.h index bbf6438e1..9f15ae64c 100644 --- a/include/motis/config.h +++ b/include/motis/config.h @@ -86,7 +86,7 @@ struct config { bool merge_dupes_inter_src_{false}; unsigned link_stop_distance_{100U}; unsigned update_interval_{60}; - unsigned http_timeout_{10}; + unsigned http_timeout_{30}; bool incremental_rt_update_{false}; bool use_osm_stop_coordinates_{false}; bool extend_missing_footpaths_{false}; @@ -116,7 +116,7 @@ struct config { std::map feeds_{}; std::map default_restrictions_{}; unsigned update_interval_{60}; - unsigned http_timeout_{10}; + unsigned http_timeout_{30}; unsigned cache_size_{50}; std::optional proxy_{}; }; diff --git a/ui/src/lib/i18n/de.ts b/ui/src/lib/i18n/de.ts index 52ca15b33..c345f2251 100644 --- a/ui/src/lib/i18n/de.ts +++ b/ui/src/lib/i18n/de.ts @@ -41,8 +41,8 @@ const translations: Translations = { advancedSearchOptions: 'Optionen', selectModes: 'Öffentliche Verkehrsmittel auswählen', defaultSelectedModes: 'Alle Verkehrsmittel', - wheelchair: 'Barrierfreie Umstiege', - bikeRental: 'Sharing-Fahrzeuge zulassen', + wheelchair: 'Barrierefreie Umstiege', + bikeRental: 'Sharing-Fahrzeuge berücksichtigen', bikeCarriage: 'Fahrradmitnahme', unreliableOptions: 'Je nach Datenverfügbarkeit können diese Optionen unzuverlässig sein.', WALK: 'Zu Fuß', From f9487984cb9a4b79bd066b8b8c1dd7052baca9fd Mon Sep 17 00:00:00 2001 From: Traines Date: Tue, 11 Feb 2025 21:15:40 +0000 Subject: [PATCH 2/2] fix test --- test/config_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/config_test.cc b/test/config_test.cc index c77ef2e44..d043018b6 100644 --- a/test/config_test.cc +++ b/test/config_test.cc @@ -49,7 +49,7 @@ osm: europe-latest.osm.pbf merge_dupes_inter_src: false link_stop_distance: 100 update_interval: 60 - http_timeout: 10 + http_timeout: 30 incremental_rt_update: false use_osm_stop_coordinates: false extend_missing_footpaths: false