[transit] Add feature ids for transit edges in runtime.

generator/routing_index_generator.cpp

@@ -379,9 +379,9 @@ void CalcCrossMwmTransitions(
 void CalcCrossMwmTransitionsExperimental(
     string const & mwmFile, vector<m2::RegionD> const & borders, string const & country,
     routing::CountryParentNameGetterFn const & /* countryParentNameGetterFn */,
+    ::transit::experimental::EdgeIdToFeatureId const & edgeIdToFeatureId,
     vector<routing::CrossMwmConnectorSerializer::Transition<routing::connector::TransitId>> &
-        transitions,
-    ::transit::experimental::EdgeIdToFeatureId const & edgeIdToFeatureId)
+        transitions)
 {
   try
   {
@@ -445,8 +445,8 @@ void CalcCrossMwmTransitionsExperimental(
 void CalcCrossMwmTransitionsExperimental(
     string const & mwmFile, vector<m2::RegionD> const & borders, string const & country,
     routing::CountryParentNameGetterFn const & countryParentNameGetterFn,
-    vector<routing::CrossMwmConnectorSerializer::Transition<base::GeoObjectId>> & transitions,
-    ::transit::experimental::EdgeIdToFeatureId const & edgeIdToFeatureId)
+    ::transit::experimental::EdgeIdToFeatureId const & edgeIdToFeatureId,
+    vector<routing::CrossMwmConnectorSerializer::Transition<base::GeoObjectId>> & transitions)
 {
   CHECK(false, ("This is dummy specialization and it shouldn't be called."));
 }
@@ -461,9 +461,9 @@ void CalcCrossMwmConnectors(
     string const & path, string const & mwmFile, string const & intermediateDir,
     string const & country, routing::CountryParentNameGetterFn const & countryParentNameGetterFn,
     string const & mappingFile,
+    ::transit::experimental::EdgeIdToFeatureId const & edgeIdToFeatureId,
     vector<routing::CrossMwmConnectorSerializer::Transition<CrossMwmId>> & transitions,
     routing::CrossMwmConnectorPerVehicleType<CrossMwmId> & connectors,
-    ::transit::experimental::EdgeIdToFeatureId const & edgeIdToFeatureId,
     bool experimentalTransit = false)
 {
   base::Timer timer;
@@ -486,7 +486,7 @@ void CalcCrossMwmConnectors(
     CHECK(!edgeIdToFeatureId.empty(),
           ("Edge id to feature id must be filled before building cross-mwm transit section."));
     CalcCrossMwmTransitionsExperimental(mwmFile, borders, country, countryParentNameGetterFn,
-                                        transitions, edgeIdToFeatureId);
+                                        edgeIdToFeatureId, transitions);
   }
   else
   {
@@ -709,7 +709,7 @@ void BuildRoutingCrossMwmSection(string const & path, string const & mwmFile,
   vector<CrossMwmConnectorSerializer::Transition<CrossMwmId>> transitions;
 
   CalcCrossMwmConnectors(path, mwmFile, intermediateDir, country, countryParentNameGetterFn,
-                         osmToFeatureFile, transitions, connectors, {} /*edgeIdToFeatureId */);
+                         osmToFeatureFile, {} /*edgeIdToFeatureId */, transitions, connectors);
 
   // We use leaps for cars only. To use leaps for other vehicle types add weights generation
   // here and change WorldGraph mode selection rule in IndexRouter::CalculateSubroute.
@@ -731,8 +731,8 @@ void BuildTransitCrossMwmSection(
   vector<CrossMwmConnectorSerializer::Transition<CrossMwmId>> transitions;
 
   CalcCrossMwmConnectors(path, mwmFile, "" /* intermediateDir */, country,
-                         countryParentNameGetterFn, "" /* mapping file */, transitions, connectors,
-                         edgeIdToFeatureId, experimentalTransit);
+                         countryParentNameGetterFn, "" /* mapping file */, edgeIdToFeatureId,
+                         transitions, connectors, experimentalTransit);
 
   CHECK(connectors[static_cast<size_t>(VehicleType::Pedestrian)].IsEmpty(), ());
   CHECK(connectors[static_cast<size_t>(VehicleType::Bicycle)].IsEmpty(), ());

transit/experimental/transit_data.cpp

@@ -408,7 +408,7 @@ void Read(base::Json const & obj, std::vector<Shape> & shapes)
   shapes.emplace_back(id, polyline);
 }
 
-void Read(base::Json const & obj, std::vector<Edge> & edges)
+void Read(base::Json const & obj, std::vector<Edge> & edges, EdgeIdToFeatureId & edgeFeatureIds)
 {
   TransitId stopFrom = kInvalidTransitId;
   TransitId stopTo = kInvalidTransitId;
@@ -423,6 +423,10 @@ void Read(base::Json const & obj, std::vector<Edge> & edges)
   bool isTransfer = false;
 
   FromJSONObjectOptionalField(obj.get(), "line_id", lineId);
+
+  TransitId featureId = kInvalidFeatureId;
+  FromJSONObjectOptionalField(obj.get(), "feature_id", featureId);
+
   if (lineId == 0)
   {
     lineId = kInvalidTransitId;
@@ -434,6 +438,7 @@ void Read(base::Json const & obj, std::vector<Edge> & edges)
   }
 
   edges.emplace_back(stopFrom, stopTo, weight, lineId, isTransfer, shapeLink);
+  edgeFeatureIds.emplace(EdgeId(stopFrom, stopTo, lineId), featureId);
 }
 
 void Read(base::Json const & obj, std::vector<Transfer> & transfers)
@@ -501,8 +506,8 @@ void TransitData::DeserializeFromJson(std::string const & dirWithJsons,
   ReadData(base::JoinPath(dirWithJsons, kLinesMetadataFile), m_linesMetadata);
   ReadData(base::JoinPath(dirWithJsons, kStopsFile), m_stops, mapping);
   ReadData(base::JoinPath(dirWithJsons, kShapesFile), m_shapes);
-  ReadData(base::JoinPath(dirWithJsons, kEdgesFile), m_edges);
-  ReadData(base::JoinPath(dirWithJsons, kEdgesTransferFile), m_edges);
+  ReadData(base::JoinPath(dirWithJsons, kEdgesFile), m_edges, m_edgeFeatureIds);
+  ReadData(base::JoinPath(dirWithJsons, kEdgesTransferFile), m_edges, m_edgeFeatureIds);
   ReadData(base::JoinPath(dirWithJsons, kTransfersFile), m_transfers);
   ReadData(base::JoinPath(dirWithJsons, kGatesFile), m_gates, mapping);
 }

transit/experimental/transit_data.hpp

@@ -17,6 +17,7 @@
 #include <map>
 #include <string>
 #include <type_traits>
+#include <unordered_map>
 #include <vector>
 
 #include "3party/jansson/myjansson.hpp"
@@ -26,7 +27,7 @@ namespace transit
 namespace experimental
 {
 using OsmIdToFeatureIdsMap = std::map<base::GeoObjectId, std::vector<FeatureId>>;
-
+using EdgeIdToFeatureId = std::unordered_map<EdgeId, uint32_t, EdgeIdHasher>;
 // Functions for parsing one line of line-by-line json and creating corresponding item in container.
 void Read(base::Json const & obj, std::vector<Network> & networks);
 void Read(base::Json const & obj, std::vector<Route> & routes);
@@ -34,7 +35,7 @@ void Read(base::Json const & obj, std::vector<Line> & lines);
 void Read(base::Json const & obj, std::vector<LineMetadata> & linesMetadata);
 void Read(base::Json const & obj, std::vector<Stop> & stops, OsmIdToFeatureIdsMap const & mapping);
 void Read(base::Json const & obj, std::vector<Shape> & shapes);
-void Read(base::Json const & obj, std::vector<Edge> & edges);
+void Read(base::Json const & obj, std::vector<Edge> & edges, EdgeIdToFeatureId & edgeFeatureIds);
 void Read(base::Json const & obj, std::vector<Transfer> & transfers);
 void Read(base::Json const & obj, std::vector<Gate> & gates, OsmIdToFeatureIdsMap const & mapping);
 
@@ -69,6 +70,8 @@ public:
   std::vector<Route> const & GetRoutes() const { return m_routes; }
   std::vector<Network> const & GetNetworks() const { return m_networks; }
 
+  EdgeIdToFeatureId const & GetEdgeIdToFeatureId() const { return m_edgeFeatureIds; }
+
 private:
   DECLARE_VISITOR_AND_DEBUG_PRINT(TransitData, visitor(m_stops, "stops"), visitor(m_gates, "gates"),
                                   visitor(m_edges, "edges"), visitor(m_transfers, "transfers"),
@@ -106,6 +109,8 @@ private:
   std::vector<Line> m_lines;
   std::vector<LineMetadata> m_linesMetadata;
   std::vector<Shape> m_shapes;
+
+  EdgeIdToFeatureId m_edgeFeatureIds;
 };
 }  // namespace experimental
 }  // namespace transit

transit/transit_entities.hpp

@@ -152,7 +152,7 @@ struct EdgeData
   }
 
   explicit EdgeData(EdgeWeight const & weight) : m_weight(weight) {}
