diff options
author | tatiana-yan <tatiana.kondakova@gmail.com> | 2021-01-19 17:16:44 +0300 |
---|---|---|
committer | Olga Khlopkova <mesozoic.drones@gmail.com> | 2021-01-19 17:32:48 +0300 |
commit | 8dc3e29730a2ce3ebd21ed8026e8fadb20519026 (patch) | |
tree | ba9e007924aaa619f193e6f5980cc7b7a4d11454 /transit | |
parent | d5065e7817deac6b05278cbfe447732b18fc38b1 (diff) |
[transit] Minor refactoring: move subway checks to single place.
Diffstat (limited to 'transit')
-rw-r--r-- | transit/world_feed/feed_helpers.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/transit/world_feed/feed_helpers.cpp b/transit/world_feed/feed_helpers.cpp index 82e34582ca..f88299d7ad 100644 --- a/transit/world_feed/feed_helpers.cpp +++ b/transit/world_feed/feed_helpers.cpp @@ -159,13 +159,19 @@ std::pair<size_t, bool> PrepareNearestPointOnTrack(m2::PointD const & point, return {proj->m_indexOnShape, proj->m_needsInsertion}; } -bool IsRelevantType(const gtfs::RouteType & routeType) +bool IsRelevantType(gtfs::RouteType const & routeType) { // All types and constants are described in GTFS: // https://developers.google.com/transit/gtfs/reference + auto const isSubway = [](gtfs::RouteType const & routeType) { + return routeType == gtfs::RouteType::Subway || + routeType == gtfs::RouteType::MetroService || + routeType == gtfs::RouteType::UndergroundService; + }; + // We skip all subways because we extract subway data from OSM, not from GTFS. - if (routeType == gtfs::RouteType::Subway) + if (isSubway(routeType)) return false; auto const val = static_cast<size_t>(routeType); @@ -183,8 +189,6 @@ bool IsRelevantType(const gtfs::RouteType & routeType) gtfs::RouteType::CarTransportRailService, gtfs::RouteType::LorryTransportRailService, gtfs::RouteType::VehicleTransportRailService, - gtfs::RouteType::MetroService, - gtfs::RouteType::UndergroundService, gtfs::RouteType::PostBusService, gtfs::RouteType::SpecialNeedsBus, gtfs::RouteType::MobilityBusService, |