drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-20 13:23:59 +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

45
libs/indexer/feature.cpp
View File

@@ -52,18 +52,15 @@ int GetScaleIndex(SharedLoadInfo const & loadInfo, int scale)
scale = lastScale;
for (int i = 0; i < count; ++i)
{
if (scale <= loadInfo.GetScale(i))
return i;
}
ASSERT(false, ("No suitable geometry scale range in the map file."));
return -1;
}
}
// Get an index of outer geometry scale range.
int GetScaleIndex(SharedLoadInfo const & loadInfo, int scale,
FeatureType::GeometryOffsets const & offsets)
int GetScaleIndex(SharedLoadInfo const & loadInfo, int scale, FeatureType::GeometryOffsets const & offsets)
{
int const count = loadInfo.GetScalesCount();
ASSERT_EQUAL(count, static_cast<int>(offsets.size()), ());
@@ -119,8 +116,8 @@ uint32_t CalcOffset(ArrayByteSource const & source, uint8_t const * start)
uint8_t Header(vector<uint8_t> const & data)
{
CHECK(!data.empty(), ());
return data[0];
CHECK(!data.empty(), ());
return data[0];
}
void ReadOffsets(SharedLoadInfo const & loadInfo, ArrayByteSource & src, uint8_t mask,
@@ -195,7 +192,7 @@ FeatureType::FeatureType(SharedLoadInfo const * loadInfo, vector<uint8_t> && buf
{
CHECK(m_loadInfo, ());
m_header = Header(m_data); // Parse the header and optional name/layer/addinfo.
m_header = Header(m_data); // Parse the header and optional name/layer/addinfo.
}
std::unique_ptr<FeatureType> FeatureType::CreateFromMapObject(osm::MapObject const & emo)
@@ -263,7 +260,7 @@ feature::GeomType FeatureType::GetGeomType() const
{
case HeaderGeomType::Line: return GeomType::Line;
case HeaderGeomType::Area: return GeomType::Area;
default: return GeomType::Point; // HeaderGeomType::Point/PointEx
default: return GeomType::Point; // HeaderGeomType::Point/PointEx
}
}
@@ -287,7 +284,7 @@ void FeatureType::ParseTypes()
{
// Possible for newer MWMs with added types.
LOG(LWARNING, ("Incorrect type index for feature. FeatureID:", m_id, ". Incorrect index:", index,
". Loaded feature types:", m_types, ". Total count of types:", count));
". Loaded feature types:", m_types, ". Total count of types:", count));
m_types[i] = c.GetStubType();
}
@@ -362,9 +359,7 @@ void FeatureType::ParseHeader2()
if (elemsCount == 0)
geomScalesMask = bitSource.Read(4);
else
{
ASSERT(headerGeomType == HeaderGeomType::Area || elemsCount > 1, ());
}
}
ArrayByteSource src(bitSource.RoundPtr());
@@ -574,7 +569,8 @@ FeatureType::GeomStat FeatureType::GetOuterTrianglesStats()
{
CHECK(m_loadInfo && m_parsed.m_header2 && !m_parsed.m_triangles, ("Call geometry stats first and once!"));
int const scalesCount = m_loadInfo->GetScalesCount();
ASSERT_LESS_OR_EQUAL(scalesCount, static_cast<int>(DataHeader::kMaxScalesCount), ("MWM has too many geometry scales!"));
ASSERT_LESS_OR_EQUAL(scalesCount, static_cast<int>(DataHeader::kMaxScalesCount),
("MWM has too many geometry scales!"));
FeatureType::GeomStat res;
auto const headerGeomType = static_cast<HeaderGeomType>(Header(m_data) & HEADER_MASK_GEOMTYPE);
@@ -659,9 +655,7 @@ std::string FeatureType::DebugString()
m2::PointD keyPoint;
switch (GetGeomType())
{
case GeomType::Point:
keyPoint = m_center;
break;
case GeomType::Point: keyPoint = m_center; break;
case GeomType::Line:
if (m_points.empty())
@@ -676,9 +670,7 @@ std::string FeatureType::DebugString()
keyPoint = (m_triangles[0] + m_triangles[1] + m_triangles[2]) / 3.0;
break;
case GeomType::Undefined:
ASSERT(false, ());
break;
case GeomType::Undefined: ASSERT(false, ()); break;
}
// Print coordinates in (lat,lon) for better investigation capabilities.
res += ": " + DebugPrint(keyPoint) + "; " + DebugPrint(mercator::ToLatLon(keyPoint)) + "\n";
@@ -776,13 +768,14 @@ void FeatureType::GetPreferredNames(bool allowTranslit, int8_t deviceLang, featu
ParseCommon();
feature::GetPreferredNames({ GetNames(), mwmInfo->GetRegionData(), deviceLang, allowTranslit }, out);
feature::GetPreferredNames({GetNames(), mwmInfo->GetRegionData(), deviceLang, allowTranslit}, out);
}
string_view FeatureType::GetReadableName()
{
feature::NameParamsOut out;
GetReadableName(false /* allowTranslit */, StringUtf8Multilang::GetLangIndex(languages::GetCurrentMapLanguage()), out);
GetReadableName(false /* allowTranslit */, StringUtf8Multilang::GetLangIndex(languages::GetCurrentMapLanguage()),
out);
return out.primary;
}
@@ -797,7 +790,7 @@ void FeatureType::GetReadableName(bool allowTranslit, int8_t deviceLang, feature
ParseCommon();
feature::GetReadableName({ GetNames(), mwmInfo->GetRegionData(), deviceLang, allowTranslit }, out);
feature::GetReadableName({GetNames(), mwmInfo->GetRegionData(), deviceLang, allowTranslit}, out);
}
string const & FeatureType::GetHouseNumber()
@@ -816,9 +809,7 @@ string_view FeatureType::GetName(int8_t lang)
// We don't store empty names. UPD: We do for coast features :)
string_view name;
if (m_params.name.GetString(lang, name))
{
ASSERT(!name.empty() || m_id.m_mwmId.GetInfo()->GetType() == MwmInfo::COASTS, ());
}
return name;
}
@@ -829,7 +820,10 @@ uint8_t FeatureType::GetRank()
return m_params.rank;
}
uint64_t FeatureType::GetPopulation() { return feature::RankToPopulation(GetRank()); }
uint64_t FeatureType::GetPopulation()
{
return feature::RankToPopulation(GetRank());
}
string const & FeatureType::GetRef()
{
@@ -863,6 +857,5 @@ bool FeatureType::HasMetadata(feature::Metadata::EType type)
if (m_metadata.Has(type))
return true;
return base::FindIf(m_metaIds, [&type](auto const & v) { return v.first == type; }) !=
m_metaIds.end();
return base::FindIf(m_metaIds, [&type](auto const & v) { return v.first == type; }) != m_metaIds.end();
}