Add new specific icon for line points

geo/src/main/java/org/odk/collect/geo/geopoint/GeoPointMapActivity.java

@@ -396,7 +396,7 @@ private void clear() {
     /** Places the marker and enables the button to remove it. */
     private void placeMarker(@NonNull MapPoint point) {
         map.clearFeatures();
-        featureId = map.addMarker(new MarkerDescription(point, intentDraggable && !intentReadOnly && !isPointLocked, MapFragment.CENTER, new MarkerIconDescription(org.odk.collect.icons.R.drawable.ic_map_point)));
+        featureId = map.addMarker(new MarkerDescription(point, intentDraggable && !intentReadOnly && !isPointLocked, MapFragment.CENTER, new MarkerIconDescription.Resource(org.odk.collect.icons.R.drawable.ic_map_point)));
         if (!intentReadOnly) {
             clearButton.setEnabled(true);
         }

geo/src/main/java/org/odk/collect/geo/selection/SelectionMapFragment.kt

@@ -319,7 +319,7 @@ class SelectionMapFragment(
 
                         map.setMarkerIcon(
                             featureId,
-                            MarkerIconDescription(item.largeIcon, item.color, item.symbol)
+                            MarkerIconDescription.Resource(item.largeIcon, item.color, item.symbol)
                         )
                     }
                 }
@@ -380,7 +380,7 @@ class SelectionMapFragment(
         if (featureId != null) {
             map.setMarkerIcon(
                 featureId,
-                MarkerIconDescription(selectedItem.smallIcon, selectedItem.color, selectedItem.symbol)
+                MarkerIconDescription.Resource(selectedItem.smallIcon, selectedItem.color, selectedItem.symbol)
             )
         }
     }
@@ -402,7 +402,7 @@ class SelectionMapFragment(
                 MapPoint(it.point.latitude, it.point.longitude),
                 false,
                 MapFragment.BOTTOM,
-                MarkerIconDescription(it.smallIcon, it.color, it.symbol)
+                MarkerIconDescription.Resource(it.smallIcon, it.color, it.symbol)
             )
         }
 

google-maps/src/main/java/org/odk/collect/googlemaps/GoogleMapFragment.java

