git-clang-format

6 files changed, 27 insertions, 34 deletions

diff --git a/generator/altitude_generator.cpp b/generator/altitude_generator.cpp
index c8eb5e2d81..27732297ef 100644
--- a/generator/altitude_generator.cpp
+++ b/generator/altitude_generator.cpp
@@ -11,11 +11,11 @@
 
 #include "coding/file_container.hpp"
 #include "coding/file_name_utils.hpp"
+#include "coding/internal/file_data.hpp"
 #include "coding/read_write_utils.hpp"
 #include "coding/reader.hpp"
 #include "coding/succinct_mapper.hpp"
 #include "coding/varint.hpp"
-#include "coding/internal/file_data.hpp"
 
 #include "geometry/latlon.hpp"
 
@@ -46,7 +46,6 @@ class SrtmGetter : public AltitudeGetter
 {
 public:
   SrtmGetter(string const & srtmDir) : m_srtmManager(srtmDir) {}
-
   // AltitudeGetter overrides:
   feature::TAltitude GetAltitude(m2::PointD const & p) override
   {
@@ -80,14 +79,12 @@ public:
   }
 
   TFeatureAltitudes const & GetFeatureAltitudes() const { return m_featureAltitudes; }
-
   succinct::bit_vector_builder & GetAltitudeAvailabilityBuilder()
   {
     return m_altitudeAvailabilityBuilder;
   }
 
   TAltitude GetMinAltitude() const { return m_minAltitude; }
-
   void operator()(FeatureType const & f, uint32_t const & id)
   {
     if (id != m_altitudeAvailabilityBuilder.size())
@@ -97,10 +94,8 @@ public:
     }
 
     bool hasAltitude = false;
-    MY_SCOPE_GUARD(altitudeAvailabilityBuilding, [&] ()
-    {
-      m_altitudeAvailabilityBuilder.push_back(hasAltitude);
-    });
+    MY_SCOPE_GUARD(altitudeAvailabilityBuilding,
+                   [&]() { m_altitudeAvailabilityBuilder.push_back(hasAltitude); });
 
     if (!routing::IsRoad(feature::TypesHolder(f)))
       return;
@@ -135,11 +130,7 @@ public:
       m_minAltitude = min(minFeatureAltitude, m_minAltitude);
   }
 
