From b240aa5839ae1295e76899a90eebfc671af3570e Mon Sep 17 00:00:00 2001
From: Sergey Yershov <yershov@corp.mail.ru>
Date: Mon, 15 Dec 2014 17:21:55 +0300
Subject: Making mwm with additional info section

---
 generator/feature_generator.cpp | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'generator/feature_generator.cpp')

diff --git a/generator/feature_generator.cpp b/generator/feature_generator.cpp
index c41ddc5730..57d1e11008 100644
--- a/generator/feature_generator.cpp
+++ b/generator/feature_generator.cpp
@@ -418,31 +418,27 @@ public:
 
 }
 
-template <class TNodesHolder>
-  bool GenerateImpl(GenerateInfo & info, std::string const &osm_filename=std::string())
+template <class NodesHolderT>
+bool GenerateImpl(GenerateInfo & info, string const & osmFileName = string())
 {
   try
   {
-    TNodesHolder nodes(info.m_tmpDir + NODES_FILE);
+    NodesHolderT nodes(info.m_tmpDir + NODES_FILE);
 
-    typedef FileHolder<TNodesHolder> holder_t;
-    holder_t holder(nodes, info.m_tmpDir);
+    typedef FileHolder<NodesHolderT> HolderT;
+    HolderT holder(nodes, info.m_tmpDir);
     holder.LoadIndex();
 
     MainFeaturesEmitter bucketer(info);
-    SecondPassParser<MainFeaturesEmitter, holder_t> parser(
+    SecondPassParser<MainFeaturesEmitter, HolderT> parser(
           bucketer, holder,
           info.m_makeCoasts ? classif().GetCoastType() : 0,
           info.m_addressFile);
 
-    if(osm_filename.empty())
-    {
+    if (osmFileName.empty())
       ParseXMLFromStdIn(parser);
-    }
     else
-    {
-      ParseXMLFromFile(parser, osm_filename);
-    }
+      ParseXMLFromFile(parser, osmFileName);
 
     // Stop if coasts are not merged and FLAG_fail_on_coasts is set
     if (!bucketer.Finish())
@@ -458,12 +454,12 @@ template <class TNodesHolder>
   return true;
 }
 
-bool GenerateFeatures(GenerateInfo & info, bool lightNodes, std::string const &osm_filename)
+bool GenerateFeatures(GenerateInfo & info, bool lightNodes, string const & osmFileName)
 {
   if (lightNodes)
-    return GenerateImpl<points_in_map>(info, osm_filename);
+    return GenerateImpl<points_in_map>(info, osmFileName);
   else
-    return GenerateImpl<points_in_file>(info, osm_filename);
+    return GenerateImpl<points_in_file>(info, osmFileName);
 }
 
 }
-- 
cgit v1.2.3