Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
ae5e2373
A
apollo
项目概览
Pinoxchio
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ae5e2373
编写于
2月 08, 2018
作者:
Z
zhouyao
提交者:
Jiangtao Hu
2月 07, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
try to load utm zone id from local map folder
上级
e52a0286
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
40 addition
and
1 deletion
+40
-1
modules/localization/common/localization_gflags.cc
modules/localization/common/localization_gflags.cc
+2
-0
modules/localization/common/localization_gflags.h
modules/localization/common/localization_gflags.h
+1
-0
modules/localization/conf/localization.conf
modules/localization/conf/localization.conf
+5
-0
modules/localization/msf/msf_localization.cc
modules/localization/msf/msf_localization.cc
+31
-1
modules/localization/msf/msf_localization.h
modules/localization/msf/msf_localization.h
+1
-0
未找到文件。
modules/localization/common/localization_gflags.cc
浏览文件 @
ae5e2373
...
...
@@ -119,6 +119,8 @@ DEFINE_double(imu_to_ant_offset_uz, 0.0, "Imu ant offset z uncertainty");
// common
DEFINE_double
(
imu_rate
,
1.0
,
""
);
DEFINE_bool
(
if_utm_zone_id_from_folder
,
true
,
"load utm zone id from local map folder"
);
DEFINE_int32
(
local_utm_zone_id
,
50
,
"UTM zone id"
);
DEFINE_bool
(
trans_gpstime_to_utctime
,
true
,
""
);
DEFINE_int32
(
gnss_mode
,
0
,
"GNSS Mode, 0 for bestgnss pose, 1 for self gnss."
);
...
...
modules/localization/common/localization_gflags.h
浏览文件 @
ae5e2373
...
...
@@ -90,6 +90,7 @@ DECLARE_double(imu_to_ant_offset_uz);
// common
DECLARE_double
(
imu_rate
);
DECLARE_bool
(
if_utm_zone_id_from_folder
);
DECLARE_int32
(
local_utm_zone_id
);
DECLARE_bool
(
trans_gpstime_to_utctime
);
DECLARE_int32
(
gnss_mode
);
...
...
modules/localization/conf/localization.conf
浏览文件 @
ae5e2373
...
...
@@ -119,6 +119,11 @@
# default: 1.0
--
imu_rate
=
1
.
0
# Whether load utm zone id from local map folder
# type: bool
# default: true
--
if_utm_zone_id_from_folder
=
true
# local_utm_zone_id.
# type: int
# default: int
...
...
modules/localization/msf/msf_localization.cc
浏览文件 @
ae5e2373
...
...
@@ -168,8 +168,18 @@ void MSFLocalization::InitParams() {
AERROR
<<
"lidar_extrin: "
<<
localizaiton_param_
.
lidar_extrinsic_file
;
AERROR
<<
"lidar_height: "
<<
localizaiton_param_
.
lidar_height_file
;
// common
localizaiton_param_
.
utm_zone_id
=
FLAGS_local_utm_zone_id
;
// try load zone id from config file in local_map folder
if
(
FLAGS_if_utm_zone_id_from_folder
)
{
bool
success
=
LoadZoneIdFromFile
(
localizaiton_param_
.
map_path
,
&
localizaiton_param_
.
utm_zone_id
);
if
(
!
success
)
{
AWARN
<<
"Can't load utm zone id from config file, use default value."
;
}
}
AINFO
<<
"utm zone id: "
<<
localizaiton_param_
.
utm_zone_id
;
// common
localizaiton_param_
.
imu_rate
=
FLAGS_imu_rate
;
localizaiton_param_
.
enable_lidar_localization
=
FLAGS_enable_lidar_localization
;
...
...
@@ -382,5 +392,25 @@ bool MSFLocalization::LoadGnssAntennaExtrinsic(
return
false
;
}
bool
MSFLocalization
::
LoadZoneIdFromFile
(
const
std
::
string
&
folder_path
,
int
*
zone_id
)
{
std
::
string
map_zone_id_folder
;
if
(
common
::
util
::
DirectoryExists
(
folder_path
+
"/map/000/north"
))
{
map_zone_id_folder
=
folder_path
+
"/map/000/north"
;
}
else
if
(
common
::
util
::
DirectoryExists
(
folder_path
+
"/map/000/south"
))
{
map_zone_id_folder
=
folder_path
+
"/map/000/south"
;
}
else
{
return
false
;
}
auto
folder_list
=
common
::
util
::
ListSubDirectories
(
map_zone_id_folder
);
for
(
auto
itr
=
folder_list
.
begin
();
itr
!=
folder_list
.
end
();
++
itr
)
{
*
zone_id
=
std
::
stoi
(
*
itr
);
return
true
;
}
return
false
;
}
}
// namespace localization
}
// namespace apollo
modules/localization/msf/msf_localization.h
浏览文件 @
ae5e2373
...
...
@@ -87,6 +87,7 @@ class MSFLocalization : public LocalizationBase {
double
*
offset_x
,
double
*
offset_y
,
double
*
offset_z
,
double
*
uncertainty_x
,
double
*
uncertainty_y
,
double
*
uncertainty_z
);
bool
LoadZoneIdFromFile
(
const
std
::
string
&
folder_path
,
int
*
zone_id
);
private:
apollo
::
common
::
monitor
::
MonitorLogger
monitor_logger_
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录