From e9707c1f4b2adb34b5e17cb8a148d1fd84b3072d Mon Sep 17 00:00:00 2001 From: Olga Khlopkova Date: Fri, 25 Sep 2020 11:27:26 +0300 Subject: [PATCH] [transit] Inline kSubwayLayerTypes. --- transit/CMakeLists.txt | 1 - transit/transit_entities.cpp | 7 ------- transit/transit_entities.hpp | 3 ++- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 transit/transit_entities.cpp diff --git a/transit/CMakeLists.txt b/transit/CMakeLists.txt index 095518a44c..885bdba41f 100644 --- a/transit/CMakeLists.txt +++ b/transit/CMakeLists.txt @@ -11,7 +11,6 @@ set( experimental/transit_types_experimental.cpp experimental/transit_types_experimental.hpp transit_display_info.hpp - transit_entities.cpp transit_entities.hpp transit_graph_data.cpp transit_graph_data.hpp diff --git a/transit/transit_entities.cpp b/transit/transit_entities.cpp deleted file mode 100644 index cbf4efd18c..0000000000 --- a/transit/transit_entities.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "transit/transit_entities.hpp" - -namespace transit -{ -std::unordered_set const kSubwayLayerTypes{"subway", "train", "light_rail", - "monorail"}; -} // namespace transit diff --git a/transit/transit_entities.hpp b/transit/transit_entities.hpp index 0abd2cb179..d8ce855b03 100644 --- a/transit/transit_entities.hpp +++ b/transit/transit_entities.hpp @@ -43,7 +43,8 @@ inline std::string const kTransfersFile = "transfers" + kTransitFileExtension; inline std::string const kGatesFile = "gates" + kTransitFileExtension; // Route types shown on the subway layer. -extern std::unordered_set const kSubwayLayerTypes; +inline std::unordered_set const kSubwayLayerTypes{"subway", "train", "light_rail", + "monorail"}; // Unique id for transit entities. It is generated by gtfs_converter and is persistent between // re-runs. Generated based on the unique string hash of the GTFS entity. Lies in the interval