Merge branch 'master' of zengminguo/server-l-zmg into master

card_base.cpp

@@ -136,6 +136,22 @@ void card_location_base::make_his_location(uint64_t t,const point & pt,bool bclo
 //坐标点输入业务入口
 void card_location_base::on_location(const std::vector<point>&vp, const std::vector<loc_message> &lm, bool is_v_map)
 {
+	m_isVehicleMap = false;
+	if (is_vehicle())
+	{
+		if (!is_v_map)
+		{
+			return;
+		}
+	}
+	if (is_person())
+	{
+		if (is_v_map)
+		{
+			m_isVehicleMap = true;
+		}
+	}
+
     loc_point pt = m_sel_tool->select_solution(vp, lm);
     //pt.y = pt.y;
     

card_base.h

@@ -71,6 +71,7 @@ struct card:point
     double   m_acc;
 	double   m_speed;			//速度
 	point	m_v_point;			//车辆定位系统的定位结果
+	bool m_isVehicleMap = false;
 };
 
 struct card_location_base:card,std::enable_shared_from_this<card_location_base>