Merge pull request #7090 from grzesiek2010/COLLECT-7084

Add lines to mapbox static polygons

Author: seadowg

mapbox/src/main/java/org/odk/collect/mapbox/MapboxMapFragment.kt

@@ -402,6 +402,7 @@ class MapboxMapFragment :
         } else {
             features[featureId] = StaticPolygonFeature(
                 polygonAnnotationManager,
+                polylineAnnotationManager,
                 polygonDescription,
                 featureClickListener,
                 featureId

mapbox/src/main/java/org/odk/collect/mapbox/StaticPolygonFeature.kt

@@ -2,51 +2,70 @@ package org.odk.collect.mapbox
 
 import com.mapbox.geojson.Point
 import com.mapbox.maps.plugin.annotation.generated.OnPolygonAnnotationClickListener
-import com.mapbox.maps.plugin.annotation.generated.PolygonAnnotation
+import com.mapbox.maps.plugin.annotation.generated.OnPolylineAnnotationClickListener
 import com.mapbox.maps.plugin.annotation.generated.PolygonAnnotationManager
 import com.mapbox.maps.plugin.annotation.generated.PolygonAnnotationOptions
+import com.mapbox.maps.plugin.annotation.generated.PolylineAnnotationManager
+import com.mapbox.maps.plugin.annotation.generated.PolylineAnnotationOptions
 import org.odk.collect.maps.MapFragment
 import org.odk.collect.maps.MapPoint
 import org.odk.collect.maps.PolygonDescription
 
 class StaticPolygonFeature(
     private val polygonAnnotationManager: PolygonAnnotationManager,
+    private val polylineAnnotationManager: PolylineAnnotationManager,
     polygonDescription: PolygonDescription,
     featureClickListener: MapFragment.FeatureListener?,
     featureId: Int
 ) : LineFeature {
 
     override val points: List<MapPoint> = polygonDescription.points
 
-    private val polygonAnnotation: PolygonAnnotation = polygonAnnotationManager.create(
+    private val mapboxPoints = points.map { Point.fromLngLat(it.longitude, it.latitude) }
+
+    private val polygonAnnotation = polygonAnnotationManager.create(
         PolygonAnnotationOptions()
-            .withPoints(listOf(polygonDescription.points.map { Point.fromLngLat(it.longitude, it.latitude) }))
+            .withPoints(listOf(mapboxPoints))
             .withFillOutlineColor(polygonDescription.getStrokeColor())
             .withFillColor(polygonDescription.getFillColor())
     )
 
-    private val polygonClickListener =
-        PolygonClickListener(polygonAnnotation.id, featureClickListener, featureId).also {
-            polygonAnnotationManager.addClickListener(it)
-        }
+    private val polylineAnnotation = polylineAnnotationManager.create(
+        PolylineAnnotationOptions()
+            .withPoints(mapboxPoints)
+            .withLineColor(polygonDescription.getStrokeColor())
+            .withLineWidth(MapUtils.convertStrokeWidth(polygonDescription))
+    )
 
-    override fun dispose() {
-        polygonAnnotationManager.delete(polygonAnnotation)
-        polygonAnnotationManager.removeClickListener(polygonClickListener)
+    private val polygonClickListener = OnPolygonAnnotationClickListener { annotation ->
+        if (annotation.id == polygonAnnotation.id) {
+            featureClickListener?.onFeature(featureId)
+            true
+        } else {
+            false
+        }
+    }.also {
+        polygonAnnotationManager.addClickListener(it)
     }
-}
 
-private class PolygonClickListener(
-    private val polygonId: Long,
-    private val featureClickListener: MapFragment.FeatureListener?,
-    private val featureId: Int
-) : OnPolygonAnnotationClickListener {
-    override fun onAnnotationClick(annotation: PolygonAnnotation): Boolean {
-        return if (annotation.id == polygonId && featureClickListener != null) {
-            featureClickListener.onFeature(featureId)
+    private val polylineClickListener = OnPolylineAnnotationClickListener { annotation ->
+        if (annotation.id == polylineAnnotation.id) {
+            featureClickListener?.onFeature(featureId)
             true
         } else {
             false
         }
+    }.also(polylineAnnotationManager::addClickListener)
+
+    override fun dispose() {
+        polygonAnnotationManager.run {
+            delete(polygonAnnotation)
+            removeClickListener(polygonClickListener)
+        }
+
+        polylineAnnotationManager.run {
+            delete(polylineAnnotation)
+            removeClickListener(polylineClickListener)
+        }
     }
 }