From 6c5d68f0502523606f2fe41ff45ce3dc55486ee0 Mon Sep 17 00:00:00 2001 From: siyangy Date: Fri, 3 Nov 2017 19:03:31 -0700 Subject: [PATCH] dedup flag names --- modules/dreamview/backend/common/dreamview_gflags.cc | 2 +- modules/dreamview/backend/common/dreamview_gflags.h | 2 +- .../backend/simulation_world/simulation_world_updater.cc | 2 +- modules/perception/common/perception_gflags.cc | 2 -- modules/routing/common/routing_gflags.cc | 2 +- modules/routing/common/routing_gflags.h | 2 +- modules/routing/core/result_generator.cc | 2 +- modules/routing/routing.cc | 4 +++- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/dreamview/backend/common/dreamview_gflags.cc b/modules/dreamview/backend/common/dreamview_gflags.cc index 767fb2ecf0..5229ec0fa6 100644 --- a/modules/dreamview/backend/common/dreamview_gflags.cc +++ b/modules/dreamview/backend/common/dreamview_gflags.cc @@ -57,6 +57,6 @@ DEFINE_string(ssl_certificate, "", "be in PEM format, and it must have both, private key and " "certificate"); -DEFINE_double(map_radius, 300.0, +DEFINE_double(sim_map_radius, 300.0, "The radius within which Dreamview will find all the map " "elements around the car."); diff --git a/modules/dreamview/backend/common/dreamview_gflags.h b/modules/dreamview/backend/common/dreamview_gflags.h index b23bff6e7c..4b2c1cb98b 100644 --- a/modules/dreamview/backend/common/dreamview_gflags.h +++ b/modules/dreamview/backend/common/dreamview_gflags.h @@ -39,6 +39,6 @@ DECLARE_string(websocket_timeout_ms); DECLARE_string(ssl_certificate); -DECLARE_double(map_radius); +DECLARE_double(sim_map_radius); #endif // MODULES_DREAMVIEW_BACKEND_COMMON_DREAMVIEW_GFLAGS_H_ diff --git a/modules/dreamview/backend/simulation_world/simulation_world_updater.cc b/modules/dreamview/backend/simulation_world/simulation_world_updater.cc index cf3d9183d7..3439362997 100644 --- a/modules/dreamview/backend/simulation_world/simulation_world_updater.cc +++ b/modules/dreamview/backend/simulation_world/simulation_world_updater.cc @@ -221,7 +221,7 @@ void SimulationWorldUpdater::OnTimer(const ros::TimerEvent &event) { boost::unique_lock writer_lock(mutex_); simulation_world_json_ = - sim_world_service_.GetUpdateAsJson(FLAGS_map_radius).dump(); + sim_world_service_.GetUpdateAsJson(FLAGS_sim_map_radius).dump(); } } diff --git a/modules/perception/common/perception_gflags.cc b/modules/perception/common/perception_gflags.cc index 831aa8ec9b..019fb2121a 100644 --- a/modules/perception/common/perception_gflags.cc +++ b/modules/perception/common/perception_gflags.cc @@ -16,8 +16,6 @@ #include "modules/perception/common/perception_gflags.h" -DEFINE_string(node_name, "perception", "The perception module name in proto"); - DEFINE_string(perception_adapter_config_filename, "modules/perception/conf/adapter.conf", "The adapter config filename"); diff --git a/modules/routing/common/routing_gflags.cc b/modules/routing/common/routing_gflags.cc index f33701686e..48d1ab8620 100644 --- a/modules/routing/common/routing_gflags.cc +++ b/modules/routing/common/routing_gflags.cc @@ -19,7 +19,7 @@ DEFINE_string(routing_conf_file, "modules/routing/conf/routing_config.pb.txt", "default routing conf data file"); -DEFINE_string(node_name, "routing", "the name for this node"); +DEFINE_string(routing_node_name, "routing", "the name for this node"); DEFINE_string(routing_adapter_config_filename, "modules/routing/conf/adapter.conf", diff --git a/modules/routing/common/routing_gflags.h b/modules/routing/common/routing_gflags.h index 0c1eb07908..27925c6f03 100644 --- a/modules/routing/common/routing_gflags.h +++ b/modules/routing/common/routing_gflags.h @@ -20,7 +20,7 @@ #include "gflags/gflags.h" DECLARE_string(routing_conf_file); -DECLARE_string(node_name); +DECLARE_string(routing_node_name); DECLARE_string(routing_adapter_config_filename); diff --git a/modules/routing/core/result_generator.cc b/modules/routing/core/result_generator.cc index e5693b21c3..2ad359cbee 100644 --- a/modules/routing/core/result_generator.cc +++ b/modules/routing/core/result_generator.cc @@ -379,7 +379,7 @@ bool ResultGenerator::GeneratePassageRegion( const std::string& map_version, const RoutingRequest& request, const std::vector& nodes, const TopoRangeManager& range_manager, RoutingResponse* const result) { - AdapterManager::FillRoutingResponseHeader(FLAGS_node_name, result); + AdapterManager::FillRoutingResponseHeader(FLAGS_routing_node_name, result); if (!GeneratePassageRegion(nodes, range_manager, result)) { return false; diff --git a/modules/routing/routing.cc b/modules/routing/routing.cc index 9249ce226b..c04730e63b 100644 --- a/modules/routing/routing.cc +++ b/modules/routing/routing.cc @@ -28,7 +28,9 @@ using apollo::common::adapter::AdapterManager; using apollo::common::monitor::MonitorMessageItem; using apollo::common::ErrorCode; -std::string Routing::Name() const { return FLAGS_node_name; } +std::string Routing::Name() const { + return FLAGS_routing_node_name; +} Routing::Routing() : monitor_(apollo::common::monitor::MonitorMessageItem::ROUTING) {} -- GitLab