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

63
generator/restriction_writer.cpp
View File

@@ -26,49 +26,36 @@ namespace routing_builder
{
using namespace routing;
std::vector<std::pair<std::string, Restriction::Type>> const kRestrictionTypes ={
{"no_entry", Restriction::Type::No},
{"no_exit", Restriction::Type::No},
{"no_left_turn", Restriction::Type::No},
{"no_right_turn", Restriction::Type::No},
{"no_straight_on", Restriction::Type::No},
{"no_u_turn", Restriction::Type::NoUTurn},
{"only_left_turn", Restriction::Type::Only},
{"only_right_turn", Restriction::Type::Only},
{"only_straight_on", Restriction::Type::Only},
{"only_u_turn", Restriction::Type::OnlyUTurn}
};
std::vector<std::pair<std::string, Restriction::Type>> const kRestrictionTypes = {
{"no_entry", Restriction::Type::No}, {"no_exit", Restriction::Type::No},
{"no_left_turn", Restriction::Type::No}, {"no_right_turn", Restriction::Type::No},
{"no_straight_on", Restriction::Type::No}, {"no_u_turn", Restriction::Type::NoUTurn},
{"only_left_turn", Restriction::Type::Only}, {"only_right_turn", Restriction::Type::Only},
{"only_straight_on", Restriction::Type::Only}, {"only_u_turn", Restriction::Type::OnlyUTurn}};
/// \brief Converts restriction type form string to RestrictionCollector::Type.
/// \returns true if conversion was successful and false otherwise.
bool TagToType(std::string const & tag, Restriction::Type & type)
{
auto const it = base::FindIf(kRestrictionTypes,
[&tag](std::pair<std::string, Restriction::Type> const & v) {
return v.first == tag;
});
[&tag](std::pair<std::string, Restriction::Type> const & v) { return v.first == tag; });
if (it == kRestrictionTypes.cend())
return false; // Unsupported restriction type.
return false; // Unsupported restriction type.
type = it->second;
return true;
}
std::vector<RelationElement::Member> GetMembersByTag(RelationElement const & relationElement,
std::string const & tag)
std::vector<RelationElement::Member> GetMembersByTag(RelationElement const & relationElement, std::string const & tag)
{
std::vector<RelationElement::Member> result;
for (auto const & member : relationElement.m_ways)
{
if (member.second == tag)
result.emplace_back(member);
}
for (auto const & member : relationElement.m_nodes)
{
if (member.second == tag)
result.emplace_back(member);
}
return result;
}
@@ -76,16 +63,12 @@ std::vector<RelationElement::Member> GetMembersByTag(RelationElement const & rel
OsmElement::EntityType GetType(RelationElement const & relationElement, uint64_t osmId)
{
for (auto const & member : relationElement.m_ways)
{
if (member.first == osmId)
return OsmElement::EntityType::Way;
}
for (auto const & member : relationElement.m_nodes)
{
if (member.first == osmId)
return OsmElement::EntityType::Node;
}
UNREACHABLE();
}
@@ -94,7 +77,8 @@ std::string const RestrictionWriter::kNodeString = "node";
std::string const RestrictionWriter::kWayString = "way";
RestrictionWriter::RestrictionWriter(std::string const & filename, IDRInterfacePtr const & cache)
: generator::CollectorInterface(filename), m_cache(cache)
: generator::CollectorInterface(filename)
, m_cache(cache)
{
m_stream.exceptions(std::fstream::failbit | std::fstream::badbit);
m_stream.open(GetTmpFilename());
@@ -106,7 +90,7 @@ std::shared_ptr<generator::CollectorInterface> RestrictionWriter::Clone(IDRInter
return std::make_shared<RestrictionWriter>(GetFilename(), cache ? cache : m_cache);
}
//static
// static
RestrictionWriter::ViaType RestrictionWriter::ConvertFromString(std::string const & str)
{
if (str == kNodeString)
@@ -118,10 +102,8 @@ RestrictionWriter::ViaType RestrictionWriter::ConvertFromString(std::string cons
UNREACHABLE();
}
bool ValidateOsmRestriction(std::vector<RelationElement::Member> & from,
std::vector<RelationElement::Member> & via,
std::vector<RelationElement::Member> & to,
RelationElement const & relationElement)
bool ValidateOsmRestriction(std::vector<RelationElement::Member> & from, std::vector<RelationElement::Member> & via,
std::vector<RelationElement::Member> & to, RelationElement const & relationElement)
{
if (relationElement.GetType() != "restriction")
return false;
@@ -138,9 +120,8 @@ bool ValidateOsmRestriction(std::vector<RelationElement::Member> & from,
// https://wiki.openstreetmap.org/wiki/Relation:restriction#Members
if (via.size() != 1)
{
bool const allMembersAreWays = base::AllOf(via, [&](auto const & member) {
return GetType(relationElement, member.first) == OsmElement::EntityType::Way;
});
bool const allMembersAreWays = base::AllOf(via, [&](auto const & member)
{ return GetType(relationElement, member.first) == OsmElement::EntityType::Way; });
if (!allMembersAreWays)
return false;
@@ -171,12 +152,9 @@ void RestrictionWriter::CollectRelation(RelationElement const & relationElement)
return;
auto const viaType =
GetType(relationElement, via.back().first) == OsmElement::EntityType::Node ? ViaType::Node
: ViaType::Way;
GetType(relationElement, via.back().first) == OsmElement::EntityType::Node ? ViaType::Node : ViaType::Way;
auto const printHeader = [&]() {
m_stream << DebugPrint(type) << "," << DebugPrint(viaType) << ",";
};
auto const printHeader = [&]() { m_stream << DebugPrint(type) << "," << DebugPrint(viaType) << ","; };
if (viaType == ViaType::Way)
{
@@ -214,7 +192,10 @@ void RestrictionWriter::Save()
CHECK(base::CopyFileX(GetTmpFilename(), GetFilename()), ());
}
void RestrictionWriter::OrderCollectedData() { generator::OrderTextFileByLine(GetFilename()); }
void RestrictionWriter::OrderCollectedData()
{
generator::OrderTextFileByLine(GetFilename());
}
void RestrictionWriter::MergeInto(RestrictionWriter & collector) const
{