fixed includes for odin

dgearhart · dgearhart · commit 69417eee55a1 · 2016-02-24T10:48:37.000-05:00
diff --git a/src/odin/enhancedtrippath.cc b/src/odin/enhancedtrippath.cc
@@ -1,11 +1,11 @@
 #include <iostream>
 #include <cstdlib>
 
-#include <valhalla/proto/trippath.pb.h>
 #include <valhalla/midgard/util.h>
 #include <valhalla/midgard/logging.h>
 #include <valhalla/midgard/constants.h>
 
+#include "proto/trippath.pb.h"
 #include "odin/util.h"
 #include "odin/enhancedtrippath.h"
 
diff --git a/src/odin/maneuver.cc b/src/odin/maneuver.cc
@@ -1,16 +1,16 @@
 #include <iostream>
 #include <list>
 
-#include "odin/maneuver.h"
-
 #include <valhalla/midgard/util.h>
 #include <valhalla/midgard/logging.h>
 #include <valhalla/midgard/constants.h>
 #include <valhalla/baldr/datetime.h>
 #include <valhalla/baldr/streetnames.h>
 #include <valhalla/baldr/streetnames_us.h>
-#include <valhalla/odin/transitrouteinfo.h>
-#include <valhalla/odin/transitstop.h>
+
+#include "odin/maneuver.h"
+#include "odin/transitrouteinfo.h"
+#include "odin/transitstop.h"
 
 using namespace valhalla::odin;
 using namespace valhalla::baldr;
diff --git a/src/odin/maneuversbuilder.cc b/src/odin/maneuversbuilder.cc
@@ -1,3 +1,13 @@
+#include <iostream>
+#include <algorithm>
+#include <functional>
+#include <cstdint>
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+#include <boost/format.hpp>
+
 #include <valhalla/midgard/util.h>
 #include <valhalla/midgard/pointll.h>
 #include <valhalla/midgard/logging.h>
@@ -8,21 +18,12 @@
 #include <valhalla/baldr/verbal_text_formatter.h>
 #include <valhalla/baldr/verbal_text_formatter_us.h>
 #include <valhalla/baldr/verbal_text_formatter_factory.h>
-#include <proto/tripdirections.pb.h>
-#include <proto/directions_options.pb.h>
-#include <valhalla/odin/maneuversbuilder.h>
-#include <valhalla/odin/signs.h>
-#include <valhalla/odin/sign.h>
-
-#include <iostream>
-#include <algorithm>
-#include <functional>
-#include <cstdint>
-#include <stdexcept>
-#include <string>
-#include <vector>
 
-#include "boost/format.hpp"
+#include "proto/tripdirections.pb.h"
+#include "proto/directions_options.pb.h"
+#include "odin/maneuversbuilder.h"
+#include "odin/signs.h"
+#include "odin/sign.h"
 
 using namespace valhalla::midgard;
 using namespace valhalla::baldr;
diff --git a/src/odin/narrative_builder_factory.cc b/src/odin/narrative_builder_factory.cc
@@ -1,11 +1,13 @@
-#include <valhalla/odin/narrative_builder_factory.h>
-#include <valhalla/odin/narrativebuilder.h>
-#include <proto/directions_options.pb.h>
-#include <valhalla/odin/enhancedtrippath.h>
-#include <valhalla/odin/util.h>
-#include <valhalla/midgard/util.h>
 #include <boost/property_tree/ptree.hpp>
 
