mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-02-02 03:42:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

minor changes

Browse Source
This commit is contained in:
Jackson Rosenthal
2022-02-25 22:39:39 -05:00
parent ff751680bb
commit 82e43cdf37
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -481,9 +481,8 @@ class MapFragment : ScreenFragment("Map"), Logging {
val pointList = listOf(topRight, topLeft, bottomLeft, bottomRight, topRight)
val squareLineString = LineString.fromLngLats(pointList)
squareRegion = LineString.fromLngLats(pointList)
squareRegion = squareLineString//LineString.fromLngLats(circleCoordinateGenerator())
val geoJsonSource = geoJsonSource(boundingBoxId) {
geometry(squareRegion)
}
@@ -495,7 +494,6 @@ class MapFragment : ScreenFragment("Map"), Logging {
lineColor("#888")
}
mapView?.getMapboxMap()?.getStyle()?.let { style ->
userTouchPosition.geometry(point)
if (!style.styleLayerExists(userTouchLayerId)) {
@@ -527,18 +525,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,
@@ -614,7 +600,6 @@ class MapFragment : ScreenFragment("Map"), Logging {
.setPositiveButton(
"Save"
) { _, _ ->
if (uri.isVisible) {
// Save URI
userStyleURI = uri.text.toString()
@@ -630,7 +615,7 @@ class MapFragment : ScreenFragment("Map"), Logging {
} else {
// Tell user to select region
val text =
"You must select a region on the map, long press the region you want to download"
"You must select a region on the map, long press to set the region you want to download"
val duration = Toast.LENGTH_LONG
val toast = Toast.makeText(requireContext(), text, duration)
toast.show()