-  bool HasAltitudeInfo() const
-  {
-    return !m_featureAltitudes.empty();
-  }
-
+  bool HasAltitudeInfo() const { return !m_featureAltitudes.empty(); }
   bool IsFeatureAltitudesSorted()
   {
     return is_sorted(m_featureAltitudes.begin(), m_featureAltitudes.end(),
diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp
index 33013febb3..81d6130e45 100644
--- a/generator/feature_builder.cpp
+++ b/generator/feature_builder.cpp
@@ -2,8 +2,8 @@
 
 #include "routing/bicycle_model.hpp"
 #include "routing/car_model.hpp"
-#include "routing/routing_helpers.hpp"
 #include "routing/pedestrian_model.hpp"
+#include "routing/routing_helpers.hpp"
 
 #include "indexer/feature_impl.hpp"
 #include "indexer/feature_visibility.hpp"
diff --git a/generator/generator_tests/altitude_test.cpp b/generator/generator_tests/altitude_test.cpp
index 935794630e..7bbab0b6a7 100644
--- a/generator/generator_tests/altitude_test.cpp
+++ b/generator/generator_tests/altitude_test.cpp
@@ -9,8 +9,8 @@
 
 #include "indexer/altitude_loader.hpp"
 #include "indexer/classificator_loader.hpp"
-#include "indexer/index.hpp"
 #include "indexer/feature_processor.hpp"
+#include "indexer/index.hpp"
 
 #include "geometry/point2d.hpp"
 
@@ -38,7 +38,8 @@ namespace
 // in the mwms are correct. The mwms are initialized with different sets of features.
 // There are several restrictions for these features:
 // * all of them are linear
-// * all coords of these features should be integer (it's necessary for easy implementation of MockAltitudeGetter)
+// * all coords of these features should be integer (it's necessary for easy implementation of
+// MockAltitudeGetter)
 // * if accoding to one feature a point has some altitude, the point of another feature
 //   with the same coords has to have the same altitude
 // @TODO(bykoianko) Add ability to add to the tests not road features without altitude information.
@@ -51,7 +52,6 @@ string const kTestMwm = "test";
 struct Point3D
 {
   Point3D(int32_t x, int32_t y, TAltitude a) : m_point(x, y), m_altitude(a) {}
-
   m2::PointI m_point;
   TAltitude m_altitude;
 };
@@ -69,7 +69,6 @@ public:
   using TMockAltitudes = map<m2::PointI, TAltitude>;
 
   MockAltitudeGetter(TMockAltitudes && altitudes) : m_altitudes(altitudes) {}
-
   // AltitudeGetter overrides:
   TAltitude GetAltitude(m2::PointD const & p) override
   {
@@ -103,7 +102,8 @@ void FillAltitudes(vector<TPoint3DList> const & roads,
       auto it = altitudes.find(geom3D[i].m_point);
       if (it != altitudes.end())
       {
-        CHECK_EQUAL(it->second, geom3D[i].m_altitude, ("Point", it->first, "is set with two different altitudes."));
+        CHECK_EQUAL(it->second, geom3D[i].m_altitude,
+                    ("Point", it->first, "is set with two different altitudes."));
         continue;
       }
       altitudes[geom3D[i].m_point] = geom3D[i].m_altitude;
@@ -119,12 +119,12 @@ void BuildMwmWithoutAltitudes(vector<TPoint3DList> const & roads, LocalCountryFi
     builder.Add(generator::tests_support::TestStreet(ExtractPoints(geom3D), string(), string()));
 }
 
-void TestAltitudes(MwmValue const & mwmValue, string const & mwmPath, MockAltitudeGetter & altitudeGetter)
+void TestAltitudes(MwmValue const & mwmValue, string const & mwmPath,
+                   MockAltitudeGetter & altitudeGetter)
 {
   AltitudeLoader loader(mwmValue);
 
-  auto processor = [&altitudeGetter, &loader](FeatureType const & f, uint32_t const & id)
-  {
+  auto processor = [&altitudeGetter, &loader](FeatureType const & f, uint32_t const & id) {
     f.ParseGeometry(FeatureType::BEST_GEOMETRY);
     size_t const pointsCount = f.GetPointsCount();
     TAltitudes const altitudes = loader.GetAltitudes(id, pointsCount);
@@ -210,4 +210,4 @@ UNIT_TEST(AltitudeGenerationTest_FourRoads)
   vector<TPoint3DList> const roads = {kRoad1, kRoad2, kRoad3, kRoad4};
   TestAltitudesBuilding(roads);
 }
-} // namespace
+}  // namespace
diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp
index a7f372b320..eb9440b3bf 100644
--- a/generator/generator_tool/generator_tool.cpp
+++ b/generator/generator_tool/generator_tool.cpp
@@ -36,21 +36,25 @@ DEFINE_bool(generate_classif, false, "Generate classificator.");
 
 DEFINE_bool(preprocess, false, "1st pass - create nodes/ways/relations data.");
 DEFINE_bool(make_coasts, false, "Create intermediate file with coasts data.");
-DEFINE_bool(emit_coasts, false, "Push coasts features from intermediate file to out files/countries.");
+DEFINE_bool(emit_coasts, false,
+            "Push coasts features from intermediate file to out files/countries.");
 
 DEFINE_bool(generate_features, false, "2nd pass - generate intermediate features.");
-DEFINE_bool(generate_geometry, false, "3rd pass - split and simplify geometry and triangles for features.");
+DEFINE_bool(generate_geometry, false,
+            "3rd pass - split and simplify geometry and triangles for features.");
 DEFINE_bool(generate_index, false, "4rd pass - generate index.");
 DEFINE_bool(generate_search_index, false, "5th pass - generate search index.");
 DEFINE_bool(calc_statistics, false, "Calculate feature statistics for specified mwm bucket files.");
 DEFINE_bool(type_statistics, false, "Calculate statistics by type for specified mwm bucket files.");
 DEFINE_bool(preload_cache, false, "Preload all ways and relations cache.");
-DEFINE_string(node_storage, "map", "Type of storage for intermediate points representation. Available: raw, map, mem.");
+DEFINE_string(node_storage, "map",
+              "Type of storage for intermediate points representation. Available: raw, map, mem.");
 DEFINE_string(data_path, "", "Working directory, 'path_to_exe/../../data' if empty.");
 DEFINE_string(output, "", "File name for process (without 'mwm' ext).");
 DEFINE_string(intermediate_data_path, "", "Path to stored nodes, ways, relations.");
 DEFINE_bool(generate_world, false, "Generate separate world file.");
-DEFINE_bool(split_by_polygons, false, "Use countries borders to split planet by regions and countries.");
+DEFINE_bool(split_by_polygons, false,
+            "Use countries borders to split planet by regions and countries.");
 DEFINE_bool(dump_types, false, "Prints all types combinations and their total count.");
 DEFINE_bool(dump_prefixes, false, "Prints statistics on feature's' name prefixes.");
 DEFINE_bool(dump_search_tokens, false, "Print statistics on search tokens.");
@@ -70,10 +74,11 @@ DEFINE_string(osm_file_type, "xml", "Input osm area file type [xml, o5m].");
 DEFINE_string(user_resource_path, "", "User defined resource path for classificator.txt and etc.");
 DEFINE_string(booking_data, "", "Path to booking data in .tsv format.");
 DEFINE_string(booking_reference_path, "", "Path to mwm dataset for match booking addresses.");
-DEFINE_uint64(planet_version, my::SecondsSinceEpoch(), "Version as seconds since epoch, by default - now.");
-DEFINE_string(
-    srtm_path, "",
-    "Path to srtm directory. If it is set, generates section with altitude information about roads.");
+DEFINE_uint64(planet_version, my::SecondsSinceEpoch(),
+              "Version as seconds since epoch, by default - now.");
+DEFINE_string(srtm_path, "",
+              "Path to srtm directory. If it is set, generates section with altitude information "
+              "about roads.");
 
 int main(int argc, char ** argv)
 {
diff --git a/generator/srtm_parser.cpp b/generator/srtm_parser.cpp
index 34ba2911b7..e47f32626d 100644
--- a/generator/srtm_parser.cpp
+++ b/generator/srtm_parser.cpp
@@ -145,7 +145,6 @@ void SrtmTile::Invalidate()
 
 // SrtmTileManager ---------------------------------------------------------------------------------
 SrtmTileManager::SrtmTileManager(string const & dir) : m_dir(dir) {}
-
 feature::TAltitude SrtmTileManager::GetHeight(ms::LatLon const & coord)
 {
   string const base = SrtmTile::GetBase(coord);
diff --git a/generator/srtm_parser.hpp b/generator/srtm_parser.hpp
index 541cc32876..e0e6096e45 100644
--- a/generator/srtm_parser.hpp
+++ b/generator/srtm_parser.hpp
@@ -21,7 +21,6 @@ public:
   void Init(string const & dir, ms::LatLon const & coord);
 
   inline bool IsValid() const { return m_valid; }
-
   // Returns height in meters at |coord| or kInvalidAltitude.
   feature::TAltitude GetHeight(ms::LatLon const & coord);
 
@@ -34,7 +33,6 @@ private:
   };
 
   inline size_t Size() const { return m_data.size() / sizeof(feature::TAltitude); }
-
   void Invalidate();
 
   string m_data;