[routing] Maxspeed serialization files.

generator/CMakeLists.txt

@@ -69,6 +69,8 @@ set(SRC
   intermediate_elements.hpp
   locality_sorter.cpp
   locality_sorter.hpp
+  maxspeed_builder.cpp
+  maxspeed_builder.hpp
   maxspeed_collector.cpp
   maxspeed_collector.hpp
   metalines_builder.cpp

generator/generator_tool/generator_tool.cpp

@@ -13,6 +13,7 @@
 #include "generator/generate_info.hpp"
 #include "generator/geo_objects/geo_objects.hpp"
 #include "generator/locality_sorter.hpp"
+#include "generator/maxspeed_builder.hpp"
 #include "generator/metalines_builder.hpp"
 #include "generator/osm_source.hpp"
 #include "generator/popular_places_section_builder.hpp"
@@ -530,6 +531,9 @@ int main(int argc, char ** argv)
     if (FLAGS_generate_maxspeed)
     {
       LOG(LINFO, ("Generating maxspeed section for", datFile));
+      string const maxspeedFilename = genInfo.GetIntermediateFileName(MAXSPEED_FILENAME);
+      CHECK(BuildMaxspeed(datFile, osmToFeatureFilename, maxspeedFilename),
+            ("Generating maxspeed section error."));
     }
 
     if (FLAGS_make_cross_mwm || FLAGS_make_transit_cross_mwm)

generator/maxspeed_builder.cpp

@@ -0,0 +1,12 @@
+#include "generator/maxspeed_builder.hpp"
+
+#include "routing/maxspeed_serialization.hpp"
+
+namespace generator
+{
+bool BuildMaxspeed(std::string const & dataPath, std::string const & osmToFeaturePath,
+                   std::string const & maxspeedFilename)
+{
+  return true;
+}
+}  // namespace generator

generator/maxspeed_builder.hpp

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <string>
+
+namespace generator
+{
+/// \brief Builds maxspeed section.
+/// \param maxspeedFilename file name to csv file with maxspeed tag values.
+/// \note To start building the section, the following data must be ready:
+/// 1. GenerateIntermediateData(). Saves to a file data about maxspeed tags value of road features
+/// 2. GenerateFeatures()
+/// 3. Generates geometry
+bool BuildMaxspeed(std::string const & dataPath, std::string const & osmToFeaturePath,
+                   std::string const & maxspeedFilename);
+}  // namespace generator

generator/maxspeed_collector.cpp

@@ -53,7 +53,10 @@ void MaxspeedCollector::Flush()
   ofstream stream(m_filePath);
 
   if (!stream.is_open())
+  {
     LOG(LERROR, ("Cannot open file", m_filePath));
+    return;
+  }
 
   for (auto const & s : m_data)
     stream << s << '\n';

generator/maxspeed_collector.hpp

@@ -7,16 +7,16 @@
 
 namespace feature
 {
-/// \brief Saves csv file. Every line describe maxspeed, maxspeed:forward and maxspeed:backward
+/// \brief Saves csv file. Every line describes maxspeed, maxspeed:forward and maxspeed:backward
 /// tags of linear features. The format of the lines is described below.
 class MaxspeedCollector
 {
 public:
-  /// \pram filePath path to csv file.
+  /// \param filePath path to csv file.
   explicit MaxspeedCollector(std::string const & filePath) : m_filePath(filePath) {}
   ~MaxspeedCollector() { Flush(); }
 
-  void Process(OsmElement const & el);
+  void Process(OsmElement const & p);
 
 private:
   void Flush();
@@ -26,7 +26,7 @@ private:
   // 1. osm id,maxspeed value
   // 2. osm id,maxspeed:forward value
   // 3. osm id,maxspeed:forward value,maxspeed:backward value
-  // There's possble examples of strings contained in the list |m_data|:
+  // There are possible examples of strings contained in the list |m_data|:
   // 2343313,60
   // 3243245345,60,80
   // 32453452,RU:urban

generator/routing_helpers.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "generator/camera_node_processor.hpp"
+#include "generator/maxspeed_collector.hpp"
 #include "generator/restriction_writer.hpp"
 #include "generator/road_access_generator.hpp"
 
@@ -16,9 +17,12 @@ namespace routing
 {
 struct TagsProcessor
 {
+  explicit TagsProcessor(std::string const & maxspeedFilePath) : m_maxspeedCollector(maxspeedFilePath) {}
+
   RoadAccessWriter m_roadAccessWriter;
   RestrictionWriter m_restrictionWriter;
   CameraNodeProcessor m_cameraNodeWriter;
+  feature::MaxspeedCollector m_maxspeedCollector;
 };
 
 // Adds feature id and corresponding |osmId| to |osmIdToFeatureId|.

generator/translator_planet.cpp

@@ -23,14 +23,14 @@ namespace generator
 {
 TranslatorPlanet::TranslatorPlanet(std::shared_ptr<EmitterInterface> emitter,
                                    cache::IntermediateDataReader & holder,
-                                   feature::GenerateInfo const & info) :
-  m_emitter(emitter),
-  m_cache(holder),
-  m_coastType(info.m_makeCoasts ? classif().GetCoastType() : 0),
-  m_nodeRelations(m_routingTagsProcessor),
-  m_wayRelations(m_routingTagsProcessor),
-  m_metalinesBuilder(info.GetIntermediateFileName(METALINES_FILENAME)),
-  m_maxspeedCollector(info.GetIntermediateFileName(MAXSPEED_FILENAME))
+                                   feature::GenerateInfo const & info)
+  : m_emitter(emitter)
+  , m_cache(holder)
+  , m_coastType(info.m_makeCoasts ? classif().GetCoastType() : 0)
+  , m_routingTagsProcessor(info.GetIntermediateFileName(MAXSPEED_FILENAME))
+  , m_nodeRelations(m_routingTagsProcessor)
+  , m_wayRelations(m_routingTagsProcessor)
+  , m_metalinesBuilder(info.GetIntermediateFileName(METALINES_FILENAME))
 {
   auto const addrFilePath = info.GetAddressesFileName();
   if (!addrFilePath.empty())
@@ -97,7 +97,7 @@ void TranslatorPlanet::EmitElement(OsmElement * p)
 
     ft.SetOsmId(base::MakeOsmWay(p->id));
 
-    m_maxspeedCollector.Process(*p);
+    m_routingTagsProcessor.m_maxspeedCollector.Process(*p);
 
     bool isCoastline = (m_coastType != 0 && params.IsTypeExist(m_coastType));
 

generator/translator_planet.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "generator/camera_info_collector.hpp"
-#include "generator/maxspeed_collector.hpp"
 #include "generator/metalines_builder.hpp"
 #include "generator/relation_tags.hpp"
 #include "generator/routing_helpers.hpp"
@@ -59,6 +58,5 @@ private:
   RelationTagsNode m_nodeRelations;
   RelationTagsWay m_wayRelations;
   feature::MetalinesBuilder m_metalinesBuilder;
-  feature::MaxspeedCollector m_maxspeedCollector;
 };
 }  // namespace generator

routing/CMakeLists.txt

@@ -63,6 +63,8 @@ set(
   joint_index.cpp
   joint_index.hpp
   loaded_path_segment.hpp
+  maxspeed_serialization.cpp
+  maxspeed_serialization.hpp
   nearest_edge_finder.cpp
   nearest_edge_finder.hpp
   online_absent_fetcher.cpp

routing/maxspeed_serialization.cpp

@@ -0,0 +1,5 @@
+#include "routing/maxspeed_serialization.hpp"
+
+namespace routing
+{
+}  // namespace routing

routing/maxspeed_serialization.hpp

@@ -0,0 +1,5 @@
+#pragma once
+
+namespace routing
+{
+}  // namespace routing