Commit b93d0b4a authored by Allvey's avatar Allvey

增加穿越装载区距离判断,增加配置文件因子(暂时未启用)

parent 9930df8b
...@@ -28,7 +28,8 @@ ...@@ -28,7 +28,8 @@
}, },
"gothrough": { "gothrough": {
"closer_area_name": "哈装测试", "closer_area_name": "哈装测试",
"further_area_name": "哈装2" "further_area_name": "哈装2",
"factor" : 0.6
}, },
"geom": { "geom": {
"redispatch_minimal_distance": 40 "redispatch_minimal_distance": 40
......
...@@ -562,7 +562,13 @@ class GroupDispatcher: ...@@ -562,7 +562,13 @@ class GroupDispatcher:
self.logger.info("穿越装载区调度开启") self.logger.info("穿越装载区调度开启")
# 更新判定路段区域 # 更新判定路段区域
self.gothroghdispatcher.update_lanes_info() cross_lane = self.gothroghdispatcher.update_lanes_info()
# 获取车辆经纬度信息
truck_prise_location = self.group.truck.truck_current_prise_location[truck_id]
if not is_close_to_cross(cross_lane, truck_prise_location):
self.logger.info(f'距离过近无法触发穿越装载区调度')
try: try:
# 获取近端装载区入场点经纬度信息 # 获取近端装载区入场点经纬度信息
...@@ -1306,6 +1312,8 @@ class GoThroughDispatcher: ...@@ -1306,6 +1312,8 @@ class GoThroughDispatcher:
self.logger.info("cross_lane") self.logger.info("cross_lane")
self.logger.info(cross_lane) self.logger.info(cross_lane)
return cross_lane
# 截取远端入场点到交叉口的路段 # 截取远端入场点到交叉口的路段
# self.further_area_backtrack_lanes = self.further_area_backtrack_lanes[ # self.further_area_backtrack_lanes = self.further_area_backtrack_lanes[
# 0:self.further_area_backtrack_lanes.index(cross_lane)] # 0:self.further_area_backtrack_lanes.index(cross_lane)]
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
# @File : versiontag.py.py # @File : versiontag.py.py
# @Software: PyCharm # @Software: PyCharm
VERSION_TAG = '78' VERSION_TAG = '79'
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment