Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

osr matches #681

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

osr matches #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pkg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[osr]
[email protected]:motis-project/osr.git
branch=master
commit=478bed28978461f0728c311899cc6bb22f0dd591
commit=f2ceb19b31c13258bd61053edfbaf03375431701
[utl]
[email protected]:motis-project/utl.git
branch=master
Expand Down
4 changes: 2 additions & 2 deletions .pkg.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
12951472930669557279
2815001289700329715
cista 847b27100b7e730370b810ce62206a66b0bf2d79
zlib-ng 68ab3e2d80253ec5dc3c83691d9ff70477b32cd3
boost 930f38eb0365ceb7853273e03da4d9e7787abfb9
Expand Down Expand Up @@ -42,7 +42,7 @@ sol2 40c7cbc7c5cfed1e8c7f1bbe6fcbe23d7a67fc75
variant 5aa73631dc969087c77433a5cdef246303051f69
tiles ab6c4b13544570f893c2d64434c613d8fd7d2ceb
rtree.c 6ed73a7dc4f1184f2b5b2acd8ac1c2b28a273057
osr 478bed28978461f0728c311899cc6bb22f0dd591
osr f2ceb19b31c13258bd61053edfbaf03375431701
reflect-cpp c54fe66de4650b60c23aadd4a06d9db4ffeda22f
FTXUI dd6a5d371fd7a3e2937bb579955003c54b727233
tg 20c0f298b8ce58de29a790290f44dca7c4ecc364
Expand Down
23 changes: 23 additions & 0 deletions include/motis/osr_matches.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#pragma once

#include <memory>

#include "osr/lookup.h"

#include "nigiri/types.h"

#include "motis/fwd.h"
#include "motis/match_platforms.h"
#include "motis/types.h"

namespace motis {

using osr_matches_t = vector_map<nigiri::location_idx_t, osr::match_t>;

osr_matches_t get_osr_matches(nigiri::timetable const&,
osr::ways const&,
osr::lookup const&,
osr::platforms const&,
platform_matches_t const&);

} // namespace motis
Loading