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

Trying to keep layers persistent across multiple styles

Browse Source
This commit is contained in:
PWRxPSYCHO
2022-03-09 10:12:53 -05:00
parent 85140e486f
commit 0cb30171c1
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,8 @@ import com.mapbox.maps.*
import com.mapbox.maps.dsl.cameraOptions
import com.mapbox.maps.extension.style.expressions.generated.Expression
import com.mapbox.maps.extension.style.layers.addLayer
import com.mapbox.maps.extension.style.layers.addPersistentLayer
import com.mapbox.maps.extension.style.layers.generated.LineLayer
import com.mapbox.maps.extension.style.layers.generated.SymbolLayer
import com.mapbox.maps.extension.style.layers.generated.lineLayer
import com.mapbox.maps.extension.style.layers.properties.generated.*
@@ -72,6 +74,9 @@ class MapFragment : ScreenFragment("Map"), Logging {
private lateinit var mapNotAllowedBinding: MapNotAllowedBinding
private var userStyleURI: String? = null
private lateinit var geoJsonSource: GeoJsonSource
private lateinit var lineLayer: LineLayer
private var point: Point? = null
private val model: UIViewModel by activityViewModels()
@@ -284,8 +289,8 @@ class MapFragment : ScreenFragment("Map"), Logging {
if (it.isStyleLoaded) {
it.addSource(nodePositions)
it.addImage(markerImageId, markerIcon)
it.addLayer(nodeLayer)
it.addLayer(labelLayer)
it.addPersistentLayer(nodeLayer)
it.addPersistentLayer(labelLayer)
}
}
@@ -455,10 +460,10 @@ class MapFragment : ScreenFragment("Map"), Logging {
squareRegion = LineString.fromLngLats(pointList)
val geoJsonSource = geoJsonSource(boundingBoxId) {
geoJsonSource = geoJsonSource(boundingBoxId) {
geometry(squareRegion)
}
val lineLayer = lineLayer(lineLayerId, boundingBoxId) {
lineLayer = lineLayer(lineLayerId, boundingBoxId) {
lineCap(LineCap.ROUND)
lineJoin(LineJoin.MITER)
lineOpacity(0.7)
@@ -476,7 +481,7 @@ class MapFragment : ScreenFragment("Map"), Logging {
style.addImage(userPointImageId, userDefinedPointImg)
style.addSource(userTouchPosition)
style.addSource(geoJsonSource)
style.addLayer(lineLayer)
style.addPersistentLayer(lineLayer)
style.addLayer(userTouchLayer)
} else {
style.removeStyleLayer(lineLayerId)
@@ -568,13 +573,6 @@ class MapFragment : ScreenFragment("Map"), Logging {
"Save", null
)
.setNeutralButton("View Region") { _, _ ->
// val regions = layoutInflater.inflate(R.layout.adapter_region_layout, null)
// val regionFragment = AlertDialog.Builder(context)
// regionFragment.setView(regions)
// regionFragment.create()
// regionFragment.show()
// Open up Downloaded Region managers
mapView?.getMapboxMap().also {
it?.flyTo(
CameraOptions.Builder()
@@ -583,9 +581,6 @@ class MapFragment : ScreenFragment("Map"), Logging {
.build(), MapAnimationOptions.mapAnimationOptions { duration(1000) })
if (userStyleURI != null) {
it?.loadStyleUri(userStyleURI.toString())
it?.getStyle().also { style ->
//TODO: Add box for downloaded region
}
} else {
it?.getStyle().also { style ->
style?.removeStyleImage(userPointImageId)