Skip to content

Commit

Permalink
fix review
Browse files Browse the repository at this point in the history
  • Loading branch information
datanel committed Oct 16, 2024
1 parent 5f466d3 commit 4861f1e
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions source/time_tables/departure_boards.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,18 @@ static bool is_terminus_for_all_stop_times(const std::vector<routing::datetime_s
return !stop_times.empty();
}

void update_display_information(bool& vj_found,
const std::pair<unsigned int, const navitia::type::StopTime*>& dt_st,
bool update_display_information(bool& vj_found,
const navitia::type::StopTime* st,
pbnavitia::PtDisplayInfo* pt_display_information,
PbCreator& pb_creator) {
if (!vj_found && dt_st.second != nullptr) {
auto vj = dt_st.second->vehicle_journey;
if (!vj_found && st != nullptr) {
const auto* vj = st->vehicle_journey;
pt_display_information->set_trip_short_name(vj->name);
pt_display_information->set_headsign(pb_creator.data->pt_data->headsign_handler.get_headsign(vj));
vj_found = true;
return true;
}

return false;
}

static void fill_date_times(PbCreator& pb_creator,
Expand Down Expand Up @@ -148,7 +150,9 @@ static void render(PbCreator& pb_creator,

// Now we fill the date_times
for (auto dt_st : id_vec.second) {
update_display_information(vj_found, dt_st, pt_display_information, pb_creator);
if (!vj_found) {
vj_found = update_display_information(vj_found, dt_st.second, pt_display_information, pb_creator);
}
fill_date_times(pb_creator, schedule, dt_st, calendar_id);
}

Expand Down Expand Up @@ -211,7 +215,9 @@ static void render(PbCreator& pb_creator,

// Now we fill the date_times
for (auto dt_st : id_vec.second) {
update_display_information(vj_found, dt_st, pt_display_information, pb_creator);
if (!vj_found) {
vj_found = update_display_information(vj_found, dt_st.second, pt_display_information, pb_creator);
}
fill_date_times(pb_creator, schedule, dt_st, calendar_id);
}

Expand Down

0 comments on commit 4861f1e

Please sign in to comment.