@@ -594,7 +594,7 @@ private void updateLocationIndicator(LatLng loc, double radius) {
         if (locationCrosshairs == null) {
             locationCrosshairs = map.addMarker(new MarkerOptions()
                 .position(loc)
-                .icon(getBitmapDescriptor(getContext(), new MarkerIconDescription(org.odk.collect.maps.R.drawable.ic_crosshairs)))
+                .icon(getBitmapDescriptor(getContext(), new MarkerIconDescription.Resource(org.odk.collect.maps.R.drawable.ic_crosshairs)))
                 .anchor(0.5f, 0.5f)  // center the crosshairs on the position
             );
         }
@@ -871,7 +871,7 @@ private static class DynamicPolyLineFeature implements LineFeature {
             }
 
             for (MapPoint point : lineDescription.getPoints()) {
-                markers.add(createMarker(context, new MarkerDescription(point, true, CENTER, new MarkerIconDescription(org.odk.collect.icons.R.drawable.ic_map_point)), map));
+                markers.add(createMarker(context, new MarkerDescription(point, true, CENTER, new MarkerIconDescription.Resource(org.odk.collect.icons.R.drawable.ic_map_point)), map));
             }
 
             update();
@@ -937,7 +937,7 @@ public void addPoint(MapPoint point) {
             if (map == null) {  // during Robolectric tests, map will be null
                 return;
             }
-            markers.add(createMarker(context, new MarkerDescription(point, true, CENTER, new MarkerIconDescription(org.odk.collect.icons.R.drawable.ic_map_point)), map));
+            markers.add(createMarker(context, new MarkerDescription(point, true, CENTER, new MarkerIconDescription.Resource(org.odk.collect.icons.R.drawable.ic_map_point)), map));
             update();
         }
 

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

@@ -25,7 +25,7 @@ object MapUtils {
         return pointAnnotationManager.create(
             PointAnnotationOptions()
                 .withPoint(Point.fromLngLat(point.longitude, point.latitude, point.altitude))
-                .withIconImage(MarkerIconDescription(iconDrawableId).getBitmap(context))
+                .withIconImage(MarkerIconDescription.Resource(iconDrawableId).getBitmap(context))
                 .withIconSize(1.0)
                 .withSymbolSortKey(10.0)
                 .withDraggable(draggable)

maps/src/main/java/org/odk/collect/maps/markers/MarkerIconCreator.kt

@@ -2,6 +2,7 @@ package org.odk.collect.maps.markers
 
 import android.content.Context
 import android.graphics.Bitmap
+import android.graphics.Bitmap.Config
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
@@ -10,6 +11,7 @@ import android.util.LruCache
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
 import androidx.core.graphics.drawable.toBitmap
+import org.odk.collect.maps.MapConsts
 
 object MarkerIconCreator {
     /**
@@ -22,14 +24,53 @@ object MarkerIconCreator {
 
     @JvmStatic
     fun getMarkerIcon(context: Context, markerIconDescription: MarkerIconDescription): Bitmap {
-        val drawableId = markerIconDescription.icon
-        val color = markerIconDescription.getColor()
-        val symbol = markerIconDescription.getSymbol()
+        return when (markerIconDescription) {
+            is MarkerIconDescription.LinePoint -> {
+                fromCache("LinePoint") {
+                    val size = markerIconDescription.lineSize * 6
+                    val bitmap =
+                        Bitmap.createBitmap(size.toInt(), size.toInt(), Config.ARGB_8888)
 
-        val bitmapId = drawableId.toString() + color + symbol
+                    Canvas(bitmap).also { canvas ->
+                        val radius = size / 2
 
+                        val fill = Paint().also {
+                            it.style = Paint.Style.FILL
+                            it.color = MapConsts.DEFAULT_STROKE_COLOR
+                        }
+                        canvas.drawCircle(radius, radius, radius, fill)
+
+                        val strokeWidth = markerIconDescription.lineSize
+                        val stroke = Paint().also {
+                            it.style = Paint.Style.STROKE
+                            it.color = Color.parseColor("#ffffff")
+                            it.strokeWidth = strokeWidth
+                        }
+                        canvas.drawCircle(radius, radius, radius - (strokeWidth / 2), stroke)
+                    }
+
+                    bitmap
+                }
+            }
+
+            is MarkerIconDescription.Resource -> {
+                val drawableId = markerIconDescription.icon
+                val color = markerIconDescription.getColor()
+                val symbol = markerIconDescription.getSymbol()
+
+                val bitmapId = drawableId.toString() + color + symbol
+                fromCache(bitmapId) {
+                    createBitmap(context, drawableId, color, symbol).also {
+                        cache.put(bitmapId, it)
+                    }
+                }
+            }
+        }
+    }
+
+    private fun fromCache(bitmapId: String, factory: () -> Bitmap): Bitmap {
         return if (cache[bitmapId] == null) {
-            createBitmap(context, drawableId, color, symbol).also {
+            factory().also {
                 cache.put(bitmapId, it)
             }
         } else {

maps/src/main/java/org/odk/collect/maps/markers/MarkerIconDescription.kt

@@ -4,18 +4,22 @@ import org.odk.collect.androidshared.utils.toColorInt
 import org.odk.collect.shared.strings.StringUtils
 import java.util.Locale
 
-class MarkerIconDescription @JvmOverloads constructor(
-    val icon: Int,
-    private val color: String? = null,
-    private val symbol: String? = null
-) {
-    fun getColor(): Int? = color?.toColorInt()
+sealed interface MarkerIconDescription {
+    class Resource @JvmOverloads constructor(
+        val icon: Int,
+        private val color: String? = null,
+        private val symbol: String? = null
+    ) : MarkerIconDescription {
+        fun getColor(): Int? = color?.toColorInt()
 
-    fun getSymbol(): String? = symbol?.let {
-        if (it.isBlank()) {
-            null
-        } else {
-            StringUtils.firstCharacterOrEmoji(it).uppercase(Locale.US)
+        fun getSymbol(): String? = symbol?.let {
+            if (it.isBlank()) {
+                null
+            } else {
+                StringUtils.firstCharacterOrEmoji(it).uppercase(Locale.US)
+            }
         }
     }
+
+    class LinePoint(val lineSize: Float) : MarkerIconDescription
 }

osmdroid/src/main/java/org/odk/collect/osmdroid/OsmDroidMapFragment.java

@@ -874,8 +874,10 @@ private class DynamicPolyLineFeature implements LineFeature {
         final List<Marker> markers = new ArrayList<>();
         final Polyline polyline;
         final boolean closedPolygon;
+        private final LineDescription lineDescription;
 
         DynamicPolyLineFeature(MapView map, LineDescription lineDescription) {
+            this.lineDescription = lineDescription;
             this.map = map;
             this.closedPolygon = lineDescription.getClosed();
             polyline = new Polyline();
@@ -892,7 +894,7 @@ private class DynamicPolyLineFeature implements LineFeature {
             paint.setStrokeWidth(lineDescription.getStrokeWidth());
             map.getOverlays().add(polyline);
             for (MapPoint point : lineDescription.getPoints()) {
-                markers.add(createMarker(map, new MarkerDescription(point, true, CENTER, new MarkerIconDescription(org.odk.collect.icons.R.drawable.ic_map_point))));
+                markers.add(getPointMarker(point));
             }
             update();
         }
@@ -944,10 +946,15 @@ public List<MapPoint> getPoints() {
         }
 
         public void addPoint(MapPoint point) {
-            markers.add(createMarker(map, new MarkerDescription(point, true, CENTER, new MarkerIconDescription(org.odk.collect.icons.R.drawable.ic_map_point))));
+            markers.add(getPointMarker(point));
             update();
         }
 
+        @NonNull
+        private Marker getPointMarker(MapPoint point) {
+            return createMarker(map, new MarkerDescription(point, true, CENTER, new MarkerIconDescription.LinePoint(lineDescription.getStrokeWidth())));
+        }
+
         public void removeLastPoint() {
             if (!markers.isEmpty()) {
                 int last = markers.size() - 1;