diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt index 80a14bea57..85ef3157eb 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt @@ -704,13 +704,29 @@ object CharterPassengerModel { siteInfo.GcjLon!!, siteInfo.GcjLat!! ) + // 距离 index 点小于30m + // 仅计算 小于30m的下个坐标和下下个坐标 if (calculateLineDistance < CharterPassengerConst.MIN_DISTANCE_STATION) { - return if (index + 1 <= data.size - 1) { + if (index + 1 <= data.size - 1) { // <可用站点标,是否靠近> - Pair(index + 1, true) + val calculateLineDistanceNext = CoordinateUtils.calculateLineDistance( + currentInfo.longitude, + currentInfo.latitude, + data[index+1].GcjLon!!, + data[index+1].GcjLat!! + ) + if(calculateLineDistanceNext=0) { val degree = CoordinateCalculateRouteUtil.getDegree( it.longitude, it.latitude,