Skip to content

Location: Support moving WiFi location for Eurostar trains #2821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mar-v-in merged 4 commits into from
Mar 31, 2025
Merged

Location: Support moving WiFi location for Eurostar trains #2821

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4d3d63
Draft: Location: Support moving WiFi location for Eurostar trains
TimoWilken Mar 16, 2025
0670dc7
Rename to SOURCE_OMBORD
TimoWilken Mar 17, 2025
30d0f0f
Rename in error message as well
TimoWilken Mar 17, 2025
458f248
org.json does convert numbers in strings
TimoWilken Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions ...on/core/provider/src/main/kotlin/org/microg/gms/location/network/wifi/MovingWifiHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ private val MOVING_WIFI_HOTSPOTS = setOf(
"LNR On Board Wi-Fi",
"LOOP on train WiFi",
"WMR On Board Wi-Fi",
"EurostarTrainsWiFi",
// United States
"Amtrak_WiFi",
)
Expand Down Expand Up @@ -403,6 +404,33 @@ class MovingWifiHelper(private val context: Context) {
}
}

private val SOURCE_OMBORD = object : MovingWifiLocationSource("https://www.ombord.info/api/jsonp/position/") {
override fun parse(location: Location, data: ByteArray): Location {
// The API endpoint returns a JSONP object (even when no ?callback= is supplied), so strip the surrounding function call.
val json = JSONObject(data.decodeToString().trim().trim('(', ')', ';'))
// TODO: what happens in the Channel Tunnel? Does "satellites" go to zero? Does "mode" change?
if (json.has("satellites") && json.getInt("satellites") < 1) throw RuntimeException("Ombord has no GPS fix")
location.accuracy = 100f
location.latitude = json.getDouble("latitude")
location.longitude = json.getDouble("longitude")
json.optDouble("speed").takeIf { !it.isNaN() }?.let {
location.speed = it.toFloat()
LocationCompat.setSpeedAccuracyMetersPerSecond(location, location.speed * 0.1f)
}
location.time = json.getLong("time")
// "cmg" means "course made good", i.e. the compass heading of the track over the ground.
// Sometimes gets stuck for a few minutes, so use a generous accuracy value.
json.optDouble("cmg").takeIf { !it.isNaN() }?.let {
location.bearing = it.toFloat()
LocationCompat.setBearingAccuracyDegrees(location, 90f)
}
json.optDouble("altitude").takeIf { !it.isNaN() }?.let {
location.altitude = it
}
return location
}
}

private val SOURCE_AIR_CANADA = object : MovingWifiLocationSource("https://airbornemedia.inflightinternet.com/asp/api/flight/info") {
override fun parse(location: Location, data: ByteArray): Location {
val json = JSONObject(data.decodeToString()).getJSONObject("gpsData")
Expand Down Expand Up @@ -459,6 +487,7 @@ class MovingWifiHelper(private val context: Context) {
"NormandieTrainConnecte" to listOf(SOURCE_NORMANDIE),
"agilis-Wifi" to listOf(SOURCE_HOTSPLOTS),
"Austrian FlyNet" to listOf(SOURCE_AUSTRIAN_FLYNET_EUROPE),
"EurostarTrainsWiFi" to listOf(SOURCE_OMBORD),
)
}
}
Expand Down