Skip to content

Commit 230a452

Browse files
kevinkreiserkevinkreiser
authored
rename tripcommon proto to common (valhalla#3516)
* trip common holds stuff that isnt just common to trip * sort includes and add changelog
1 parent 70850c8 commit 230a452

32 files changed

+31
-30
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
* CHANGED: Refactor options protobuf for Location and Costing objects [#3506](https://github.com/valhalla/valhalla/pull/3506)
6060
* CHANGED: valhalla.h and config.h don't need cmake configuration [#3502](https://github.com/valhalla/valhalla/pull/3502)
6161
* ADDED: New options to control what fields of the pbf are returned when pbf format responses are requested [#3207](https://github.com/valhalla/valhalla/pull/3507)
62+
* CHANGED: Rename tripcommon to common [#3516](https://github.com/valhalla/valhalla/pull/3516)
6263

6364
## Release Date: 2021-10-07 Valhalla 3.1.4
6465
* **Removed**

‎proto/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
## Protobuf
22
protobuf_generate_cpp(protobuff_srcs protobuff_hdrs
33
api.proto
4+
common.proto
45
directions.proto
56
info.proto
67
options.proto
78
sign.proto
8-
tripcommon.proto
99
trip.proto
1010
transit.proto
1111
transit_fetch.proto

‎proto/tripcommon.proto ‎proto/common.proto

File renamed without changes.

‎proto/directions.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
syntax = "proto3";
22
option optimize_for = LITE_RUNTIME;
33
package valhalla;
4-
import public "tripcommon.proto";
4+
import public "common.proto";
55
import public "sign.proto";
66

77
message DirectionsLeg {

‎proto/options.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
syntax = "proto3";
22
option optimize_for = LITE_RUNTIME;
33
package valhalla;
4-
import public "tripcommon.proto";
4+
import public "common.proto";
55

66
message Contour {
77
oneof has_time {

‎proto/sign.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
syntax = "proto3";
22
option optimize_for = LITE_RUNTIME;
33
package valhalla;
4-
import public "tripcommon.proto";
4+
import public "common.proto";
55

66
message TripSignElement {
77
oneof has_text {

‎proto/trip.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
syntax = "proto3";
22
option optimize_for = LITE_RUNTIME;
33
package valhalla;
4-
import public "tripcommon.proto";
4+
import public "common.proto";
55
import public "sign.proto";
66
import "incidents.proto";
77

‎src/baldr/streetnames.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "baldr/verbal_text_formatter.h"
99
#include "baldr/verbal_text_formatter_us.h"
1010
#include "midgard/util.h"
11-
#include "proto/tripcommon.pb.h"
11+
#include "proto/common.pb.h"
1212

1313
namespace valhalla {
1414
namespace baldr {

‎src/baldr/streetnames_factory.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "baldr/streetnames_factory.h"
77
#include "baldr/streetnames_us.h"
88
#include "midgard/util.h"
9-
#include "proto/tripcommon.pb.h"
9+
#include "proto/common.pb.h"
1010

1111
namespace valhalla {
1212
namespace baldr {

‎src/baldr/streetnames_us.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "baldr/streetname.h"
77
#include "baldr/streetnames_us.h"
88
#include "midgard/util.h"
9-
#include "proto/tripcommon.pb.h"
9+
#include "proto/common.pb.h"
1010

1111
namespace valhalla {
1212
namespace baldr {

‎src/mjolnir/pbfgraphparser.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "midgard/sequence.h"
2727
#include "midgard/tiles.h"
2828
#include "mjolnir/timeparsing.h"
29-
#include "proto/tripcommon.pb.h"
29+
#include "proto/common.pb.h"
3030

3131
using namespace valhalla::midgard;
3232
using namespace valhalla::baldr;

‎src/odin/enhancedtrippath.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#include "odin/enhancedtrippath.h"
1313
#include "odin/util.h"
1414

15+
#include "proto/common.pb.h"
1516
#include "proto/trip.pb.h"
16-
#include "proto/tripcommon.pb.h"
1717

1818
using namespace valhalla::midgard;
1919
using namespace valhalla::baldr;

‎src/odin/maneuver.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
#include "odin/maneuver.h"
1111
#include "odin/transitrouteinfo.h"
1212

13+
#include "proto/common.pb.h"
1314
#include "proto/directions.pb.h"
1415
#include "proto/options.pb.h"
15-
#include "proto/tripcommon.pb.h"
1616

1717
using namespace valhalla::odin;
1818
using namespace valhalla::baldr;

‎src/odin/markup_formatter.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <boost/optional.hpp>
88

99
#include "odin/markup_formatter.h"
10-
#include "proto/tripcommon.pb.h"
10+
#include "proto/common.pb.h"
1111

1212
namespace {
1313
constexpr auto kQuotesTag = "<QUOTES>";

‎src/thor/route_action.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "sif/pedestriancost.h"
1212
#include "thor/attributes_controller.h"
1313

14-
#include "proto/tripcommon.pb.h"
14+
#include "proto/common.pb.h"
1515

1616
using namespace valhalla;
1717
using namespace valhalla::midgard;

‎src/thor/triplegbuilder.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "midgard/logging.h"
2020
#include "midgard/pointll.h"
2121
#include "midgard/util.h"
22-
#include "proto/tripcommon.pb.h"
22+
#include "proto/common.pb.h"
2323
#include "sif/costconstants.h"
2424
#include "sif/recost.h"
2525
#include "thor/attributes_controller.h"

‎test/narrativebuilder.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#include "odin/signs.h"
1414
#include "odin/util.h"
1515

16+
#include "proto/common.pb.h"
1617
#include "proto/directions.pb.h"
1718
#include "proto/trip.pb.h"
18-
#include "proto/tripcommon.pb.h"
1919

2020
#include "test.h"
2121

‎test/openlr.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#include "baldr/openlr.h"
77
#include "midgard/encoded.h"
88
#include "midgard/pointll.h"
9+
#include "proto/common.pb.h"
910
#include "proto/trip.pb.h"
10-
#include "proto/tripcommon.pb.h"
1111
#include "tyr/serializers.h"
1212

1313
#include "test.h"

‎valhalla/baldr/datetime.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <valhalla/baldr/nodeinfo.h>
2020
#include <valhalla/midgard/constants.h>
2121

22-
#include <valhalla/proto/tripcommon.pb.h>
22+
#include <valhalla/proto/common.pb.h>
2323

2424
namespace valhalla {
2525
namespace baldr {

‎valhalla/baldr/location.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <valhalla/baldr/rapidjson_utils.h>
88
#include <valhalla/midgard/pointll.h>
9-
#include <valhalla/proto/tripcommon.pb.h>
9+
#include <valhalla/proto/common.pb.h>
1010

1111
namespace valhalla {
1212
namespace baldr {

‎valhalla/baldr/streetname.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <boost/optional.hpp>
88

9-
#include <valhalla/proto/tripcommon.pb.h>
9+
#include <valhalla/proto/common.pb.h>
1010

1111
namespace valhalla {
1212
namespace baldr {

‎valhalla/baldr/streetnames.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <valhalla/baldr/streetname.h>
1010
#include <valhalla/baldr/verbal_text_formatter.h>
1111
#include <valhalla/baldr/verbal_text_formatter_us.h>
12-
#include <valhalla/proto/tripcommon.pb.h>
12+
#include <valhalla/proto/common.pb.h>
1313

1414
namespace valhalla {
1515
namespace baldr {

‎valhalla/baldr/streetnames_factory.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <vector>
77

88
#include <valhalla/baldr/streetnames.h>
9-
#include <valhalla/proto/tripcommon.pb.h>
9+
#include <valhalla/proto/common.pb.h>
1010

1111
namespace valhalla {
1212
namespace baldr {

‎valhalla/baldr/streetnames_us.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <valhalla/baldr/streetname_us.h>
88
#include <valhalla/baldr/streetnames.h>
9-
#include <valhalla/proto/tripcommon.pb.h>
9+
#include <valhalla/proto/common.pb.h>
1010

1111
namespace valhalla {
1212
namespace baldr {

‎valhalla/meili/state.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <valhalla/meili/measurement.h>
1111
#include <valhalla/meili/routing.h>
1212
#include <valhalla/meili/stateid.h>
13-
#include <valhalla/proto/tripcommon.pb.h>
13+
#include <valhalla/proto/common.pb.h>
1414

1515
namespace valhalla {
1616
namespace meili {

‎valhalla/odin/maneuver.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
#include <valhalla/odin/signs.h>
1414
#include <valhalla/odin/transitrouteinfo.h>
15+
#include <valhalla/proto/common.pb.h>
1516
#include <valhalla/proto/directions.pb.h>
1617
#include <valhalla/proto/options.pb.h>
1718
#include <valhalla/proto/trip.pb.h>
18-
#include <valhalla/proto/tripcommon.pb.h>
1919

2020
using namespace valhalla::baldr;
2121

‎valhalla/odin/transitrouteinfo.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include <list>
55
#include <string>
66

7+
#include <valhalla/proto/common.pb.h>
78
#include <valhalla/proto/trip.pb.h>
8-
#include <valhalla/proto/tripcommon.pb.h>
99

1010
namespace valhalla {
1111
namespace odin {

‎valhalla/thor/costmatrix.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <valhalla/baldr/double_bucket_queue.h>
1212
#include <valhalla/baldr/graphid.h>
1313
#include <valhalla/baldr/graphreader.h>
14-
#include <valhalla/proto/tripcommon.pb.h>
14+
#include <valhalla/proto/common.pb.h>
1515
#include <valhalla/sif/dynamiccost.h>
1616
#include <valhalla/sif/edgelabel.h>
1717
#include <valhalla/thor/edgestatus.h>

‎valhalla/thor/dijkstras.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <valhalla/baldr/graphreader.h>
1414
#include <valhalla/baldr/location.h>
1515
#include <valhalla/baldr/time_info.h>
16-
#include <valhalla/proto/tripcommon.pb.h>
16+
#include <valhalla/proto/common.pb.h>
1717
#include <valhalla/sif/dynamiccost.h>
1818
#include <valhalla/sif/edgelabel.h>
1919
#include <valhalla/thor/edgestatus.h>

‎valhalla/thor/isochrone.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <valhalla/baldr/graphreader.h>
1414
#include <valhalla/baldr/location.h>
1515
#include <valhalla/midgard/gridded_data.h>
16-
#include <valhalla/proto/tripcommon.pb.h>
16+
#include <valhalla/proto/common.pb.h>
1717
#include <valhalla/sif/dynamiccost.h>
1818
#include <valhalla/sif/edgelabel.h>
1919
#include <valhalla/thor/dijkstras.h>

‎valhalla/thor/multimodal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <valhalla/baldr/graphid.h>
1313
#include <valhalla/baldr/graphreader.h>
1414
#include <valhalla/baldr/time_info.h>
15-
#include <valhalla/proto/tripcommon.pb.h>
15+
#include <valhalla/proto/common.pb.h>
1616
#include <valhalla/sif/dynamiccost.h>
1717
#include <valhalla/sif/edgelabel.h>
1818
#include <valhalla/sif/hierarchylimits.h>

‎valhalla/thor/route_matcher.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <valhalla/baldr/graphid.h>
1313
#include <valhalla/baldr/graphreader.h>
1414
#include <valhalla/meili/measurement.h>
15-
#include <valhalla/proto/tripcommon.pb.h>
15+
#include <valhalla/proto/common.pb.h>
1616
#include <valhalla/sif/dynamiccost.h>
1717
#include <valhalla/sif/edgelabel.h>
1818
#include <valhalla/thor/edgestatus.h>

0 commit comments

Comments
 (0)