From 70643a9e4821bd11c3f363f1708fe420965467d1 Mon Sep 17 00:00:00 2001 From: Rutger Broekhoff Date: Fri, 28 Aug 2026 22:17:10 +0200 Subject: Format again --- server/src/gpx.cpp | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'server/src/gpx.cpp') diff --git a/server/src/gpx.cpp b/server/src/gpx.cpp index 44a6bb2..f70c133 100644 --- a/server/src/gpx.cpp +++ b/server/src/gpx.cpp @@ -22,7 +22,7 @@ auto qname(std::string_view local) -> xml::qname_view } auto parse_wpt(xml::executor_ref e, xml::attribute_view attrs) - -> xml::parser + -> xml::parser { auto parse_xml_double = [](std::string_view sv) -> std::optional { return util::parse_double(sv, std::chars_format::fixed); }; @@ -41,18 +41,18 @@ auto parse_wpt(xml::executor_ref e, xml::attribute_view attrs) } if (!mlat || !mlon) throw std::runtime_error{ - "expected valid latitude and longitude for waypoint" + "expected valid latitude and longitude for waypoint" }; co_await xml::ignore_contents(e); co_return geo::point{*mlon, *mlat}; } auto parse_trkseg(xml::executor_ref e, xml::attribute_view) - -> xml::parser + -> xml::parser { auto s = track_segment{}; - while (auto mwpt = co_await allow_element( - e, qname("trkpt"), xml::hohalo())) + while (auto mwpt = + co_await allow_element(e, qname("trkpt"), xml::hohalo())) bgeo::append(s.waypoints, *mwpt); co_return std::move(s); } @@ -61,20 +61,20 @@ auto parse_trk(xml::executor_ref e, xml::attribute_view) -> xml::parser { auto t = track{}; t.name = co_await allow_element( - e, qname("name"), xml::hohalo()); + e, qname("name"), xml::hohalo()); co_await allow_element( - e, qname("cmt"), xml::hohalo()); + e, qname("cmt"), xml::hohalo()); t.desc = co_await allow_element( - e, qname("desc"), xml::hohalo()); + e, qname("desc"), xml::hohalo()); co_await xml::ignore_contents(e, /* until */ qname("trkseg")); while (auto mseg = co_await allow_element( - e, qname("trkseg"), xml::hohalo())) + e, qname("trkseg"), xml::hohalo())) t.segments.push_back(std::move(*mseg)); co_return std::move(t); } auto parse_gpx(xml::executor_ref e, xml::attribute_view attrs) - -> xml::parser + -> xml::parser { auto f = file{}; if (attrs.lookup(qname("version")) != "1.0"sv) @@ -85,13 +85,13 @@ auto parse_gpx(xml::executor_ref e, xml::attribute_view attrs) throw std::runtime_error{"expected GPX file to have creator"}; f.meta.name = co_await allow_element( - e, qname("name"), xml::hohalo()); + e, qname("name"), xml::hohalo()); f.meta.desc = co_await allow_element( - e, qname("desc"), xml::hohalo()); + e, qname("desc"), xml::hohalo()); co_await xml::ignore_contents(e, /* until */ qname("trk")); while (auto mtrk = - co_await allow_element(e, qname("trk"), xml::hohalo())) + co_await allow_element(e, qname("trk"), xml::hohalo())) f.tracks.push_back(std::move(*mtrk)); co_await xml::ignore_contents(e); @@ -109,19 +109,19 @@ auto qname(std::string_view local) -> xml::qname_view } auto parse_metadata(xml::executor_ref e, xml::attribute_view) - -> xml::parser + -> xml::parser { auto meta = metadata{}; meta.name = co_await allow_element( - e, qname("name"), xml::hohalo()); + e, qname("name"), xml::hohalo()); meta.desc = co_await allow_element( - e, qname("desc"), xml::hohalo()); + e, qname("desc"), xml::hohalo()); co_await xml::ignore_contents(e); co_return meta; } auto parse_wpt(xml::executor_ref e, xml::attribute_view attrs) - -> xml::parser + -> xml::parser { auto parse_xml_double = [](std::string_view sv) -> std::optional { return util::parse_double(sv, std::chars_format::fixed); }; @@ -140,21 +140,21 @@ auto parse_wpt(xml::executor_ref e, xml::attribute_view attrs) } if (!mlat || !mlon) throw std::runtime_error{ - "expected valid latitude and longitude for waypoint" + "expected valid latitude and longitude for waypoint" }; co_await xml::ignore_contents(e); co_return geo::point{*mlon, *mlat}; } auto parse_trkseg(xml::executor_ref e, xml::attribute_view) - -> xml::parser + -> xml::parser { auto s = track_segment{}; - while (auto mwpt = co_await allow_element( - e, qname("trkpt"), xml::hohalo())) + while (auto mwpt = + co_await allow_element(e, qname("trkpt"), xml::hohalo())) bgeo::append(s.waypoints, *mwpt); co_await allow_element( - e, qname("extensions"), xml::hohalo()); + e, qname("extensions"), xml::hohalo()); co_return std::move(s); } @@ -162,20 +162,20 @@ auto parse_trk(xml::executor_ref e, xml::attribute_view) -> xml::parser { auto t = track{}; t.name = co_await allow_element( - e, qname("name"), xml::hohalo()); + e, qname("name"), xml::hohalo()); co_await allow_element( - e, qname("cmt"), xml::hohalo()); + e, qname("cmt"), xml::hohalo()); t.desc = co_await allow_element( - e, qname("desc"), xml::hohalo()); + e, qname("desc"), xml::hohalo()); co_await xml::ignore_contents(e, /* until */ qname("trkseg")); while (auto mseg = co_await allow_element( - e, qname("trkseg"), xml::hohalo())) + e, qname("trkseg"), xml::hohalo())) t.segments.push_back(std::move(*mseg)); co_return std::move(t); } auto parse_gpx(xml::executor_ref e, xml::attribute_view attrs) - -> xml::parser + -> xml::parser { auto f = file{}; if (attrs.lookup(qname("version")) != "1.1"sv) @@ -186,14 +186,14 @@ auto parse_gpx(xml::executor_ref e, xml::attribute_view attrs) throw std::runtime_error{"expected GPX file to have creator"}; if (auto mmeta = co_await allow_element( - e, qname("metadata"), xml::hohalo())) + e, qname("metadata"), xml::hohalo())) f.meta = *mmeta; co_await xml::ignore_contents(e, /* until */ qname("trk")); while (auto mtrk = - co_await allow_element(e, qname("trk"), xml::hohalo())) + co_await allow_element(e, qname("trk"), xml::hohalo())) f.tracks.push_back(std::move(*mtrk)); co_await allow_element( - e, qname("extensions"), xml::hohalo()); + e, qname("extensions"), xml::hohalo()); co_return std::move(f); } @@ -205,14 +205,14 @@ auto parse_file(xml::executor_ref e) -> xml::parser auto decl = co_await expect_event(e); if (decl.version != "1.0"sv) throw std::runtime_error{std::format( - "unsupported XML version, got {}", std::string_view{decl.version})}; + "unsupported XML version, got {}", std::string_view{decl.version})}; if (decl.encoding != "UTF-8"sv) throw std::runtime_error{"unsupported encoding"}; if (auto mf = co_await allow_element( - e, v10::qname("gpx"), xml::hohalo())) + e, v10::qname("gpx"), xml::hohalo())) co_return std::move(*mf); if (auto mf = co_await allow_element( - e, v11::qname("gpx"), xml::hohalo())) + e, v11::qname("gpx"), xml::hohalo())) co_return std::move(*mf); throw std::runtime_error{"no supported GPX document found"}; } -- cgit v1.3