Add booking_quality_check to the project. Style fixes.

generator/generate_info.hpp

@@ -11,7 +11,6 @@
 
 namespace feature
 {
-
 struct GenerateInfo
 {
   enum class NodeStorageType
@@ -27,7 +26,6 @@ struct GenerateInfo
     O5M
   };
 
-
   // Directory for .mwm.tmp files.
   string m_tmpDir;
   // Directory for result .mwm files.
@@ -41,7 +39,7 @@ struct GenerateInfo
   NodeStorageType m_nodeStorageType;
   OsmSourceType m_osmFileType;
   string m_osmFileName;
-  
+
   string m_bookingDatafileName;
   string m_bookingReferenceDir;
 
@@ -86,18 +84,20 @@ struct GenerateInfo
   {
     return my::JoinFoldersToPath(m_tmpDir, fileName + ext);
   }
+
   string GetTargetFileName(string const & fileName, char const * ext = DATA_FILE_EXTENSION) const
   {
     return my::JoinFoldersToPath(m_targetDir, fileName + ext);
   }
+
   string GetIntermediateFileName(string const & fileName, char const * ext = DATA_FILE_EXTENSION) const
   {
     return my::JoinFoldersToPath(m_intermediateDir, fileName + ext);
   }
+
   string GetAddressesFileName() const
   {
     return ((m_genAddresses && !m_fileName.empty()) ? GetTargetFileName(m_fileName, ADDR_FILE_EXTENSION) : string());
   }
 };
-
-} // namespace feature
+}  // namespace feature

generator/osm2type.cpp

@@ -223,7 +223,7 @@ namespace ftype
     CachedTypes()
     {
       Classificator const & c = classif();
-      
+
       for (auto const & e : (StringIL[]) { {"entrance"}, {"highway"} })
         m_types.push_back(c.GetTypeByPath(e));
 
@@ -648,6 +648,7 @@ namespace ftype
       { "addr:housename", "*", [&params](string & k, string & v) { params.AddHouseName(v); k.clear(); v.clear(); }},
       { "addr:street", "*", [&params](string & k, string & v) { params.AddStreet(v); k.clear(); v.clear(); }},
       //{ "addr:streetnumber", "*", [&params](string & k, string & v) { params.AddStreet(v); k.clear(); v.clear(); }},
+      // This line was first introduced by vng and was never used uncommented.
       //{ "addr:full", "*", [&params](string & k, string & v) { params.AddAddress(v); k.clear(); v.clear(); }},
 
       // addr:postcode must be passed to the metadata processor.

indexer/classificator_loader.cpp

@@ -36,7 +36,7 @@ void ReadCommon(unique_ptr<Reader> classificator,
     c.ReadTypesMapping(s);
   }
 }
-}
+}  // namespace
 
 namespace classificator
 {
@@ -66,4 +66,4 @@ namespace classificator
 
     LOG(LDEBUG, ("Reading of classificator finished"));
   }
-}
+}  // namespace classificator

omim.pro

@@ -34,7 +34,12 @@ SUBDIRS = 3party base coding geometry editor indexer routing search
     generator_tool.subdir = generator/generator_tool
     generator_tool.depends = $$SUBDIRS
     SUBDIRS *= generator_tool
-  }
+
+    # Booking quality check
+    booking_quality_check.subdir = generator/booking_quality_check
+    booking_quality_check.depends = $$SUBDIRS
+    SUBDIRS *= booking_quality_check
+   }
 
   # Integration tests dependencies for gtool.
   # TODO(AlexZ): Avoid duplication for routing_integration_tests.