mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-03 21:53:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed lat,lon text on dialog window

Browse Source
This commit is contained in:
PWRxPSYCHO
2022-02-24 08:44:32 -05:00
parent ff751680bb
commit 4b1516da29
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt
View File

@@ -464,8 +464,8 @@ class MapFragment : ScreenFragment("Map"), Logging {
R.drawable.baseline_location_on_white_24dp
)!!
.toBitmap()
pointLong = String.format("%.2f", it.longitude())
pointLat = String.format("%.2f", it.latitude())
pointLong = String.format("%.6f", it.longitude())
pointLat = String.format("%.6f", it.latitude())
point = Point.fromLngLat(it.longitude(), it.latitude())
@@ -516,7 +516,7 @@ class MapFragment : ScreenFragment("Map"), Logging {
private fun calculateCoordinate(degrees: Double, lat: Double, long: Double): Point {
val deg = Math.toRadians(degrees)
val distancesInMeters = 16093.44// 10 miles
val distancesInMeters = 1609.344 * 10 // 1609.344 is 1 mile in meters -> multiplier will be user specified up to a max of 10
val radiusOfEarthInMeters = 6378137
val x =
long + (180 / Math.PI) * (distancesInMeters / radiusOfEarthInMeters) * cos(
@@ -527,18 +527,6 @@ class MapFragment : ScreenFragment("Map"), Logging {
return Point.fromLngLat(x, y)
}
/*
if (this::point.isInitialized) {
if (it.latitude() == point.latitude() && it.longitude() == point.longitude()) {
mapView?.getMapboxMap()?.getStyle()?.let { style ->
style.removeStyleImage(userPointImageId)
style.removeStyleSource(userTouchPositionId)
style.removeStyleLayer(userTouchLayerId)
}
}
}
*/
private fun updateStylePackDownloadProgress(
progress: Long,
max: Long,
@@ -582,12 +570,12 @@ class MapFragment : ScreenFragment("Map"), Logging {
if (this::pointLat.isInitialized && this::pointLat.isInitialized) {
val latText = mapDownloadView.findViewById<TextView>(R.id.longitude)
"Lat: $pointLong".also {
"Lon: $pointLong".also {
latText.text = it
View.VISIBLE.also { latText.visibility = View.VISIBLE }
}
val longText = mapDownloadView.findViewById<TextView>(R.id.latitude)
"Long: $pointLat".also {
"Lat: $pointLat".also {
longText.text = it
View.VISIBLE.also { longText.visibility = View.VISIBLE }
}
@@ -646,9 +634,7 @@ class MapFragment : ScreenFragment("Map"), Logging {
.center(point)
.build(), MapAnimationOptions.mapAnimationOptions { duration(1000) })
//debug(userStyleURI)
it?.loadStyleUri(mapView?.getMapboxMap()?.getStyle()?.styleURI.toString()) {
}
it?.loadStyleUri(mapView?.getMapboxMap()?.getStyle()?.styleURI.toString())
}
// Open up Downloaded Region managers
mapView?.annotations?.createCircleAnnotationManager()?.create(