[transit] Transit display info with versions.

1 files changed, 24 insertions, 5 deletions

diff --git a/transit/transit_display_info.hpp b/transit/transit_display_info.hpp
index f5eba0ab37..4cb8547a6f 100644
--- a/transit/transit_display_info.hpp
+++ b/transit/transit_display_info.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
+#include "transit/experimental/transit_types_experimental.hpp"
 #include "transit/transit_types.hpp"
+#include "transit/transit_version.hpp"
 
 #include "indexer/feature_decl.hpp"
 
@@ -24,14 +26,31 @@ using TransitShapesInfo = std::map<routing::transit::ShapeId, routing::transit::
 using TransitLinesInfo = std::map<routing::transit::LineId, routing::transit::Line>;
 using TransitNetworksInfo = std::map<routing::transit::NetworkId, routing::transit::Network>;
 
+using TransitStopsInfoPT = std::map<::transit::TransitId, ::transit::experimental::Stop>;
+using TransitTransfersInfoPT = std::map<::transit::TransitId, ::transit::experimental::Transfer>;
+using TransitShapesInfoPT = std::map<::transit::TransitId, ::transit::experimental::Shape>;
+using TransitLinesInfoPT = std::map<::transit::TransitId, ::transit::experimental::Line>;
+using TransitRoutesInfoPT = std::map<::transit::TransitId, ::transit::experimental::Route>;
+using TransitNetworksInfoPT = std::map<::transit::TransitId, ::transit::experimental::Network>;
+
 struct TransitDisplayInfo
 {
-  TransitNetworksInfo m_networks;
-  TransitLinesInfo m_lines;
-  TransitStopsInfo m_stops;
-  TransitTransfersInfo m_transfers;
-  TransitShapesInfo m_shapes;
+  ::transit::TransitVersion m_transitVersion;
+
   TransitFeaturesInfo m_features;
+
+  TransitNetworksInfo m_networksSubway;
+  TransitLinesInfo m_linesSubway;
+  TransitStopsInfo m_stopsSubway;
+  TransitTransfersInfo m_transfersSubway;
+  TransitShapesInfo m_shapesSubway;
+
+  TransitNetworksInfoPT m_networksPT;
+  TransitLinesInfoPT m_linesPT;
+  TransitRoutesInfoPT m_routesPT;
+  TransitStopsInfoPT m_stopsPT;
+  TransitTransfersInfoPT m_transfersPT;
+  TransitShapesInfoPT m_shapesPT;
 };
 
 using TransitDisplayInfos = std::map<MwmSet::MwmId, std::unique_ptr<TransitDisplayInfo>>;