From 818fcbf0c22a7b4dd40103f6308477fd5675c5d9 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Tue, 15 Jun 2021 17:37:00 -0700
Subject: [PATCH] Fix include style part 2: reorder, fix newlines

In preparation for 20.04
---
 include/maliput_dragway/road_geometry.h           | 1 +
 include/maliput_dragway/road_network_builder.h    | 4 ++--
 include/maliput_dragway/segment.h                 | 1 +
 include/maliput_dragway_test_utilities/fixtures.h | 2 +-
 src/bindings/dragway_py.cc                        | 2 +-
 src/maliput_dragway/branch_point.cc               | 4 ++--
 src/plugin/road_network.cc                        | 1 +
 test/dragway_test.cc                              | 1 -
 test/plugin/road_network_plugin_test.cc           | 1 -
 9 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/include/maliput_dragway/road_geometry.h b/include/maliput_dragway/road_geometry.h
index a3b4eb4..c21faed 100644
--- a/include/maliput_dragway/road_geometry.h
+++ b/include/maliput_dragway/road_geometry.h
@@ -12,6 +12,7 @@
 #include <maliput/api/road_geometry.h>
 #include <maliput/common/maliput_copyable.h>
 #include <maliput/math/vector.h>
+
 #include "maliput_dragway/branch_point.h"
 #include "maliput_dragway/junction.h"
 
diff --git a/include/maliput_dragway/road_network_builder.h b/include/maliput_dragway/road_network_builder.h
index 36553ef..b2a9b78 100644
--- a/include/maliput_dragway/road_network_builder.h
+++ b/include/maliput_dragway/road_network_builder.h
@@ -1,11 +1,11 @@
 // Copyright 2021 Toyota Research Institute
 #pragma once
 
+#include <memory>
+
 #include <maliput/api/road_geometry.h>
 #include <maliput/api/road_network.h>
 
-#include <memory>
-
 namespace maliput {
 namespace dragway {
 
diff --git a/include/maliput_dragway/segment.h b/include/maliput_dragway/segment.h
index 40a8aa4..220a5ef 100644
--- a/include/maliput_dragway/segment.h
+++ b/include/maliput_dragway/segment.h
@@ -9,6 +9,7 @@
 #include <maliput/api/lane_data.h>
 #include <maliput/api/segment.h>
 #include <maliput/common/maliput_copyable.h>
+
 #include "maliput_dragway/lane.h"
 
 namespace maliput {
diff --git a/include/maliput_dragway_test_utilities/fixtures.h b/include/maliput_dragway_test_utilities/fixtures.h
index 957ba38..844fcff 100644
--- a/include/maliput_dragway_test_utilities/fixtures.h
+++ b/include/maliput_dragway_test_utilities/fixtures.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <gtest/gtest.h>
-
 #include <maliput/api/lane.h>
+
 #include "maliput_dragway/road_geometry.h"
 
 namespace maliput {
diff --git a/src/bindings/dragway_py.cc b/src/bindings/dragway_py.cc
index ecf9d1e..e64f7a6 100644
--- a/src/bindings/dragway_py.cc
+++ b/src/bindings/dragway_py.cc
@@ -1,6 +1,6 @@
+#include <maliput/api/road_geometry.h>
 #include <pybind11/pybind11.h>
 
-#include <maliput/api/road_geometry.h>
 #include "maliput_dragway/road_geometry.h"
 
 namespace maliput {
diff --git a/src/maliput_dragway/branch_point.cc b/src/maliput_dragway/branch_point.cc
index 09d96e6..814f552 100644
--- a/src/maliput_dragway/branch_point.cc
+++ b/src/maliput_dragway/branch_point.cc
@@ -1,7 +1,7 @@
-#include <optional>
-
 #include "maliput_dragway/branch_point.h"
 
+#include <optional>
+
 #include "maliput_dragway/lane.h"
 
 namespace maliput {
diff --git a/src/plugin/road_network.cc b/src/plugin/road_network.cc
index 27c02b1..968cffa 100644
--- a/src/plugin/road_network.cc
+++ b/src/plugin/road_network.cc
@@ -5,6 +5,7 @@
 
 #include <maliput/common/maliput_throw.h>
 #include <maliput/plugin/road_network_loader.h>
+
 #include "maliput_dragway/road_network_builder.h"
 
 namespace maliput {
diff --git a/test/dragway_test.cc b/test/dragway_test.cc
index aaed8a3..8951777 100644
--- a/test/dragway_test.cc
+++ b/test/dragway_test.cc
@@ -4,7 +4,6 @@
 #include <optional>
 
 #include <gtest/gtest.h>
-
 #include <maliput/common/assertion_error.h>
 #include <maliput/test_utilities/check_id_indexing.h>
 #include <maliput/test_utilities/maliput_types_compare.h>
diff --git a/test/plugin/road_network_plugin_test.cc b/test/plugin/road_network_plugin_test.cc
index a63e5d4..78a6953 100644
--- a/test/plugin/road_network_plugin_test.cc
+++ b/test/plugin/road_network_plugin_test.cc
@@ -4,7 +4,6 @@
 #include <string>
 
 #include <gtest/gtest.h>
-
 #include <maliput/api/junction.h>
 #include <maliput/api/lane.h>
 #include <maliput/api/lane_data.h>