|
@@ -150,19 +150,6 @@ bool location_card::is_map_changed(int new_mapid)
|
|
|
return flag;
|
|
|
}
|
|
|
|
|
|
-//分站是否发生变化
|
|
|
-bool location_card::is_site_changed(const int& new_siteid)
|
|
|
-{
|
|
|
- bool flag = false;
|
|
|
- if(m_siteid != new_siteid)
|
|
|
- {
|
|
|
- m_siteid = new_siteid;
|
|
|
- flag = true;
|
|
|
- }
|
|
|
-
|
|
|
- return flag;
|
|
|
-}
|
|
|
-
|
|
|
void location_card::push(uint64_t timestamp,const point & p,int32_t areaid,int32_t mapid,int32_t siteid,bool bclose/* = false*/)
|
|
|
{
|
|
|
if (bclose) //卡移除后直接更新his_location
|
|
@@ -218,11 +205,7 @@ void location_card::push(uint64_t timestamp,const point & p,int32_t areaid,int32
|
|
|
if(is_area_changed(areaid))
|
|
|
if(!flag)iflag=3;
|
|
|
if(is_map_changed(mapid))
|
|
|
- if(!flag)iflag=4;
|
|
|
- if(is_site_changed(siteid)){
|
|
|
- if(!flag)
|
|
|
- iflag=5;
|
|
|
- }
|
|
|
+ if(!flag)iflag=4;
|
|
|
log_info("his_location cardid:%d:%d",m_cardid,iflag);
|
|
|
if(iflag)
|
|
|
{
|