diff options
author | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-06-28 15:48:59 +0300 |
---|---|---|
committer | Vladimir Byko-Ianko <v.bykoianko@corp.mail.ru> | 2016-07-23 10:25:10 +0300 |
commit | 06a48f68e87d06147d726827d131af4bd19bd62c (patch) | |
tree | 3f9c0b995ee242bfefd26b86f08650bb4e8b9ed6 /generator | |
parent | 7de86381e97a0606dd7db6dcba600178d9095202 (diff) |
git-clang-format
Diffstat (limited to 'generator')
-rw-r--r-- | generator/altitude_generator.cpp | 6 | ||||
-rw-r--r-- | generator/altitude_generator.hpp | 5 | ||||
-rw-r--r-- | generator/generator_tool/generator_tool.cpp | 4 | ||||
-rw-r--r-- | generator/srtm_parser.hpp | 5 |
4 files changed, 13 insertions, 7 deletions
diff --git a/generator/altitude_generator.cpp b/generator/altitude_generator.cpp index 8c9fd4d6e5..7331aa40aa 100644 --- a/generator/altitude_generator.cpp +++ b/generator/altitude_generator.cpp @@ -67,14 +67,14 @@ private: generator::SrtmTileManager m_srtmManager; TFeatureAltitudeVec m_featureAltitudes; }; -} // namespace +} // namespace namespace routing { void BuildRoadAltitudes(string const & srtmPath, string const & baseDir, string const & countryName) { LOG(LINFO, ("srtmPath =", srtmPath, "baseDir =", baseDir, "countryName =", countryName)); -// string const altPath = baseDir + countryName + "." + ALTITUDE_FILE_TAG; + // string const altPath = baseDir + countryName + "." + ALTITUDE_FILE_TAG; string const mwmPath = baseDir + countryName + DATA_FILE_EXTENSION; // Writing section with altitude information. @@ -95,4 +95,4 @@ void BuildRoadAltitudes(string const & srtmPath, string const & baseDir, string LOG(LINFO, ("Altitude was written for", featureAltitudes.size(), "features.")); } } -} // namespace routing +} // namespace routing diff --git a/generator/altitude_generator.hpp b/generator/altitude_generator.hpp index 42651b8c59..0133d401cb 100644 --- a/generator/altitude_generator.hpp +++ b/generator/altitude_generator.hpp @@ -4,5 +4,6 @@ namespace routing { -void BuildRoadAltitudes(string const & srtmPath, string const & baseDir, string const & countryName); -} // namespace routing +void BuildRoadAltitudes(string const & srtmPath, string const & baseDir, + string const & countryName); +} // namespace routing diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp index 02da78143d..ffd5e7d370 100644 --- a/generator/generator_tool/generator_tool.cpp +++ b/generator/generator_tool/generator_tool.cpp @@ -71,7 +71,9 @@ DEFINE_string(user_resource_path, "", "User defined resource path for classifica 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 When set generates section with altitude information about roads."); +DEFINE_string( + srtm_path, "", + "Path to srtm directory. If When set generates section with altitude information about roads."); int main(int argc, char ** argv) { diff --git a/generator/srtm_parser.hpp b/generator/srtm_parser.hpp index b70bcbface..ff1fdce283 100644 --- a/generator/srtm_parser.hpp +++ b/generator/srtm_parser.hpp @@ -28,7 +28,10 @@ public: static string GetBase(ms::LatLon coord); private: - inline feature::TAltitude const * Data() const { return reinterpret_cast<feature::TAltitude const *>(m_data.data()); }; + inline feature::TAltitude const * Data() const + { + return reinterpret_cast<feature::TAltitude const *>(m_data.data()); + }; inline size_t Size() const { return m_data.size() / sizeof(feature::TAltitude); } |