提交 6c5d68f0 编写于 作者: S siyangy 提交者: Jiangtao Hu

dedup flag names

上级 a43ccde9
......@@ -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.");
......@@ -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_
......@@ -221,7 +221,7 @@ void SimulationWorldUpdater::OnTimer(const ros::TimerEvent &event) {
boost::unique_lock<boost::shared_mutex> writer_lock(mutex_);
simulation_world_json_ =
sim_world_service_.GetUpdateAsJson(FLAGS_map_radius).dump();
sim_world_service_.GetUpdateAsJson(FLAGS_sim_map_radius).dump();
}
}
......
......@@ -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");
......
......@@ -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",
......
......@@ -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);
......
......@@ -379,7 +379,7 @@ bool ResultGenerator::GeneratePassageRegion(
const std::string& map_version, const RoutingRequest& request,
const std::vector<NodeWithRange>& 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;
......
......@@ -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) {}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册