From a92a166f977cb95e382299d3f4fcc734f8f16bcf Mon Sep 17 00:00:00 2001
From: Maxim Pimenov <m@maps.me>
Date: Mon, 20 Mar 2017 15:25:09 +0300
Subject: [PATCH] Review fixes.

---
 generator/road_access_generator.cpp   | 16 ++++++++--------
 generator/road_access_generator.hpp   |  4 +---
 generator/routing_helpers.hpp         |  3 ++-
 routing/road_access_serialization.hpp |  2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/generator/road_access_generator.cpp b/generator/road_access_generator.cpp
index 48b6e66de1..6223826655 100644
--- a/generator/road_access_generator.cpp
+++ b/generator/road_access_generator.cpp
@@ -22,15 +22,16 @@
 #include <algorithm>
 #include <fstream>
 #include <map>
+#include <ostream>
 #include <string>
 
 using namespace std;
 
 namespace
 {
-char const kAccessPrivate[] = "access=private";
-char const kBarrierGate[] = "barrier=gate";
-char const kDelim[] = " \t\r\n";
+char constexpr kAccessPrivate[] = "access=private";
+char constexpr kBarrierGate[] = "barrier=gate";
+char constexpr kDelim[] = " \t\r\n";
 
 bool ParseRoadAccess(string const & roadAccessPath,
                      map<uint64_t, uint32_t> const & osmIdToFeatureId,
@@ -44,7 +45,7 @@ bool ParseRoadAccess(string const & roadAccessPath,
   }
 
   string line;
-  for (uint32_t lineNo = 0;; ++lineNo)
+  for (uint32_t lineNo = 1;; ++lineNo)
   {
     if (!getline(stream, line))
       break;
@@ -70,7 +71,7 @@ bool ParseRoadAccess(string const & roadAccessPath,
     auto const it = osmIdToFeatureId.find(osmId);
     if (it == osmIdToFeatureId.cend())
     {
-      LOG(LWARNING, ("Error when parsing road access: unknown osm id at line", lineNo));
+      LOG(LWARNING, ("Error when parsing road access: unknown osm id", osmId, "at line", lineNo));
       return false;
     }
 
@@ -113,12 +114,12 @@ void RoadAccessWriter::Process(OsmElement const & elem, FeatureParams const & pa
   {
     auto const t = c.GetTypeByPath(f);
     if (params.IsTypeExist(t) && elem.type == OsmElement::EntityType::Way)
-      m_stream << kAccessPrivate << " " << elem.id << "\n";
+      m_stream << kAccessPrivate << " " << elem.id << endl;
   }
 
   auto t = c.GetTypeByPath({"barrier", "gate"});
   if (params.IsTypeExist(t))
-    m_stream << kBarrierGate << " " << elem.id << "\n";
+    m_stream << kBarrierGate << " " << elem.id << endl;
 }
 
 bool RoadAccessWriter::IsOpened() const { return m_stream.is_open() && !m_stream.fail(); }
@@ -144,7 +145,6 @@ RoadAccessCollector::RoadAccessCollector(string const & roadAccessPath,
   }
 
   m_valid = true;
-  m_osmIdToFeatureId.swap(osmIdToFeatureId);
   m_roadAccess.Swap(roadAccess);
 }
 
diff --git a/generator/road_access_generator.hpp b/generator/road_access_generator.hpp
index 3961dfa131..75f750237c 100644
--- a/generator/road_access_generator.hpp
+++ b/generator/road_access_generator.hpp
@@ -6,7 +6,6 @@
 
 #include <cstdint>
 #include <fstream>
-#include <map>
 #include <string>
 
 struct OsmElement;
@@ -40,9 +39,8 @@ public:
   bool IsValid() const { return m_valid; }
 
 private:
-  std::map<uint64_t, uint32_t> m_osmIdToFeatureId;
   RoadAccess m_roadAccess;
-  bool m_valid;
+  bool m_valid = true;
 };
 
 // The generator tool's interface to writing the section with
diff --git a/generator/routing_helpers.hpp b/generator/routing_helpers.hpp
index 940644c0e5..7099d286ec 100644
--- a/generator/routing_helpers.hpp
+++ b/generator/routing_helpers.hpp
@@ -26,5 +26,6 @@ void AddFeatureId(std::map<uint64_t, uint32_t> & osmIdToFeatureId, uint32_t feat
 // 137999, 5170186,
 // 138000, 5170209, 5143342,
 // 138001, 5170228,
-bool ParseOsmIdToFeatureIdMapping(std::string const & osmIdsToFeatureIdPath, std::map<uint64_t, uint32_t> & m_osmIdToFeatureId);
+bool ParseOsmIdToFeatureIdMapping(std::string const & osmIdsToFeatureIdPath,
+                                  std::map<uint64_t, uint32_t> & osmIdToFeatureId);
 }  // namespace routing
diff --git a/routing/road_access_serialization.hpp b/routing/road_access_serialization.hpp
index babb58859d..483d1b1954 100644
--- a/routing/road_access_serialization.hpp
+++ b/routing/road_access_serialization.hpp
@@ -17,7 +17,7 @@ namespace routing
 class RoadAccessSerializer final
 {
 public:
-  ~RoadAccessSerializer() = delete;
+  RoadAccessSerializer() = delete;
 
   template <class Sink>
   static void Serialize(Sink & sink, RoadAccess const & roadAccess)