diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/PoiWash.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/PoiWash.groovy index cec6bcce6..197f6c77f 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/PoiWash.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/xiamen/PoiWash.groovy @@ -395,7 +395,7 @@ class PoiWash { def check(){ // "漳州市","三明市","宁德市","泉州市","厦门市","福州市","南平市","龙岩市","莆田市","重庆市","深圳市","北京市","广州市","杭州市","苏州市","成都市", - def citys = ["重庆市"] + def citys = ["漳州市","三明市","宁德市","泉州市","厦门市","福州市","南平市","龙岩市","莆田市","上海市","深圳市","北京市","广州市","杭州市","苏州市","成都市","重庆市"] for(def city : citys){ def datas = findPois(city) processUpdate(city, datas) @@ -441,11 +441,19 @@ class PoiWash { } if(map.gps_location){ - def new_bd_lon = DataHandleUtils.getDoubleRound(6, map.gps_location.lon) - def new_bd_lat = DataHandleUtils.getDoubleRound(6, map.gps_location.lat) - def new_bd_map = ["lon":new_bd_lon, "lat":new_bd_lat] - udata.put("gps_location", new_bd_map) + def new_gps_lon = DataHandleUtils.getDoubleRound(6, map.gps_location.lon) + def new_gps_lat = DataHandleUtils.getDoubleRound(6, map.gps_location.lat) + def new_gps_map = ["lon":new_gps_lon, "lat":new_gps_lat] + udata.put("gps_location", new_gps_map) } + if(map.location){ + def new_lon = DataHandleUtils.getDoubleRound(6, map.location.lon) + def new_lat = DataHandleUtils.getDoubleRound(6, map.location.lat) + def new_map = ["lon":new_lon, "lat":new_lat] + udata.put("location", new_map) + } + + if(map.address && (map.address.contains("(") || map.address.contains("("))){ def s1 = null @@ -469,7 +477,7 @@ class PoiWash { if(udata){ updateTotalCount.addAndGet(1) MAPPOI_CONN.update(new BasicDBObject('_id',map.id),new BasicDBObject('$set', udata)) -// println updateTotalCount.get()+" / "+totalCount.get()+" "+count +" "+city + println updateTotalCount.get()+" / "+totalCount.get()+" "+count +" "+city }