Add overlay support to map layers

kylecorry31 · Oct 13, 2024 · 7209f92 · 7209f92
1 parent 5b9b96b
commit 7209f92
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 2 deletions.
diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/BasePhotoMapView.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/BasePhotoMapView.kt
@@ -157,6 +157,11 @@ abstract class BasePhotoMapView : EnhancedImageView, IMapView {
  layers.forEach { it.draw(drawer, this) }
  }
 
+ override fun drawOverlay() {
+ super.drawOverlay()
+ layers.forEach { it.drawOverlay(drawer, this) }
+ }
+
  open fun showMap(map: PhotoMap) {
  this.map = map
  val rotation = map.calibration.rotation

diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/MapDistanceLayer.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/maps/ui/MapDistanceLayer.kt
@@ -83,6 +83,18 @@ class MapDistanceLayer(private val onPathChanged: (points: List<Coordinate>) ->
  pointLayer.draw(drawer, map)
  }
 
+ override fun drawOverlay(
+ drawer: ICanvasDrawer,
+ map: IMapView
+ ) {
+ if (!isEnabled) {
+ return
+ }
+
+ pathLayer.drawOverlay(drawer, map)
+ pointLayer.drawOverlay(drawer, map)
+ }
+
  override fun invalidate() {
  pointLayer.invalidate()
  pathLayer.invalidate()

diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/navigation/ui/RadarCompassView.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/navigation/ui/RadarCompassView.kt
@@ -95,6 +95,10 @@ class RadarCompassView : BaseCompassView, IMapView {
  pop()
  }
 
+ private fun drawOverlays() {
+ layers.forEach { it.drawOverlay(this, this) }
+ }
+
  private fun drawCompass() {
  imageMode(ImageMode.Center)
 
@@ -207,6 +211,7 @@ class RadarCompassView : BaseCompassView, IMapView {
  drawLayers()
  drawCompassLayers()
  pop()
+ drawOverlays()
  }
 
  override fun draw(reference: IMappableReferencePoint, size: Int?) {

diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/navigation/ui/layers/BaseLayer.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/navigation/ui/layers/BaseLayer.kt
@@ -39,6 +39,13 @@ open class BaseLayer : ILayer {
  }
  }
 
+ override fun drawOverlay(
+ drawer: ICanvasDrawer,
+ map: IMapView
+ ) {
+ // Do nothing
+ }
+
  override fun invalidate() {
 
  }

diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/navigation/ui/layers/ILayer.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/navigation/ui/layers/ILayer.kt
@@ -4,7 +4,21 @@ import com.kylecorry.andromeda.canvas.ICanvasDrawer
 import com.kylecorry.andromeda.core.units.PixelCoordinate
 
 interface ILayer {
+ /**
+ * Draw the layer on the map.
+ * Transforms are already applied to the canvas.
+ */
  fun draw(drawer: ICanvasDrawer, map: IMapView)
+
+ /**
+ * Draw the overlay on the map.
+ * This is drawn on top of the map and is not transformed.
+ */
+ fun drawOverlay(drawer: ICanvasDrawer, map: IMapView)
+
+ /**
+ * Invalidate the layer
+ */
  fun invalidate()
 
  /**

diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/navigation/ui/layers/PathLayer.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/navigation/ui/layers/PathLayer.kt
@@ -100,6 +100,13 @@ class PathLayer : ILayer, IPathLayer {
  drawer.noPathEffect()
  }
 
+ override fun drawOverlay(
+ drawer: ICanvasDrawer,
+ map: IMapView
+ ) {
+ // Do nothing
+ }
+
  private fun renderInBackground(renderer: IRenderedPathFactory) {
  renderInProgress = true
  scope.launch {

diff --git a/app/src/main/java/com/kylecorry/trail_sense/tools/paths/ui/PathView.kt b/app/src/main/java/com/kylecorry/trail_sense/tools/paths/ui/PathView.kt
@@ -129,6 +129,7 @@ class PathView(context: Context, attrs: AttributeSet? = null) : CanvasView(conte
 
  drawLayers()
  drawScale()
+ drawOverlays()
  }
 
  private fun drawLayers() {
@@ -186,6 +187,10 @@ class PathView(context: Context, attrs: AttributeSet? = null) : CanvasView(conte
  return center.plus(Distance.meters(distance), Bearing(angle + 90))
  }
 
+ private fun drawOverlays() {
+ layers.forEach { it.drawOverlay(this, this) }
+ }
+
  private fun drawScale() {
  noFill()
  stroke(Color.WHITE)
@@ -227,8 +232,8 @@ class PathView(context: Context, attrs: AttributeSet? = null) : CanvasView(conte
  }
 
  @Suppress("MemberVisibilityCanBePrivate")
- fun zoomTo(newScale: Float){
- if (newScale == scale){
+ fun zoomTo(newScale: Float) {
+ if (newScale == scale) {
  return
  }
  zoom(newScale / scale)