[transit] Line metadata classes.

transit/transit_entities.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "geometry/point2d.hpp"
+
 #include "base/macros.hpp"
 #include "base/newtype.hpp"
 #include "base/visitor.hpp"
@@ -11,8 +13,11 @@
 #include <string>
 #include <tuple>
 #include <unordered_map>
+#include <unordered_set>
 #include <vector>
 
+#include "3party/boost/boost/container_hash/hash.hpp"
+
 #include "3party/opening_hours/opening_hours.hpp"
 
 namespace routing
@@ -27,6 +32,7 @@ inline std::string const kTransitFileExtension = std::string(TRANSIT_FILE_EXTENS
 inline std::string const kNetworksFile = "networks" + kTransitFileExtension;
 inline std::string const kRoutesFile = "routes" + kTransitFileExtension;
 inline std::string const kLinesFile = "lines" + kTransitFileExtension;
+inline std::string const kLinesMetadataFile = "lines_metadata" + kTransitFileExtension;
 inline std::string const kShapesFile = "shapes" + kTransitFileExtension;
 inline std::string const kStopsFile = "stops" + kTransitFileExtension;
 inline std::string const kEdgesFile = "edges" + kTransitFileExtension;
@@ -88,6 +94,7 @@ struct LineInterval
 
 using LineIntervals = std::vector<LineInterval>;
 using IdList = std::vector<TransitId>;
+using IdSet = std::unordered_set<TransitId>;
 using TimeTable = std::unordered_map<TransitId, osmoh::OpeningHours>;
 using EdgeWeight = uint32_t;
 
@@ -120,4 +127,111 @@ struct ShapeLink
   size_t m_startIndex = 0;
   size_t m_endIndex = 0;
 };
+
+struct EdgeId
+{
+  EdgeId() = default;
+  EdgeId(TransitId fromStopId, TransitId toStopId, TransitId lineId)
+    : m_fromStopId(fromStopId), m_toStopId(toStopId), m_lineId(lineId)
+  {
+  }
+
+  bool operator==(EdgeId const & other) const
+  {
+    return std::tie(m_fromStopId, m_toStopId, m_lineId) ==
+           std::tie(other.m_fromStopId, other.m_toStopId, other.m_lineId);
+  }
+
+  TransitId m_fromStopId = 0;
+  TransitId m_toStopId = 0;
+  TransitId m_lineId = 0;
+};
+
+struct EdgeIdHasher
+{
+  size_t operator()(EdgeId const & key) const
+  {
+    size_t seed = 0;
+    boost::hash_combine(seed, key.m_fromStopId);
+    boost::hash_combine(seed, key.m_toStopId);
+    boost::hash_combine(seed, key.m_lineId);
+    return seed;
+  }
+};
+
+using IdEdgeSet = std::unordered_set<EdgeId, EdgeIdHasher>;
+
+struct EdgeData
+{
+  EdgeData() = default;
+  EdgeData(ShapeLink const & shapeLink, EdgeWeight const & weight)
+    : m_shapeLink(shapeLink), m_weight(weight)
+  {
+  }
+  ShapeLink m_shapeLink;
+  EdgeWeight m_weight = 0;
+};
+
+struct LineSegment
+{
+  LineSegment() = default;
+  explicit LineSegment(size_t startIdx) : m_startIdx(startIdx) {}
+  LineSegment(size_t startIdx, size_t endIdx) : m_startIdx(startIdx), m_endIdx(endIdx) {}
+
+  bool operator==(LineSegment const & rhs) const
+  {
+    return m_startIdx == rhs.m_startIdx && m_endIdx == rhs.m_endIdx;
+  }
+
+  DECLARE_VISITOR_AND_DEBUG_PRINT(LineSegment, visitor(m_startIdx, "startIdx"),
+                                  visitor(m_endIdx, "endIdx"))
+
+  size_t m_startIdx = 0;
+  size_t m_endIdx = 0;
+};
+
+using LineSegments = std::vector<LineSegment>;
+
+struct LineSegmentOrder
+{
+  LineSegmentOrder() = default;
+  LineSegmentOrder(LineSegment const & lineSegment, int order)
+    : m_segment(lineSegment), m_order(order)
+  {
+  }
+
+  bool operator==(LineSegmentOrder const & rhs) const
+  {
+    return m_order == rhs.m_order && m_segment == rhs.m_segment;
+  }
+
+  DECLARE_VISITOR_AND_DEBUG_PRINT(LineSegmentOrder, visitor(m_segment, "segment"),
+                                  visitor(m_order, "order"))
+
+  LineSegment m_segment;
+  int m_order = 0;
+};
+
+using LineSegmentsOrder = std::vector<LineSegmentOrder>;
+
+template <class T, class I>
+typename std::vector<T>::const_iterator FindById(std::vector<T> const & container, I const & id,
+                                                 bool exists = true)
+{
+  auto const it = std::find_if(container.begin(), container.end(),
+                               [id](T const & obj) { return obj.GetId() == id; });
+
+  if (exists)
+    CHECK(it != container.end(), (id));
+  return it;
+}
+
+inline std::vector<m2::PointD> GetPolylinePart(std::vector<m2::PointD> const & polyline,
+                                               size_t startIdx, size_t endIdx)
+{
+  CHECK_GREATER(endIdx, startIdx, ());
+  CHECK_GREATER(polyline.size(), endIdx, ());
+
+  return std::vector<m2::PointD>(polyline.begin() + startIdx, polyline.begin() + endIdx + 1);
+}
 }  // namespace transit

