同步主干代码，修改一些编译不过的代码

Makefile.am

@@ -16,7 +16,7 @@ SRC_MAIN= ant.cpp area.cpp base64.cpp bindmorecard.cpp mine_business.cpp card_ar
     	  card.cpp card_message_handle.cpp cardMgr.cpp card_path.cpp card_person.cpp crc.cpp geo_hash.cpp \
 		  landmark.cpp line_fit.cpp loc_point.cpp loc_tool.cpp message.cpp message_file.cpp mine.cpp \
 		  net-service.cpp point.cpp select_tool.cpp site_area.cpp special_area.cpp tdoa_sync.cpp visit.cpp \
-		  web-client.cpp worker.cpp ya_event.cpp znet.cpp ya_setting.cpp area_business.cpp site_message_handle.cpp
+		  web-client.cpp worker.cpp event.cpp znet.cpp ya_setting.cpp area_business.cpp site_message_handle.cpp
 
 SRC_MAIN_EVENT= mine_module/MineCardManager.cpp
 

card_person.cpp

@@ -114,9 +114,9 @@ void person::handle_three_rates(const point & pt)
 	m_biz_stat=get_stat();
 	cp.biz_stat = m_biz_stat;
 	cp.x=pt.x;cp.y=pt.y;cp.z=pt.z;	
-	const auto lm = m_area_tool->getLandmark();
-	cp.enter_time = std::get<0>(lm)*1000;
-	cp.area_id = std::get<3>(lm);
+	//const auto lm = m_area_tool->getLandmark();
+	//cp.enter_time = std::get<0>(lm)*1000;
+	//cp.area_id = std::get<3>(lm);
 	put_three_rates(cp);
 }
 

mine_business.cpp

@@ -13,8 +13,7 @@
 #include "ant.h"
 #include "ya_setting.h"
 #include "card_path.h"
-#include "card_base.h"
-
+#include "card.h"
 struct card_sensor
 {
 	card_sensor(int32_t wid,const point &p,const std::string &cid)

module_service/area_business_speed_checker.cpp

@@ -172,7 +172,7 @@ void area_business_speed_checker::init_vehicle_category_from_db()
         std_debug("dat_vehicle_category:category_id:%d--over_speed:%.2f",p.first,p.second);
 }
 
-std::unordered_map<int,double> area_business_speed_checker::_vehicle_category_map;
+//std::unordered_map<int,double> area_business_speed_checker::_vehicle_category_map;