drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format all C++ and Java code via clang-format

Browse Source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin
2025-08-17 14:32:37 +07:00
parent 9f0290c0ec
commit bfffa1fff4
2169 changed files with 56441 additions and 64188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
generator/isolines_generator.cpp
View File

@@ -18,18 +18,13 @@ std::string_view const kTypeZero = "zero";
std::string GetIsolineName(int altitude, int step, int minAltitude, int maxAltitude)
{
if (step > 10 ||
abs(altitude) % kNamedAltStep == 0 ||
maxAltitude - minAltitude <= kNamedAltRange)
{
if (step > 10 || abs(altitude) % kNamedAltStep == 0 || maxAltitude - minAltitude <= kNamedAltRange)
return strings::to_string(altitude);
}
return "";
}
} // namespace
IsolineFeaturesGenerator::IsolineFeaturesGenerator(std::string const & isolinesDir)
: m_isolinesDir(isolinesDir)
IsolineFeaturesGenerator::IsolineFeaturesGenerator(std::string const & isolinesDir) : m_isolinesDir(isolinesDir)
{
ASSERT(std::is_sorted(kAltClasses.cbegin(), kAltClasses.cend(), std::greater<int>()), ());
Classificator const & c = classif();
@@ -48,18 +43,14 @@ uint32_t IsolineFeaturesGenerator::GetIsolineType(int altitude) const
return m_altClassToType.at(0);
for (auto altStep : kAltClasses)
{
if (abs(altitude) % altStep == 0)
return m_altClassToType.at(altStep);
}
return ftype::GetEmptyValue();
}
void IsolineFeaturesGenerator::GenerateIsolines(std::string const & countryName,
FeaturesCollectFn const & fn) const
void IsolineFeaturesGenerator::GenerateIsolines(std::string const & countryName, FeaturesCollectFn const & fn) const
{
auto const isolinesPath = topography_generator::GetIsolinesFilePath(countryName,
m_isolinesDir);
auto const isolinesPath = topography_generator::GetIsolinesFilePath(countryName, m_isolinesDir);
topography_generator::Contours<topography_generator::Altitude> countryIsolines;
if (!topography_generator::LoadContours(isolinesPath, countryIsolines))
{
@@ -70,8 +61,8 @@ void IsolineFeaturesGenerator::GenerateIsolines(std::string const & countryName,
for (auto & levelIsolines : countryIsolines.m_contours)
{
auto const altitude = levelIsolines.first;
auto const isolineName = GetIsolineName(altitude, countryIsolines.m_valueStep,
countryIsolines.m_minValue, countryIsolines.m_maxValue);
auto const isolineName =
GetIsolineName(altitude, countryIsolines.m_valueStep, countryIsolines.m_minValue, countryIsolines.m_maxValue);
auto const isolineType = GetIsolineType(altitude);
if (isolineType == ftype::GetEmptyValue())
{