-  
+
   ShapeLink m_shapeLink;
   EdgeWeight m_weight = 0;
 

transit/transit_experimental_tests/parse_transit_from_json_tests.cpp

@@ -252,8 +252,9 @@ UNIT_TEST(ReadJson_Edge)
            ShapeLink(kInvalidTransitId /* shapeId */, 0 /* startIndex */, 0 /* endIndex */))};
 
   std::vector<Edge> edgesFact;
+  EdgeIdToFeatureId edgeIdToFeatureId;
 
-  FillContainer(lineByLineJson, edgesFact);
+  FillContainer(lineByLineJson, edgesFact, edgeIdToFeatureId);
   TestEqual(edgesFact, edgesPlan);
 }
 

transit/world_feed/world_feed.cpp

@@ -347,12 +347,6 @@ TransitId IdGenerator::MakeId(const std::string & hash)
   return it->second;
 }
 
-void IdGenerator::SetCurId(TransitId curId)
-{
-  if (curId > m_curId)
-    m_curId = curId;
-}
-
 void IdGenerator::Save()
 {
   LOG(LINFO, ("Started saving", m_hashToId.size(), "mappings to", m_idMappingPath));

transit/world_feed/world_feed.hpp

@@ -34,7 +34,6 @@ public:
   void Save();
 
   TransitId MakeId(std::string const & hash);
-  void SetCurId(TransitId curId);
 
 private:
   std::unordered_map<std::string, TransitId> m_hashToId;