From e413ad6323956f5eb5a9be71141d94b454779ce9 Mon Sep 17 00:00:00 2001 From: Olga Khlopkova Date: Thu, 24 Sep 2020 10:05:35 +0300 Subject: [PATCH] [transit] Replace inline static kSubwayLayerTypes with extern + cpp. --- transit/CMakeLists.txt | 1 + transit/transit_entities.cpp | 7 +++++++ transit/transit_entities.hpp | 3 +-- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 transit/transit_entities.cpp diff --git a/transit/CMakeLists.txt b/transit/CMakeLists.txt index 885bdba41f..095518a44c 100644 --- a/transit/CMakeLists.txt +++ b/transit/CMakeLists.txt @@ -11,6 +11,7 @@ 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 new file mode 100644 index 0000000000..cbf4efd18c --- /dev/null +++ b/transit/transit_entities.cpp @@ -0,0 +1,7 @@ +#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 fc17449172..0abd2cb179 100644 --- a/transit/transit_entities.hpp +++ b/transit/transit_entities.hpp @@ -43,8 +43,7 @@ inline std::string const kTransfersFile = "transfers" + kTransitFileExtension; inline std::string const kGatesFile = "gates" + kTransitFileExtension; // Route types shown on the subway layer. -static std::unordered_set const kSubwayLayerTypes{"subway", "train", "light_rail", - "monorail"}; +extern std::unordered_set const kSubwayLayerTypes; // 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