diff --git a/.pkg b/.pkg index e5d12329a..5cb3d67cb 100644 --- a/.pkg +++ b/.pkg @@ -5,11 +5,11 @@ [cista] url=git@github.com:felixguendling/cista.git branch=master - commit=5b6808fd7d7a7c1c7e4cb152b563dbf71e3efba4 + commit=e64e312b6bec577a38268ed1479a3b990b8cbe72 [osr] url=git@github.com:motis-project/osr.git branch=master - commit=06ddcbb6ca05a9636373f015c2c852a11874bc79 + commit=f0a180848d67b48c6442b87ee76f4cf2a0b3015d [utl] url=git@github.com:motis-project/utl.git branch=master diff --git a/.pkg.lock b/.pkg.lock index bb2d54c39..08a313f81 100644 --- a/.pkg.lock +++ b/.pkg.lock @@ -1,5 +1,5 @@ -16948827567758484956 -cista 52577def055e4bdf90eaa461872fc1f7b5b1131d +1487178945974552552 +cista e64e312b6bec577a38268ed1479a3b990b8cbe72 zlib-ng 68ab3e2d80253ec5dc3c83691d9ff70477b32cd3 boost 73549ebca677fe6214202a1ab580362b4f80e653 googletest 7b64fca6ea0833628d6f86255a81424365f7cc0c @@ -39,7 +39,7 @@ sol2 40c7cbc7c5cfed1e8c7f1bbe6fcbe23d7a67fc75 variant 5aa73631dc969087c77433a5cdef246303051f69 tiles 6b6dc45bc904966640c7207ab91950848a8b3f6c rtree.c 6ed73a7dc4f1184f2b5b2acd8ac1c2b28a273057 -osr 06ddcbb6ca05a9636373f015c2c852a11874bc79 +osr f0a180848d67b48c6442b87ee76f4cf2a0b3015d yaml-cpp 1d8ca1f35eb3a9c9142462b28282a848e5d29a91 reflect-cpp c54fe66de4650b60c23aadd4a06d9db4ffeda22f FTXUI dd6a5d371fd7a3e2937bb579955003c54b727233 diff --git a/include/motis/hashes.h b/include/motis/hashes.h index a4ac8a158..2c8ebd59e 100644 --- a/include/motis/hashes.h +++ b/include/motis/hashes.h @@ -26,7 +26,7 @@ constexpr auto const tiles_version = []() { return meta_entry_t{"tiles_bin_ver", 1U}; }; constexpr auto const osr_footpath_version = []() { - return meta_entry_t{"osr_footpath_bin_ver", 1U}; + return meta_entry_t{"osr_footpath_bin_ver", 2U}; }; std::string to_str(meta_t const&); diff --git a/src/data.cc b/src/data.cc index 76ea7c495..3945c8456 100644 --- a/src/data.cc +++ b/src/data.cc @@ -167,7 +167,8 @@ data& data::operator=(data&&) = default; void data::load_osr() { auto const osr_path = path_ / "osr"; w_ = std::make_unique(osr_path, cista::mmap::protection::READ); - l_ = std::make_unique(*w_); + l_ = std::make_unique(*w_, osr_path, + cista::mmap::protection::READ); elevator_nodes_ = std::make_unique>(get_elevator_nodes(*w_)); pl_ = diff --git a/src/import.cc b/src/import.cc index 7cc662369..e10e37637 100644 --- a/src/import.cc +++ b/src/import.cc @@ -316,7 +316,17 @@ data import(config const& c, fs::path const& data_path, bool const write) { r.build_rtree(*d.t_); r.write(); } - d.t_.get()->~typeahead(); + d.t_.reset(); + if (c.geocoding_) { + d.load_geocoder(); + } + if (c.reverse_geocoding_) { + d.load_reverse_geocoder(); + } + }, + [&]() { + d.t_.reset(); + d.r_.reset(); if (c.geocoding_) { d.load_geocoder(); } @@ -324,7 +334,6 @@ data import(config const& c, fs::path const& data_path, bool const write) { d.load_reverse_geocoder(); } }, - [&]() { d.load_geocoder(); }, {tt_hash, osm_hash, adr_version(),