From 115eed9a54ae4f97bbdd0e561b9f796ca4214a9c Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Sun, 11 Sep 2022 05:39:57 +0800
Subject: [PATCH] cleanup map_helpers.cc (#25706)

---
 selfdrive/ui/qt/maps/map_helpers.cc | 46 +++++------------------------
 1 file changed, 8 insertions(+), 38 deletions(-)

diff --git a/selfdrive/ui/qt/maps/map_helpers.cc b/selfdrive/ui/qt/maps/map_helpers.cc
index ca81545f7f..8d5d4e1715 100644
--- a/selfdrive/ui/qt/maps/map_helpers.cc
+++ b/selfdrive/ui/qt/maps/map_helpers.cc
@@ -44,61 +44,31 @@ QMapbox::CoordinatesCollections model_to_collection(
   for (int i = 0; i < x.size(); i++) {
     Eigen::Vector3d point_ecef = ecef_from_local * Eigen::Vector3d(x[i], y[i], z[i]) + ecef;
     Geodetic point_geodetic = ecef2geodetic((ECEF){.x = point_ecef[0], .y = point_ecef[1], .z = point_ecef[2]});
-    QMapbox::Coordinate coordinate(point_geodetic.lat, point_geodetic.lon);
-    coordinates.push_back(coordinate);
+    coordinates.push_back({point_geodetic.lat, point_geodetic.lon});
   }
 
-  QMapbox::CoordinatesCollection collection;
-  collection.push_back(coordinates);
-
-  QMapbox::CoordinatesCollections collections;
-  collections.push_back(collection);
-  return collections;
+  return {QMapbox::CoordinatesCollection{coordinates}};
 }
 
 QMapbox::CoordinatesCollections coordinate_to_collection(const QMapbox::Coordinate &c) {
-  QMapbox::Coordinates coordinates;
-  coordinates.push_back(c);
-
-  QMapbox::CoordinatesCollection collection;
-  collection.push_back(coordinates);
-
-  QMapbox::CoordinatesCollections collections;
-  collections.push_back(collection);
-  return collections;
+  QMapbox::Coordinates coordinates{c};
+  return {QMapbox::CoordinatesCollection{coordinates}};
 }
 
 QMapbox::CoordinatesCollections capnp_coordinate_list_to_collection(const capnp::List<cereal::NavRoute::Coordinate>::Reader& coordinate_list) {
   QMapbox::Coordinates coordinates;
-
   for (auto const &c: coordinate_list) {
-    QMapbox::Coordinate coordinate(c.getLatitude(), c.getLongitude());
-    coordinates.push_back(coordinate);
+    coordinates.push_back({c.getLatitude(), c.getLongitude()});
   }
-
-  QMapbox::CoordinatesCollection collection;
-  collection.push_back(coordinates);
-
-  QMapbox::CoordinatesCollections collections;
-  collections.push_back(collection);
-  return collections;
-
+  return {QMapbox::CoordinatesCollection{coordinates}};
 }
 
 QMapbox::CoordinatesCollections coordinate_list_to_collection(const QList<QGeoCoordinate> &coordinate_list) {
   QMapbox::Coordinates coordinates;
-
   for (auto &c : coordinate_list) {
-    QMapbox::Coordinate coordinate(c.latitude(), c.longitude());
-    coordinates.push_back(coordinate);
+    coordinates.push_back({c.latitude(), c.longitude()});
   }
-
-  QMapbox::CoordinatesCollection collection;
-  collection.push_back(coordinates);
-
-  QMapbox::CoordinatesCollections collections;
-  collections.push_back(collection);
-  return collections;
+  return {QMapbox::CoordinatesCollection{coordinates}};
 }
 
 QList<QGeoCoordinate> polyline_to_coordinate_list(const QString &polylineString) {