transit/world_feed/world_feed.cpp

@@ -202,17 +202,6 @@ namespace transit
 // Static fields.
 std::unordered_set<std::string> WorldFeed::m_agencyHashes;
 
-EdgeId::EdgeId(TransitId fromStopId, TransitId toStopId, TransitId lineId)
-  : m_fromStopId(fromStopId), m_toStopId(toStopId), m_lineId(lineId)
-{
-}
-
-bool EdgeId::operator==(EdgeId const & other) const
-{
-  return std::tie(m_fromStopId, m_toStopId, m_lineId) ==
-         std::tie(other.m_fromStopId, other.m_toStopId, other.m_lineId);
-}
-
 EdgeTransferId::EdgeTransferId(TransitId fromStopId, TransitId toStopId)
   : m_fromStopId(fromStopId), m_toStopId(toStopId)
 {
@@ -222,14 +211,6 @@ bool EdgeTransferId::operator==(EdgeTransferId const & other) const
 {
   return std::tie(m_fromStopId, m_toStopId) == std::tie(other.m_fromStopId, other.m_toStopId);
 }
-size_t EdgeIdHasher::operator()(EdgeId const & key) const
-{
-  size_t seed = 0;
-  boost::hash_combine(seed, key.m_fromStopId);
-  boost::hash_combine(seed, key.m_toStopId);
-  boost::hash_combine(seed, key.m_lineId);
-  return seed;
-}
 
 size_t EdgeTransferIdHasher::operator()(EdgeTransferId const & key) const
 {

transit/world_feed/world_feed.hpp

@@ -42,8 +42,6 @@ private:
 // Here are MAPS.ME representations for GTFS entities, e.g. networks for GTFS agencies.
 // https://developers.google.com/transit/gtfs/reference
 
-using IdSet = std::unordered_set<TransitId>;
-
 struct Networks
 {
   void Write(IdSet const & ids, std::ofstream & stream) const;
@@ -94,6 +92,14 @@ struct Lines
   std::unordered_map<TransitId, LineData> m_data;
 };
 
+struct LinesMetadata
+{
+  void Write(std::unordered_map<TransitId, IdList> const & ids, std::ofstream & stream) const;
+
+  // Line id to line additional data (e.g. for rendering).
+  std::unordered_map<TransitId, LineSegmentsOrder> m_data;
+};
+
 struct ShapeData
 {
   ShapeData() = default;
@@ -127,6 +133,7 @@ struct StopData
   IdList m_transferIds;
 
   uint64_t m_osmId = 0;
+  uint32_t m_featureId = 0;
 
   // Field not intended for dumping to json:
   std::string m_gtfsParentId;
@@ -139,31 +146,6 @@ struct Stops
   std::unordered_map<TransitId, StopData> m_data;
 };
 
-struct EdgeId
-{
-  EdgeId() = default;
-  EdgeId(TransitId fromStopId, TransitId toStopId, TransitId lineId);
-
-  bool operator==(EdgeId const & other) const;
-
-  TransitId m_fromStopId = 0;
-  TransitId m_toStopId = 0;
-  TransitId m_lineId = 0;
-};
-
-struct EdgeIdHasher
-{
-  size_t operator()(EdgeId const & key) const;
-};
-
-using IdEdgeSet = std::unordered_set<EdgeId, EdgeIdHasher>;
-
-struct EdgeData
-{
-  ShapeLink m_shapeLink;
-  EdgeWeight m_weight = 0;
-};
-
 struct Edges
 {
   void Write(IdEdgeSet const & ids, std::ofstream & stream) const;
@@ -378,6 +360,7 @@ private:
   Networks m_networks;
   Routes m_routes;
   Lines m_lines;
+  LinesMetadata m_linesMetadata;
   Shapes m_shapes;
   Stops m_stops;
   Edges m_edges;
@@ -411,6 +394,8 @@ private:
 
   // If the feed explicitly specifies its language, we use its value. Otherwise set to default.
   std::string m_feedLanguage;
+
+  bool m_feedIsSplitIntoRegions = false;
 };
 
 // Creates concatenation of |values| separated by delimiter.