stephen/StikDebug
1
0
Fork 0
mirror of https://github.com/StikDebug/StikDebug.git synced 2026-10-16 04:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: convert GCJ-02 back to WGS-84 before sending to device, remove China boundary check

Browse source
This commit is contained in:
lijingjun 2026-05-30 09:06:31 +08:00
parent aec93ff746
commit 00200cba68
3 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

46
StikJIT/Utilities/CoordinateTransform.swift
View file

@ -9,31 +9,39 @@ enum CoordinateTransform {
static func wgs84ToGCJ02(_ coordinate: CLLocationCoordinate2D) -> CLLocationCoordinate2D {
let lat = coordinate.latitude
let lon = coordinate.longitude
guard outOfChina(lat: lat, lon: lon) else {
let dLat = transformLat(x: lon - 105.0, y: lat - 35.0)
let dLon = transformLon(x: lon - 105.0, y: lat - 35.0)
let radLat = lat / 180.0 * pi
let sinRadLat = sin(radLat)
let magic = 1 - ee * sinRadLat * sinRadLat
let sqrtMagic = sqrt(magic)
let adjustedLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi)
let adjustedLon = (dLon * 180.0) / (a / sqrtMagic * cos(radLat) * pi)
return CLLocationCoordinate2D(
latitude: lat + adjustedLat,
longitude: lon + adjustedLon
)
}
return coordinate
let dLat = transformLat(x: lon - 105.0, y: lat - 35.0)
let dLon = transformLon(x: lon - 105.0, y: lat - 35.0)
let radLat = lat / 180.0 * pi
let sinRadLat = sin(radLat)
let magic = 1 - ee * sinRadLat * sinRadLat
let sqrtMagic = sqrt(magic)
let adjustedLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi)
let adjustedLon = (dLon * 180.0) / (a / sqrtMagic * cos(radLat) * pi)
return CLLocationCoordinate2D(
latitude: lat + adjustedLat,
longitude: lon + adjustedLon
)
}
static func wgs84ToGCJ02(_ coordinates: [CLLocationCoordinate2D]) -> [CLLocationCoordinate2D] {
coordinates.map { wgs84ToGCJ02($0) }
}
private static func outOfChina(lat: Double, lon: Double) -> Bool {
return !(72.004 <= lon && lon <= 137.8347 && 0.8293 <= lat && lat <= 55.8271)
static func gcj02ToWGS84(_ coordinate: CLLocationCoordinate2D) -> CLLocationCoordinate2D {
let gcjLat = coordinate.latitude
let gcjLon = coordinate.longitude
let dLat = transformLat(x: gcjLon - 105.0, y: gcjLat - 35.0)
let dLon = transformLon(x: gcjLon - 105.0, y: gcjLat - 35.0)
let radLat = gcjLat / 180.0 * pi
let sinRadLat = sin(radLat)
let magic = 1 - ee * sinRadLat * sinRadLat
let sqrtMagic = sqrt(magic)
let adjustedLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi)
let adjustedLon = (dLon * 180.0) / (a / sqrtMagic * cos(radLat) * pi)
return CLLocationCoordinate2D(
latitude: gcjLat - adjustedLat,
longitude: gcjLon - adjustedLon
)
}
private static func transformLat(x: Double, y: Double) -> Double {

5
StikJIT/Views/MainTabView.swift
View file

@ -134,10 +134,11 @@ struct MainTabView: View {
}
LocationSimulationCommandQueue.shared.async {
let wgs84 = CoordinateTransform.gcj02ToWGS84(coordinate)
let code = simulate_location(
DeviceConnectionContext.targetIPAddress,
coordinate.latitude,
coordinate.longitude,
wgs84.latitude,
wgs84.longitude,
pairingFile.path
)

3
StikJIT/Views/MapSelectionView.swift
View file

@ -1571,7 +1571,8 @@ struct LocationSimulationView: View {
}
private func locationUpdateCode(for coordinate: CLLocationCoordinate2D) -> Int32 {
simulate_location(deviceIP, coordinate.latitude, coordinate.longitude, pairingFilePath)
let wgs84 = CoordinateTransform.gcj02ToWGS84(coordinate)
simulate_location(deviceIP, wgs84.latitude, wgs84.longitude, pairingFilePath)
}
}