|
|
@@ -94,9 +94,9 @@ func (a *AMapClient)ConvCoord(lngLats []string, coordType string)(*ConvCoordResu
|
|
|
* @return1: 高德地图经度
|
|
|
* @return2: 高德地图纬度
|
|
|
*/
|
|
|
-func (aa *AMapClient)ConvGpsToAMap(gpsLng, gpsLat float64)(float64, float64){
|
|
|
+func (aa *AMapClient)ConvGpsToAMap(gpsLng, gpsLat float64)(float64, float64, bool){
|
|
|
if outOfChinal(gpsLng, gpsLat){
|
|
|
- return gpsLng, gpsLat
|
|
|
+ return gpsLng, gpsLat, false
|
|
|
}
|
|
|
dLat := transformLat(gpsLng - 105.0, gpsLat - 35.0)
|
|
|
dLon := transformLon(gpsLng - 105.0, gpsLat - 35.0)
|
|
|
@@ -106,7 +106,7 @@ func (aa *AMapClient)ConvGpsToAMap(gpsLng, gpsLat float64)(float64, float64){
|
|
|
sqrtMagic := math.Sqrt(magic)
|
|
|
dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi)
|
|
|
dLon = (dLon * 180.0) / (a / sqrtMagic * math.Cos(radLat) * pi)
|
|
|
- return gpsLng + dLon, gpsLat + dLat
|
|
|
+ return gpsLng + dLon, gpsLat + dLat, true
|
|
|
}
|
|
|
|
|
|
/**
|