Skip to content

Commit 5d85cd7

Browse files
authored
feat: add world_model module and move relative_map into it (#118)
1 parent 9f7e1fd commit 5d85cd7

31 files changed

+52
-59
lines changed

modules/map/BUILD

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,15 @@ install(
2525
],
2626
deps = [
2727
":pb_map",
28-
":pb_hdrs",
2928
# "//modules/map/data:install",
30-
"//modules/map/relative_map:install",
3129
"//modules/map/tools:install",
3230
"//modules/map/hdmap/adapter:install",
3331
"//modules/map/hdmap:install",
3432
"//modules/map/pnc_map:install",
35-
"//modules/map/relative_map/tools:install",
3633
":map_testdata"
3734
],
3835
)
3936

40-
install(
41-
name = "pb_hdrs",
42-
data_dest = "map/include",
43-
data = [
44-
"//modules/map/relative_map/proto:navigator_config_cc_proto",
45-
"//modules/map/relative_map/proto:relative_map_config_cc_proto",
46-
],
47-
)
48-
4937
install_files(
5038
name = "pb_map",
5139
dest = "map",
@@ -68,8 +56,6 @@ install_files(
6856
"//modules/common_msgs/map_msgs:map_stop_sign_py_pb2",
6957
"//modules/common_msgs/map_msgs:map_yield_sign_py_pb2",
7058
"//modules/common_msgs/planning_msgs:navigation_py_pb2",
71-
"//modules/map/relative_map/proto:navigator_config_py_pb2",
72-
"//modules/map/relative_map/proto:relative_map_config_py_pb2",
7359
],
7460
)
7561

modules/map/relative_map/dag/relative_map.dag

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ cc_library(
4444
"//modules/common/monitor_log",
4545
"//modules/common/status",
4646
"//modules/common/util",
47-
"//modules/map/relative_map/common:relative_map_gflags",
47+
"//modules/world_model/relative_map/common:relative_map_gflags",
4848
"//modules/common_msgs/planning_msgs:navigation_cc_proto",
49-
"//modules/map/relative_map/proto:relative_map_config_cc_proto",
49+
"//modules/world_model/relative_map/proto:relative_map_config_cc_proto",
5050
"//modules/common_msgs/perception_msgs:perception_obstacle_cc_proto",
5151
],
5252
)
@@ -66,8 +66,8 @@ cc_library(
6666
"//modules/common/util",
6767
"//modules/common/vehicle_state:vehicle_state_provider",
6868
"//modules/common/vehicle_state/proto:vehicle_state_cc_proto",
69-
"//modules/map/relative_map/common:relative_map_gflags",
70-
"//modules/map/relative_map/proto:relative_map_config_cc_proto",
69+
"//modules/world_model/relative_map/common:relative_map_gflags",
70+
"//modules/world_model/relative_map/proto:relative_map_config_cc_proto",
7171
"@com_google_absl//absl/strings",
7272
],
7373
)
File renamed without changes.
File renamed without changes.

modules/map/relative_map/common/relative_map_gflags.cc renamed to modules/world_model/relative_map/common/relative_map_gflags.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*****************************************************************************/
1616

17-
#include "modules/map/relative_map/common/relative_map_gflags.h"
17+
#include "modules/world_model/relative_map/common/relative_map_gflags.h"
1818

1919
DEFINE_string(
2020
relative_map_config_filename,

modules/map/relative_map/common/relative_map_gflags.h renamed to modules/world_model/relative_map/common/relative_map_gflags.h

File renamed without changes.

modules/map/relative_map/conf/navigator_config.pb.txt renamed to modules/world_model/relative_map/conf/navigator_config.pb.txt

File renamed without changes.
File renamed without changes.

modules/map/relative_map/conf/relative_map_config.pb.txt renamed to modules/world_model/relative_map/conf/relative_map_config.pb.txt

File renamed without changes.

0 commit comments

Comments
 (0)