java/IgoTravel.git

			@@ -10,6 +10,7 @@
			import com.stylefeng.guns.modular.system.service.IDriverService;
			import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil;
			import com.stylefeng.guns.modular.system.util.GDMapGeocodingUtil;
			import com.stylefeng.guns.modular.system.util.GeodesyUtil;
			import com.stylefeng.guns.modular.system.util.GoogleMap.DistancematrixVo;
			import com.stylefeng.guns.modular.system.util.GoogleMap.GoogleMapUtil;
			import com.stylefeng.guns.modular.system.util.RedisUtil;
			@@ -57,8 +58,9 @@
			for(Driver driver : drivers){
			String value = redisUtil.getValue("DRIVER" + String.valueOf(driver.getId()));
			if(null != value){
			DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(lat, lon, Double.parseDouble(value.split(",")[1]), Double.parseDouble(value.split(",")[0]));
			if(distancematrix.getDistance() < (distance * 1000)){
			Map<String, Double> distance1 = GeodesyUtil.getDistance(lon + "," + lat, value);
			Double wgs84 = distance1.get("WGS84");
			if(wgs84.compareTo(distance * 1000) < 0){
			list.add(driver);
			}
			}
			@@ -138,7 +140,7 @@
			baseWarpper.setId(d.getType());
			switch (d.getType()){
			case 1:
			baseWarpper.setName(language == 1 ? "专车" : language == 2 ? "Private car" : "véhicules");
			baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
			break;
			case 2:
			baseWarpper.setName("出租车");
			@@ -147,7 +149,7 @@
			baseWarpper.setName("跨城出行");
			break;
			case 4:
			baseWarpper.setName(language == 1 ? "市内小件物流" : language == 2 ? "Small parts logistics in the city" : "Logistique de petites pièces dans la ville");
			baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Delivery" : "Livraison");
			break;
			case 5:
			baseWarpper.setName("跨城小件物流");