Skip to content

Commit 1305aea

Browse files
update nigiri (fix shape parsing for #stops > #shape points) (#557)
* update nigiri * update cista (missing include in hashing.h) * wip
1 parent 3016053 commit 1305aea

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

.pkg

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[cista]
22
url=git@github.com:felixguendling/cista.git
33
branch=master
4-
commit=762ca9acc68731814e4e89bdaa72045500461604
4+
commit=a116ae7bd64b0ef3698725301703c2b8a2729387
55
[conf]
66
url=git@github.com:motis-project/conf.git
77
branch=master
@@ -77,7 +77,7 @@
7777
[nigiri]
7878
url=git@github.com:motis-project/nigiri.git
7979
branch=master
80-
commit=6a37889a7f53399932e6846168b8e2a9f0553df5
80+
commit=999956a179084ff268ca1012b0eff7cf73a8bd26
8181
[osr]
8282
url=git@github.com:motis-project/osr.git
8383
branch=master

.pkg.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
958535306631471232
2-
cista f1358310262c347a8b4a533e5dd6184ec97ba637
1+
6013795077748293668
2+
cista a116ae7bd64b0ef3698725301703c2b8a2729387
33
zlib ee0742244d93c4237154ae16c3db42b5f284b442
44
boost 60cae66449fa3c9599b2b7d3d5d44c65301ed3a3
55
conf f9bf4bd83bf55a2170725707e526cbacc45dcc66
@@ -31,7 +31,7 @@ opentelemetry-cpp ec4aef6b17b697052edef5417825ad71947b2ed1
3131
pugixml 60175e80e2f5e97e027ac78f7e14c5acc009ce50
3232
unordered_dense c11595a7743d20622637584bddf77243d72ae152
3333
wyhash 1e012b57fc2227a9e583a57e2eacb3da99816d99
34-
nigiri 6a37889a7f53399932e6846168b8e2a9f0553df5
34+
nigiri 999956a179084ff268ca1012b0eff7cf73a8bd26
3535
expat 636c9861e8e7c119f3626d1e6c260603ab624516
3636
libosmium d5cc2a02d997c2b464d37d37c3a75cd9efa23dc4
3737
protozero 8c9f3fa97c2cfdceef86d0b61818ae98e9328f29

modules/nigiri/src/nigiri.cc

+1-3
Original file line numberDiff line numberDiff line change
@@ -635,9 +635,7 @@ void nigiri::import(motis::module::import_dispatcher& reg) {
635635
auto const read_scope = opentelemetry::trace::Scope{read_span};
636636
try {
637637
impl_->tt_ = std::make_shared<cista::wrapped<n::timetable>>(
638-
n::timetable::read(cista::memory_holder{
639-
cista::file{dump_file_path.string().c_str(), "r"}
640-
.content()}));
638+
n::timetable::read(dump_file_path));
641639
(**impl_->tt_).locations_.resolve_timezones();
642640
if (!gtfsrt_urls_.empty() || !gtfsrt_paths_.empty()) {
643641
impl_->update_rtt(std::make_shared<n::rt_timetable>(

0 commit comments

Comments
 (0)