|
|
@@ -655,16 +655,19 @@ bool select_point_object::select_pdoa_1d_solution(const std::vector<point> vp, c
|
|
|
logn_info(3, "[pdoa] card_id=%d, ct=%d, pdoa=%.2f, dd=%.2f, dt=%.2f", lm[0].m_card_id, lm[0].m_card_ct, pdoa, dt*speed, dt);
|
|
|
logn_info(3, "[pdoa] solution info: card_id=%d, ct=%d, useless=%d, locate_x=%.4f, locate_y=%.4f, speed=%.3f, d=%.2f", lm[0].m_card_id, lm[0].m_card_ct, lp.m_useless, lp.x, lp.y, speed, dt*speed);
|
|
|
|
|
|
- card->m_last_pdoa_diff = pdoa;
|
|
|
- card->m_last_ct = lm[0].m_card_ct;
|
|
|
- card->m_last_dist = dist;
|
|
|
- card->m_last_site_id = lm[0].m_sit->m_id;
|
|
|
- card->m_last_site_dir = lm[0].m_sit->m_pdoa_direction;
|
|
|
- card->m_last_point.x = lp.x;
|
|
|
- card->m_last_point.y = lp.y;
|
|
|
- lp.m_speed = card->m_speed = speed;
|
|
|
- card->m_cb_point.push_back(lp);
|
|
|
- card->m_vtp_dist.push_back(dist);
|
|
|
+ if (!(card->m_isVehicleMap&&card->is_person()))
|
|
|
+ {
|
|
|
+ card->m_last_pdoa_diff = pdoa;
|
|
|
+ card->m_last_ct = lm[0].m_card_ct;
|
|
|
+ card->m_last_dist = dist;
|
|
|
+ card->m_last_site_id = lm[0].m_sit->m_id;
|
|
|
+ card->m_last_site_dir = lm[0].m_sit->m_pdoa_direction;
|
|
|
+ card->m_last_point.x = lp.x;
|
|
|
+ card->m_last_point.y = lp.y;
|
|
|
+ lp.m_speed = card->m_speed = speed;
|
|
|
+ card->m_cb_point.push_back(lp);
|
|
|
+ card->m_vtp_dist.push_back(dist);
|
|
|
+ }
|
|
|
|
|
|
return true;
|
|
|
}
|