+#include <valhalla/midgard/util.h>
+
+#include "proto/directions_options.pb.h"
+#include "odin/narrative_builder_factory.h"
+#include "odin/narrativebuilder.h"
+#include "odin/enhancedtrippath.h"
+#include "odin/util.h"
+
 namespace valhalla {
 namespace odin {
 
diff --git a/src/odin/narrative_dictionary.cc b/src/odin/narrative_dictionary.cc
@@ -1,7 +1,9 @@
-#include <valhalla/midgard/logging.h>
-#include <valhalla/odin/narrative_dictionary.h>
 #include <boost/property_tree/ptree.hpp>
 
+#include <valhalla/midgard/logging.h>
+
+#include "odin/narrative_dictionary.h"
+
 namespace {
 
 // Read array as vector
diff --git a/src/odin/narrativebuilder.cc b/src/odin/narrativebuilder.cc
@@ -1,17 +1,18 @@
 #include <iostream>
 #include <cmath>
 #include <string>
+
+#include <boost/format.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/algorithm/string/replace.hpp>
+
 #include <valhalla/midgard/logging.h>
+#include <valhalla/baldr/verbal_text_formatter.h>
 
 #include "odin/narrativebuilder.h"
 #include "odin/narrative_dictionary.h"
 #include "odin/enhancedtrippath.h"
 #include "odin/maneuver.h"
-#include <valhalla/baldr/verbal_text_formatter.h>
-
-#include <boost/format.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/algorithm/string/replace.hpp>
 
 namespace {
 // Text instruction initial capacity
diff --git a/src/odin/service.cc b/src/odin/service.cc
@@ -5,6 +5,7 @@
 #include <unordered_map>
 #include <cstdint>
 #include <sstream>
+
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
@@ -14,10 +15,10 @@ using namespace prime_server;
 
 #include <valhalla/midgard/logging.h>
 
-#include "odin/service.h"
-#include "odin/util.h"
 #include "proto/directions_options.pb.h"
 #include "proto/trippath.pb.h"
+#include "odin/service.h"
+#include "odin/util.h"
 #include "odin/directionsbuilder.h"
 
 using namespace valhalla;
diff --git a/src/odin/signs.cc b/src/odin/signs.cc
@@ -1,8 +1,8 @@
-#include "odin/signs.h"
-
 #include <valhalla/baldr/verbal_text_formatter.h>
 #include <valhalla/baldr/verbal_text_formatter_us.h>
 
+#include "odin/signs.h"
+
 using namespace valhalla::baldr;
 
 namespace valhalla {
diff --git a/src/odin/transitrouteinfo.cc b/src/odin/transitrouteinfo.cc
@@ -1,4 +1,4 @@
-#include <odin/transitrouteinfo.h>
+#include "odin/transitrouteinfo.h"
 #include "odin/util.h"
 
 namespace valhalla {
diff --git a/src/odin/util.cc b/src/odin/util.cc
@@ -1,10 +1,12 @@
+#include <boost/filesystem/operations.hpp>
+#include <boost/property_tree/json_parser.hpp>
+
+#include <valhalla/midgard/logging.h>
+
+#include "proto/directions_options.pb.h"
 #include "odin/util.h"
 #include "odin/narrative_dictionary.h"
 #include "locales.h"
-#include <valhalla/proto/directions_options.pb.h>
-#include <valhalla/midgard/logging.h>
-#include <boost/filesystem/operations.hpp>
-#include <boost/property_tree/json_parser.hpp>
 
 namespace {
 
diff --git a/test/enhancedtrippath.cc b/test/enhancedtrippath.cc
@@ -1,5 +1,5 @@
 #include "test.h"
-#include "valhalla/odin/enhancedtrippath.h"
+#include "odin/enhancedtrippath.h"
 
 using namespace std;
 using namespace valhalla::odin;
diff --git a/test/maneuversbuilder.cc b/test/maneuversbuilder.cc
@@ -1,11 +1,13 @@
-#include "test.h"
-#include "valhalla/odin/maneuver.h"
-#include "valhalla/odin/maneuversbuilder.h"
+#include <string>
+
 #include <valhalla/midgard/util.h>
 #include <valhalla/midgard/logging.h>
-#include <valhalla/proto/directions_options.pb.h>
 
-#include <string>
+#include "proto/directions_options.pb.h"
+#include "odin/maneuver.h"
+#include "odin/maneuversbuilder.h"
+
+#include "test.h"
 
 using namespace std;
 using namespace valhalla::odin;
diff --git a/test/narrative_dictionary.cc b/test/narrative_dictionary.cc
@@ -1,9 +1,10 @@
 #include <string>
 
-#include "test.h"
 #include "odin/util.h"
 #include "odin/narrative_dictionary.h"
 
+#include "test.h"
+
 using namespace valhalla::odin;
 
 
diff --git a/test/narrativebuilder.cc b/test/narrativebuilder.cc
@@ -1,17 +1,19 @@
 #include <regex>
 
-#include "test.h"
-#include "valhalla/odin/maneuver.h"
-#include "valhalla/odin/sign.h"
-#include "valhalla/odin/signs.h"
-#include "valhalla/odin/util.h"
-#include "valhalla/odin/narrative_builder_factory.h"
-#include "valhalla/odin/narrative_dictionary.h"
-#include "valhalla/odin/narrativebuilder.h"
-#include <valhalla/proto/trippath.pb.h>
-#include <valhalla/odin/enhancedtrippath.h>
 #include <valhalla/baldr/verbal_text_formatter_factory.h>
 
+#include "proto/trippath.pb.h"
+#include "odin/maneuver.h"
+#include "odin/sign.h"
+#include "odin/signs.h"
+#include "odin/util.h"
+#include "odin/narrative_builder_factory.h"
+#include "odin/narrative_dictionary.h"
+#include "odin/narrativebuilder.h"
+#include "odin/enhancedtrippath.h"
+
+#include "test.h"
+
 using namespace std;
 using namespace valhalla::odin;
 
diff --git a/test/sign.cc b/test/sign.cc
@@ -1,11 +1,12 @@
-#include "test.h"
-#include "valhalla/odin/sign.h"
+#include <vector>
+#include <algorithm>
 
 #include <valhalla/baldr/sign.h>
 #include <valhalla/baldr/signinfo.h>
 
-#include <vector>
-#include <algorithm>
+#include "odin/sign.h"
+
+#include "test.h"
 
 using namespace std;
 using namespace valhalla::odin;
diff --git a/test/signs.cc b/test/signs.cc
@@ -1,10 +1,11 @@
-#include "test.h"
-#include "valhalla/odin/sign.h"
-#include "valhalla/odin/signs.h"
-
 #include <vector>
 #include <algorithm>
 
+#include "odin/sign.h"
+#include "odin/signs.h"
+
+#include "test.h"
+
 using namespace std;
 using namespace valhalla::odin;
 
diff --git a/test/test.cc b/test/test.cc
@@ -1,10 +1,10 @@
-#include "test.h"
-#include "config.h"
-
 #include <cstdlib>
 #include <iomanip>
 #include <iostream>
 
+#include "test.h"
+#include "config.h"
+
 using namespace std;
 
 namespace test {
diff --git a/valhalla/odin/maneuver.h b/valhalla/odin/maneuver.h
@@ -6,11 +6,12 @@
 #include <unordered_map>
 #include <memory>
 
+#include <valhalla/baldr/streetnames.h>
+#include <valhalla/baldr/verbal_text_formatter.h>
+
 #include <valhalla/proto/trippath.pb.h>
 #include <valhalla/proto/tripdirections.pb.h>
 #include <valhalla/proto/directions_options.pb.h>
-#include <valhalla/baldr/streetnames.h>
-#include <valhalla/baldr/verbal_text_formatter.h>
 #include <valhalla/odin/signs.h>
 #include <valhalla/odin/transitrouteinfo.h>
 #include <valhalla/odin/transitstop.h>
diff --git a/valhalla/odin/maneuversbuilder.h b/valhalla/odin/maneuversbuilder.h
@@ -5,7 +5,6 @@
 
 #include <valhalla/proto/trippath.pb.h>
 #include <valhalla/proto/directions_options.pb.h>
-
 #include <valhalla/odin/enhancedtrippath.h>
 #include <valhalla/odin/maneuver.h>
 
diff --git a/valhalla/odin/narrative_builder_factory.h b/valhalla/odin/narrative_builder_factory.h
@@ -4,8 +4,8 @@
 #include <string>
 #include <memory>
 
+#include <valhalla/proto/directions_options.pb.h>
 #include <valhalla/odin/narrativebuilder.h>
-#include <proto/directions_options.pb.h>
 #include <valhalla/odin/enhancedtrippath.h>
 
 namespace valhalla {
diff --git a/valhalla/odin/narrativebuilder.h b/valhalla/odin/narrativebuilder.h
@@ -3,12 +3,13 @@
 
 #include <vector>
 
+#include <valhalla/baldr/verbal_text_formatter.h>
+
 #include <valhalla/proto/trippath.pb.h>
 #include <valhalla/proto/directions_options.pb.h>
 #include <valhalla/odin/enhancedtrippath.h>
 #include <valhalla/odin/narrative_dictionary.h>
 #include <valhalla/odin/maneuver.h>
-#include <valhalla/baldr/verbal_text_formatter.h>
 
 namespace valhalla {
 namespace odin {
diff --git a/valhalla/odin/signs.h b/valhalla/odin/signs.h
@@ -3,10 +3,11 @@
 
 #include <vector>
 
-#include <valhalla/odin/sign.h>
 #include <valhalla/baldr/verbal_text_formatter.h>
 #include <valhalla/baldr/verbal_text_formatter_us.h>
 
+#include <valhalla/odin/sign.h>
+
 using namespace valhalla::baldr;
 
 namespace valhalla {
diff --git a/valhalla/odin/transitrouteinfo.h b/valhalla/odin/transitrouteinfo.h
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <list>
+
 #include <valhalla/odin/transitstop.h>
 
 namespace valhalla {
diff --git a/valhalla/odin/transitstop.h b/valhalla/odin/transitstop.h
@@ -2,6 +2,7 @@
 #define VALHALLA_ODIN_TRANSIT_STOP_H_
 
 #include <string>
+
 #include <valhalla/proto/trippath.pb.h>
 #include <valhalla/proto/tripdirections.pb.h>
 
diff --git a/valhalla/odin/util.h b/valhalla/odin/util.h
@@ -4,9 +4,11 @@
 #include <vector>
 #include <string>
 #include <unordered_map>
+
+#include <boost/property_tree/ptree.hpp>
+
 #include <valhalla/proto/directions_options.pb.h>
 #include <valhalla/odin/narrative_dictionary.h>
-#include <boost/property_tree/ptree.hpp>
 
 namespace valhalla {
 namespace odin {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include <odin/transitrouteinfo.h>`
	`1`	`+#include "odin/transitrouteinfo.h"`
`2`	`2`	`#include "odin/util.h"`
`3`	`3`
`4`	`4`	`namespace valhalla {`