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

46
generator/osm_source.cpp
View File

@@ -73,17 +73,12 @@ void AddElementToCache(cache::IntermediateDataWriter & cache, OsmElement && elem
{
switch (member.m_type)
{
case OsmElement::EntityType::Node:
relation.m_nodes.emplace_back(member.m_ref, std::move(member.m_role));
break;
case OsmElement::EntityType::Way:
relation.m_ways.emplace_back(member.m_ref, std::move(member.m_role));
break;
case OsmElement::EntityType::Node: relation.m_nodes.emplace_back(member.m_ref, std::move(member.m_role)); break;
case OsmElement::EntityType::Way: relation.m_ways.emplace_back(member.m_ref, std::move(member.m_role)); break;
case OsmElement::EntityType::Relation:
relation.m_relations.emplace_back(member.m_ref, std::move(member.m_role));
break;
default:
break;
default: break;
}
}
@@ -95,8 +90,7 @@ void AddElementToCache(cache::IntermediateDataWriter & cache, OsmElement && elem
break;
}
default:
break;
default: break;
}
}
@@ -126,12 +120,9 @@ void ProcessOsmElementsFromO5M(SourceReader & stream, std::function<void(OsmElem
ProcessorOsmElementsFromO5M::ProcessorOsmElementsFromO5M(SourceReader & stream)
: m_stream(stream)
, m_dataset([&](uint8_t * buffer, size_t size) {
return m_stream.Read(reinterpret_cast<char *>(buffer), size);
})
, m_dataset([&](uint8_t * buffer, size_t size) { return m_stream.Read(reinterpret_cast<char *>(buffer), size); })
, m_pos(m_dataset.begin())
{
}
{}
bool ProcessorOsmElementsFromO5M::TryRead(OsmElement & element)
{
@@ -139,7 +130,8 @@ bool ProcessorOsmElementsFromO5M::TryRead(OsmElement & element)
return false;
using Type = osm::O5MSource::EntityType;
auto const translate = [](Type t) -> OsmElement::EntityType {
auto const translate = [](Type t) -> OsmElement::EntityType
{
switch (t)
{
case Type::Node: return OsmElement::EntityType::Node;
@@ -191,13 +183,9 @@ bool ProcessorOsmElementsFromO5M::TryRead(OsmElement & element)
}
ProcessorOsmElementsFromXml::ProcessorOsmElementsFromXml(SourceReader & stream)
: m_xmlSource([&, this](OsmElement && e)
{
m_queue.emplace(std::move(e));
})
: m_xmlSource([&, this](OsmElement && e) { m_queue.emplace(std::move(e)); })
, m_parser(stream, m_xmlSource)
{
}
{}
bool ProcessorOsmElementsFromXml::TryReadFromQueue(OsmElement & element)
{
@@ -217,7 +205,8 @@ bool ProcessorOsmElementsFromXml::TryRead(OsmElement & element)
{
if (TryReadFromQueue(element))
return true;
} while (m_parser.Read());
}
while (m_parser.Read());
return TryReadFromQueue(element);
}
@@ -228,8 +217,7 @@ bool ProcessorOsmElementsFromXml::TryRead(OsmElement & element)
bool GenerateIntermediateData(feature::GenerateInfo & info)
{
auto nodes =
cache::CreatePointStorageWriter(info.m_nodeStorageType, info.GetCacheFileName(NODES_FILE));
auto nodes = cache::CreatePointStorageWriter(info.m_nodeStorageType, info.GetCacheFileName(NODES_FILE));
cache::IntermediateDataWriter cache(*nodes, info);
TownsDumper towns;
SourceReader reader = info.m_osmFileName.empty() ? SourceReader() : SourceReader(info.m_osmFileName);
@@ -244,12 +232,8 @@ bool GenerateIntermediateData(feature::GenerateInfo & info)
switch (info.m_osmFileType)
{
case feature::GenerateInfo::OsmSourceType::XML:
ProcessOsmElementsFromXML(reader, processor);
break;
case feature::GenerateInfo::OsmSourceType::O5M:
ProcessOsmElementsFromO5M(reader, processor);
break;
case feature::GenerateInfo::OsmSourceType::XML: ProcessOsmElementsFromXML(reader, processor); break;
case feature::GenerateInfo::OsmSourceType::O5M: ProcessOsmElementsFromO5M(reader, processor); break;
}
cache.SaveIndex();