From 9ffdda4cb659561554a6125f45eadaefb58f5f5b Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Thu, 9 Jul 2015 16:21:29 +0300
Subject: [PATCH] Minor code style changes.

---
 base/string_utils.hpp                     | 2 ++
 generator/feature_builder.cpp             | 6 ++----
 generator/feature_builder.hpp             | 1 +
 generator/feature_sorter.cpp              | 3 +--
 generator/generator_tests/coasts_test.cpp | 4 +---
 generator/osm2type.cpp                    | 3 +--
 map/framework.cpp                         | 2 +-
 7 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/base/string_utils.hpp b/base/string_utils.hpp
index 08e282e796..5280bfe90d 100644
--- a/base/string_utils.hpp
+++ b/base/string_utils.hpp
@@ -178,6 +178,8 @@ bool to_uint64(char const * s, uint64_t & i);
 bool to_int64(char const * s, int64_t & i);
 bool to_double(char const * s, double & d);
 
+inline bool is_number(string const & s) { int64_t dummy; return to_int64(s.c_str(), dummy); }
+
 inline bool to_int(string const & s, int & i) { return to_int(s.c_str(), i); }
 inline bool to_uint64(string const & s, uint64_t & i) { return to_uint64(s.c_str(), i); }
 inline bool to_int64(string const & s, int64_t & i) { return to_int64(s.c_str(), i); }
diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp
index 104410c13a..e4fdda07bf 100644
--- a/generator/feature_builder.cpp
+++ b/generator/feature_builder.cpp
@@ -255,8 +255,7 @@ bool FeatureBuilder1::PreSerialize()
 
 void FeatureBuilder1::RemoveUselessNames()
 {
-  int64_t dummy;
-  if (!m_params.name.IsEmpty() && !GetCoastCell(dummy))
+  if (!m_params.name.IsEmpty() && !IsCoastCell())
   {
     using namespace feature;
 
@@ -274,8 +273,7 @@ void FeatureBuilder1::RemoveUselessNames()
 
 void FeatureBuilder1::RemoveNameIfInvisible(int minS, int maxS)
 {
-  int64_t dummy;
-  if (!m_params.name.IsEmpty() && !GetCoastCell(dummy))
+  if (!m_params.name.IsEmpty() && !IsCoastCell())
   {
     pair<int, int> const range = GetDrawableScaleRangeForRules(GetFeatureBase(), RULE_ANY_TEXT);
     if (range.first > maxS || range.second < minS)
diff --git a/generator/feature_builder.hpp b/generator/feature_builder.hpp
index 965f7dbf5f..1cfc201442 100644
--- a/generator/feature_builder.hpp
+++ b/generator/feature_builder.hpp
@@ -150,6 +150,7 @@ public:
   int GetMinFeatureDrawScale() const;
 
   void SetCoastCell(int64_t iCell, string const & strCell);
+  inline bool IsCoastCell() const { return (m_coastCell != -1); }
   inline bool GetCoastCell(int64_t & cell) const
   {
     if (m_coastCell != -1)
diff --git a/generator/feature_sorter.cpp b/generator/feature_sorter.cpp
index 52d83992c3..a37115401d 100644
--- a/generator/feature_sorter.cpp
+++ b/generator/feature_sorter.cpp
@@ -434,8 +434,7 @@ namespace feature
         int const level = m_header.GetScale(i);
         if (fb.IsDrawableInRange(i > 0 ? m_header.GetScale(i-1) + 1 : 0, level))
         {
-          int64_t dummy;
-          bool const isCoast = fb.GetCoastCell(dummy);
+          bool const isCoast = fb.IsCoastCell();
           m2::RectD const rect = fb.GetLimitRect();
 
           // Simplify and serialize geometry.
diff --git a/generator/generator_tests/coasts_test.cpp b/generator/generator_tests/coasts_test.cpp
index bcf3e2a586..a727efe2f6 100644
--- a/generator/generator_tests/coasts_test.cpp
+++ b/generator/generator_tests/coasts_test.cpp
@@ -103,9 +103,7 @@ namespace
   protected:
     bool HasID(FeatureBuilder1 const & fb) const
     {
-      int64_t dummy;
-      TEST(fb.GetCoastCell(dummy), ());
-
+      TEST(fb.IsCoastCell(), ());
       return (find(m_vID.begin(), m_vID.end(), fb.GetName()) != m_vID.end());
     }
 
diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp
index c4b2e78ff4..7c29fc54fe 100644
--- a/generator/osm2type.cpp
+++ b/generator/osm2type.cpp
@@ -238,8 +238,7 @@ namespace ftype
         if (!m_isKey)
         {
           // Take numbers only for "capital" and "admin_level".
-          int dummy;
-          if (strings::to_int(v, dummy))
+          if (strings::is_number(v))
             return (k == "admin_level" || k == "capital");
         }
         return true;
diff --git a/map/framework.cpp b/map/framework.cpp
index 655cc63adf..3b1afb24dd 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -2121,7 +2121,7 @@ void Framework::BuildRoute(m2::PointD const & destination)
       }
       else
       {
-        for(string const & name : route.GetAbsentCountries())
+        for (string const & name : route.GetAbsentCountries())
         {
           storage::TIndex fileIndex = m_storage.FindIndexByFile(name);
           if (m_storage.GetLatestLocalFile(fileIndex))