Android: Fix map border does not always receive click events

Author: bailuk

CHANGELOG.md

@@ -32,3 +32,4 @@ See [metadata/en-US/changelogs](metadata/en-US/changelogs) for all changelogs.
 - Gtk: Show tracker controller buttons in map view
 - Lib: Fix infinite loop when parsing broken GPX-files (Issue #174)
 - Lib: Fix ignoring altitude precision when reading and displaying tracks
+- Android: Fix map border does not always receive click events

aat-android/src/main/kotlin/ch/bailu/aat/map/mapsforge/MapsForgeViewBase.kt

@@ -1,6 +1,9 @@
 package ch.bailu.aat.map.mapsforge
 
 import android.content.Context
+import android.view.GestureDetector
+import android.view.GestureDetector.SimpleOnGestureListener
+import android.view.MotionEvent
 import android.view.View
 import ch.bailu.aat.map.MapDensity
 import ch.bailu.aat.preferences.Storage
@@ -14,6 +17,7 @@ import ch.bailu.aat_lib.map.layer.MapLayerInterface
 import ch.bailu.aat_lib.preferences.OnPreferencesChanged
 import ch.bailu.aat_lib.preferences.StorageInterface
 import ch.bailu.aat_lib.service.ServicesInterface
+import ch.bailu.aat_lib.util.Point
 import org.mapsforge.core.model.BoundingBox
 import org.mapsforge.core.model.Dimension
 import org.mapsforge.core.model.MapPosition
@@ -47,13 +51,27 @@ open class MapsForgeViewBase(
         storage = Storage(context)
         mapScaleBar.isVisible = false
         setBuiltInZoomControls(false)
+
+        // Mapsforge does only propagate click events that have latitude and longitude
+        // but we are only interested in pixels (including those that are outside the visible map)
+        setGestureDetector(GestureDetector(context, object : SimpleOnGestureListener() {
+            override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
+                val point = Point(e.x, e.y)
+                for (layer in layers) {
+                    if (layer.onTap(point)) {
+                        return true
+                    }
+                }
+                return false
+            }
+        } ))
     }
 
     override fun onChange() {
         // Disable MapView.onChange to fix a speed bug in MapsForge
     }
 
-    override fun add(layer: MapLayerInterface) {
+    final override fun add(layer: MapLayerInterface) {
         val wrapper: Layer = if (layer is Layer) {
             layer
         } else {

aat-gtk/src/main/kotlin/ch/bailu/aat_gtk/view/map/GtkCustomMapView.kt

@@ -20,7 +20,9 @@ import ch.bailu.aat_lib.preferences.OnPreferencesChanged
 import ch.bailu.aat_lib.preferences.StorageInterface
 import ch.bailu.aat_lib.preferences.map.SolidTileSize
 import ch.bailu.aat_lib.util.Limit
+import ch.bailu.aat_lib.util.Point
 import ch.bailu.gtk.cairo.Context
+import ch.bailu.gtk.gtk.GestureClick
 import org.mapsforge.core.model.BoundingBox
 import org.mapsforge.core.model.Dimension
 import org.mapsforge.core.model.LatLong
@@ -80,10 +82,27 @@ open class GtkCustomMapView (
                 }
             }
         })
+
+        // Mapsforge does only propagate click events that have latitude and longitude
+        // but we are only interested in pixels (including those that are outside the visible map)
+        drawingArea.addController(GestureClick().apply {
+            var singleClick = false
+            onPressed { i, _, _ ->  singleClick = i == 1 }
+            onStopped { singleClick = false }
+            onReleased { i, x, y ->
+                if (i == 1 && singleClick) {
+                    val point = Point(x, y)
+                    for (layer in layers) {
+                        if (layer.onTap(point)) {
+                            break
+                        }
+                    }
+                }
+            }
+        })
         onAttached()
     }
 
-
     override fun frameBounding(boundingBox: BoundingBoxE6) {
         frameBounding(boundingBox.toBoundingBox())
     }

aat-lib/src/main/java/ch/bailu/aat_lib/map/layer/LayerWrapper.kt

@@ -4,7 +4,6 @@ import ch.bailu.aat_lib.map.MapContext
 import ch.bailu.aat_lib.service.ServicesInterface
 import org.mapsforge.core.graphics.Canvas
 import org.mapsforge.core.model.BoundingBox
-import org.mapsforge.core.model.LatLong
 import org.mapsforge.core.model.Point
 import org.mapsforge.core.model.Rotation
 import org.mapsforge.map.layer.Layer
@@ -17,8 +16,4 @@ class LayerWrapper(
     override fun draw(bounding: BoundingBox, zoom: Byte, canvas: Canvas, topLeftPoint: Point, rotation: Rotation) {
         services.insideContext { layer.drawInside(mcontext) }
     }
-
-    override fun onTap(tapLatLong: LatLong, layerXY: Point?, tapXY: Point): Boolean {
-        return layer.onTap(ch.bailu.aat_lib.util.Point(tapXY.x, tapXY.y))
-    }
 }