From e65962972279f4dd38499e9fe350e6d068017011 Mon Sep 17 00:00:00 2001 From: map-per Date: Fri, 12 Dec 2025 14:41:38 +0100 Subject: [PATCH] clang-format Signed-off-by: map-per --- .../editor_tests/feature_type_to_osm_test.cpp | 2 +- libs/editor/feature_type_to_osm.cpp | 17 ++++++++++------- libs/editor/feature_type_to_osm.hpp | 4 ++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/libs/editor/editor_tests/feature_type_to_osm_test.cpp b/libs/editor/editor_tests/feature_type_to_osm_test.cpp index 67d0f7cec..544006900 100644 --- a/libs/editor/editor_tests/feature_type_to_osm_test.cpp +++ b/libs/editor/editor_tests/feature_type_to_osm_test.cpp @@ -184,7 +184,7 @@ UNIT_TEST(ignoreComments) "deprecated:waterway|riverbank:05.2024;52;x\n" "amenity|restaurant;61;\n" "moved:amenity|telephone:05.2024;122;amenity|telephone\n" - "natural|lake;564;natural|water|lake\n"; // moved type, should be ignored + "natural|lake;564;natural|water|lake\n"; // moved type, should be ignored classificator::Load(); diff --git a/libs/editor/feature_type_to_osm.cpp b/libs/editor/feature_type_to_osm.cpp index 22df62e9a..9d7d7ca1e 100644 --- a/libs/editor/feature_type_to_osm.cpp +++ b/libs/editor/feature_type_to_osm.cpp @@ -17,7 +17,7 @@ TypeToOSMTranslator::TypeToOSMTranslator(bool initialize) void TypeToOSMTranslator::LoadConfigFile() { - Platform &p = GetPlatform(); + Platform & p = GetPlatform(); std::unique_ptr reader = p.GetReader("mapcss-mapping.csv"); ReaderStreamBuf buffer(std::move(reader)); std::istream s(&buffer); @@ -36,8 +36,8 @@ void TypeToOSMTranslator::LoadFromStream(std::istream & s) strings::Trim(line); // skip empty lines, comments, deprecated and moved types - if (line.empty() || line.front() == '#' || line.starts_with("deprecated") || - line.starts_with("moved") || line.back() != ';') + if (line.empty() || line.front() == '#' || line.starts_with("deprecated") || line.starts_with("moved") || + line.back() != ';') continue; std::vector tokens = strings::Tokenize(line, ";"); @@ -59,12 +59,14 @@ void TypeToOSMTranslator::LoadFromStream(std::istream & s) OSMTag osmTag; // e.g. "amenity-restaurant" - if (typeTokens.size() >= 2) { + if (typeTokens.size() >= 2) + { osmTag.key = typeTokens[0]; osmTag.value = typeTokens[1]; } // e.g. "building" - else if (typeTokens.size() == 1) { + else if (typeTokens.size() == 1) + { osmTag.key = typeTokens[0]; osmTag.value = "yes"; } @@ -95,7 +97,8 @@ void TypeToOSMTranslator::LoadFromStream(std::istream & s) std::string_view keyValuePair = osmTagList.substr(pos + 1, end - pos - 1); - if (keyValuePair.empty()) { + if (keyValuePair.empty()) + { ASSERT(false, ("Key value pair is empty:", line)); break; } @@ -159,4 +162,4 @@ TypeToOSMTranslator const & GetOSMTranslator() static TypeToOSMTranslator translator; return translator; } -} // namespace osm \ No newline at end of file +} // namespace editor diff --git a/libs/editor/feature_type_to_osm.hpp b/libs/editor/feature_type_to_osm.hpp index c1cf903e3..7500300e2 100644 --- a/libs/editor/feature_type_to_osm.hpp +++ b/libs/editor/feature_type_to_osm.hpp @@ -1,8 +1,8 @@ #pragma once #include -#include #include +#include namespace editor { @@ -31,4 +31,4 @@ private: TypeToOSMTranslator const & GetOSMTranslator(); -} // namespace osm \ No newline at end of file +} // namespace editor