[WIP - DO NOT REVIEW] Refactor feature managers

ground/src/main/java/com/google/android/ground/model/job/Job.kt

@@ -15,15 +15,18 @@
  */
 package com.google.android.ground.model.job
 
+import android.graphics.Color
 import com.google.android.ground.model.task.Task
+import java.lang.IllegalArgumentException
+import timber.log.Timber
 
 /**
  * @param suggestLoiTaskType the type of task used to suggest the LOI for this Job. Null if the job
  * is already associated with an LOI.
  */
 data class Job(
   val id: String,
-  val style: Style,
+  val style: Style? = null,
   val name: String? = null,
   val tasks: Map<String, Task> = mapOf(),
   val suggestLoiTaskType: Task.Type? = null,
@@ -35,3 +38,11 @@ data class Job(
 
   fun hasData(): Boolean = tasks.isNotEmpty()
 }
+
+fun Job.getDefaultColor(): Int =
+  try {
+    Color.parseColor(style?.color ?: "")
+  } catch (e: IllegalArgumentException) {
+    Timber.w(e, "Invalid or missing color ${style?.color} in job $id")
+    0
+  }

ground/src/main/java/com/google/android/ground/model/job/Style.kt

@@ -15,4 +15,4 @@
  */
 package com.google.android.ground.model.job
 
-data class Style @JvmOverloads constructor(val color: String = "#ff9131")
+data class Style constructor(val color: String)

ground/src/main/java/com/google/android/ground/model/submission/LocationTaskData.kt

@@ -34,9 +34,10 @@ constructor(
     // TODO: Move to strings.xml for i18n
     val df = DecimalFormat("#.##")
     df.roundingMode = RoundingMode.DOWN
-    return "${LatLngConverter.processCoordinates(geometry.coordinates)}\n" +
-      "Altitude: ${df.format(altitude)}m\n" +
-      "Accuracy: ${df.format(accuracy)}m"
+    val coordinatesString = LatLngConverter.formatCoordinates(geometry.coordinates)
+    val altitudeString = altitude?.let { df.format(it) } ?: "?"
+    val accuracyString = accuracy?.let { df.format(it) } ?: "?"
+    return "$coordinatesString\nAltitude: $altitudeString m\nAccuracy: $accuracyString m"
   }
 
   override fun isEmpty(): Boolean = geometry == null

ground/src/main/java/com/google/android/ground/persistence/local/room/converter/ConverterExt.kt

@@ -102,21 +102,25 @@ fun Job.toLocalDataStoreObject(surveyId: String): JobEntity =
     surveyId = surveyId,
     name = name,
     suggestLoiTaskType = suggestLoiTaskType?.toString(),
-    style = style.toLocalDataStoreObject()
+    style = style?.toLocalDataStoreObject()
   )
 
 fun JobEntityAndRelations.toModelObject(): Job {
   val taskMap = taskEntityAndRelations.map { it.toModelObject() }.associateBy { it.id }
   return Job(
     jobEntity.id,
-    jobEntity.style.toModelObject(),
+    jobEntity.style?.toModelObject(),
     jobEntity.name,
     taskMap.toPersistentMap(),
     jobEntity.suggestLoiTaskType?.let { Task.Type.valueOf(it) }
   )
 }
 
-fun StyleEntity.toModelObject() = color?.let { Style(it) } ?: Style()
+/**
+ * Returns the equivalent model object, setting the style color to #000 if it was missing in the
+ * local db.
+ */
+fun StyleEntity.toModelObject() = color?.let { Style(it) } ?: Style("#000000")
 
 fun Style.toLocalDataStoreObject() = StyleEntity(color)
 

ground/src/main/java/com/google/android/ground/persistence/local/room/entity/JobEntity.kt

@@ -35,5 +35,5 @@ data class JobEntity(
   @ColumnInfo(name = "name") val name: String?,
   @ColumnInfo(name = "survey_id") val surveyId: String?,
   @ColumnInfo(name = "suggest_loi_task_type") val suggestLoiTaskType: String?,
-  @Embedded(prefix = "style_") val style: StyleEntity
+  @Embedded(prefix = "style_") val style: StyleEntity?
 )

ground/src/main/java/com/google/android/ground/persistence/local/room/stores/RoomSubmissionStore.kt

@@ -225,14 +225,14 @@ class RoomSubmissionStore @Inject internal constructor() : LocalSubmissionStore
   ): List<SubmissionMutationEntity> =
     submissionMutationDao.findByLocationOfInterestId(loidId, *states)
 
-  override suspend fun getPendingSubmissionCountByLocationOfInterestId(loiId: String): Int =
+  override suspend fun getPendingCreateCount(loiId: String): Int =
     submissionMutationDao.getSubmissionMutationCount(
       loiId,
       MutationEntityType.CREATE,
       MutationEntitySyncStatus.PENDING
     )
 
-  override suspend fun getPendingSubmissionDeletionCountByLocationOfInterestId(loiId: String): Int =
+  override suspend fun getPendingDeleteCount(loiId: String): Int =
     submissionMutationDao.getSubmissionMutationCount(
       loiId,
       MutationEntityType.DELETE,

ground/src/main/java/com/google/android/ground/persistence/local/stores/LocalSubmissionStore.kt

@@ -59,11 +59,11 @@ interface LocalSubmissionStore : LocalMutationStore<SubmissionMutation, Submissi
     vararg states: MutationEntitySyncStatus
   ): List<SubmissionMutationEntity>
 
-  suspend fun getPendingSubmissionCountByLocationOfInterestId(
+  suspend fun getPendingCreateCount(
     loiId: String,
   ): Int
 
-  suspend fun getPendingSubmissionDeletionCountByLocationOfInterestId(
+  suspend fun getPendingDeleteCount(
     loiId: String,
   ): Int
 }

ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/JobConverter.kt

@@ -33,7 +33,7 @@ internal object JobConverter {
     }
     return Job(
       id,
-      obj.defaultStyle.toStyle(),
+      obj.defaultStyle?.toStyle(),
       obj.name,
       taskMap.toPersistentMap(),
       TaskConverter.toSuggestLoiTaskType(obj.suggestLoiTaskType)

ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/JobNestedObject.kt

@@ -21,7 +21,7 @@ import com.google.firebase.firestore.IgnoreExtraProperties
 /** Firestore representation of map layers. */
 @IgnoreExtraProperties
 data class JobNestedObject(
-  val defaultStyle: StyleNestedObject = StyleNestedObject(),
+  val defaultStyle: StyleNestedObject? = null,
   val name: String? = null,
   val tasks: Map<String, TaskNestedObject>? = null,
   val suggestLoiTaskType: String? = null

ground/src/main/java/com/google/android/ground/persistence/remote/firebase/schema/StyleNestedObject.kt

@@ -19,6 +19,6 @@ import com.google.android.ground.model.job.Style
 import com.google.firebase.firestore.IgnoreExtraProperties
 
 /** Firestore representation of map layers. */
-@IgnoreExtraProperties data class StyleNestedObject(val color: String = "#ff9131")
+@IgnoreExtraProperties data class StyleNestedObject(val color: String = "")
 
 fun StyleNestedObject.toStyle(): Style = Style(color)

ground/src/main/java/com/google/android/ground/repository/LocationOfInterestRepository.kt

@@ -24,7 +24,6 @@ import com.google.android.ground.model.mutation.LocationOfInterestMutation
 import com.google.android.ground.model.mutation.Mutation.SyncStatus
 import com.google.android.ground.persistence.local.room.fields.MutationEntitySyncStatus
 import com.google.android.ground.persistence.local.stores.LocalLocationOfInterestStore
-import com.google.android.ground.persistence.local.stores.LocalSubmissionStore
 import com.google.android.ground.persistence.local.stores.LocalSurveyStore
 import com.google.android.ground.persistence.remote.NotFoundException
 import com.google.android.ground.persistence.remote.RemoteDataStore
@@ -33,15 +32,11 @@ import com.google.android.ground.persistence.uuid.OfflineUuidGenerator
 import com.google.android.ground.rx.annotations.Cold
 import com.google.android.ground.system.auth.AuthenticationManager
 import com.google.android.ground.ui.map.Bounds
-import com.google.android.ground.ui.map.Feature
-import com.google.android.ground.ui.map.FeatureType
 import com.google.android.ground.ui.map.gms.GmsExt.contains
 import io.reactivex.Flowable
 import io.reactivex.Single
 import javax.inject.Inject
 import javax.inject.Singleton
-import kotlinx.collections.immutable.toPersistentSet
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.reactive.awaitFirst
 
 /**
@@ -55,7 +50,6 @@ class LocationOfInterestRepository
 constructor(
   private val localSurveyStore: LocalSurveyStore,
   private val localLoiStore: LocalLocationOfInterestStore,
-  private val localSubmissionStore: LocalSubmissionStore,
   private val remoteDataStore: RemoteDataStore,
   private val mutationSyncWorkManager: MutationSyncWorkManager,
   private val authManager: AuthenticationManager,
@@ -133,31 +127,7 @@ constructor(
     survey: Survey
   ): Flowable<Set<LocationOfInterest>> = localLoiStore.getLocationsOfInterestOnceAndStream(survey)
 
-  private fun findLocationsOfInterest(survey: Survey) =
-    localLoiStore.findLocationsOfInterest(survey)
-
-  fun findLocationsOfInterestFeatures(survey: Survey) =
-    findLocationsOfInterest(survey).map { toLocationOfInterestFeatures(it) }
-
-  private suspend fun toLocationOfInterestFeatures(
-    locationsOfInterest: Set<LocationOfInterest>
-  ): Set<Feature> = // TODO: Add support for polylines similar to mapPins.
-  locationsOfInterest
-      .map {
-        val pendingSubmissions =
-          localSubmissionStore.getPendingSubmissionCountByLocationOfInterestId(it.id) -
-            localSubmissionStore.getPendingSubmissionDeletionCountByLocationOfInterestId(it.id)
-        val submissionCount = it.submissionCount + pendingSubmissions
-        Feature(
-          id = it.id,
-          type = FeatureType.LOCATION_OF_INTEREST.ordinal,
-          flag = submissionCount > 0,
-          geometry = it.geometry,
-          style = it.job.style,
-          clusterable = true
-        )
-      }
-      .toPersistentSet()
+  fun getLocationsOfInterest(survey: Survey) = localLoiStore.findLocationsOfInterest(survey)
 
   /** Returns a list of geometries associated with the given [Survey]. */
   suspend fun getAllGeometries(survey: Survey): List<Geometry> =

ground/src/main/java/com/google/android/ground/repository/SubmissionRepository.kt

@@ -182,4 +182,10 @@ constructor(
           MutationEntitySyncStatus.FAILED
         )
       }
+
+  suspend fun getPendingCreateCount(loiId: String) =
+    localSubmissionStore.getPendingCreateCount(loiId)
+
+  suspend fun getPendingDeleteCount(loiId: String) =
+    localSubmissionStore.getPendingDeleteCount(loiId)
 }

ground/src/main/java/com/google/android/ground/ui/common/AbstractMapFragmentWithControls.kt

@@ -84,7 +84,7 @@ abstract class AbstractMapFragmentWithControls : AbstractMapContainerFragment()
       return
     }
     val target = position.target
-    val processedCoordinates = LatLngConverter.processCoordinates(target)
+    val processedCoordinates = LatLngConverter.formatCoordinates(target)
     setCurrentLocationAsInfoCard(processedCoordinates)
   }
 }

ground/src/main/java/com/google/android/ground/ui/datacollection/DataCollectionViewModel.kt

@@ -148,7 +148,7 @@ internal constructor(
     }
     val viewModel = viewModelFactory.create(getViewModelClass(task.type))
     // TODO(#1146): Pass in the existing taskData if there is one
-    viewModel.initialize(task, null)
+    viewModel.initialize(job, task, null)
     addTaskViewModel(viewModel)
     return viewModel
   }

ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/AbstractTaskViewModel.kt

@@ -21,6 +21,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.toLiveData
 import androidx.lifecycle.viewModelScope
 import com.google.android.ground.R
+import com.google.android.ground.model.job.Job
 import com.google.android.ground.model.submission.TaskData
 import com.google.android.ground.model.submission.isNullOrEmpty
 import com.google.android.ground.model.task.Task
@@ -65,7 +66,7 @@ open class AbstractTaskViewModel internal constructor(private val resources: Res
   }
 
   // TODO: Add a reference of Task in TaskData for simplification.
-  fun initialize(task: Task, taskData: TaskData?) {
+  open fun initialize(job: Job, task: Task, taskData: TaskData?) {
     this.task = task
     setResponse(taskData)
   }

ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/point/DropAPinTaskViewModel.kt

@@ -18,7 +18,11 @@ package com.google.android.ground.ui.datacollection.tasks.point
 import android.content.res.Resources
 import androidx.lifecycle.MutableLiveData
 import com.google.android.ground.model.geometry.Point
+import com.google.android.ground.model.job.Job
+import com.google.android.ground.model.job.getDefaultColor
 import com.google.android.ground.model.submission.GeometryData
+import com.google.android.ground.model.submission.TaskData
+import com.google.android.ground.model.task.Task
 import com.google.android.ground.persistence.uuid.OfflineUuidGenerator
 import com.google.android.ground.rx.annotations.Hot
 import com.google.android.ground.ui.datacollection.tasks.AbstractTaskViewModel
@@ -32,9 +36,15 @@ class DropAPinTaskViewModel
 constructor(resources: Resources, private val uuidGenerator: OfflineUuidGenerator) :
   AbstractTaskViewModel(resources) {
 
+  private var pinColor: Int = 0
   private var lastCameraPosition: CameraPosition? = null
   val features: @Hot MutableLiveData<Set<Feature>> = MutableLiveData()
 
+  override fun initialize(job: Job, task: Task, taskData: TaskData?) {
+    super.initialize(job, task, taskData)
+    pinColor = job.getDefaultColor()
+  }
+
   fun updateCameraPosition(position: CameraPosition) {
     lastCameraPosition = position
   }
@@ -55,6 +65,8 @@ constructor(resources: Resources, private val uuidGenerator: OfflineUuidGenerato
       id = uuidGenerator.generateUuid(),
       type = FeatureType.USER_POINT.ordinal,
       geometry = point,
+      // TODO: Set correct pin color.
+      style = Feature.Style(pinColor),
       clusterable = false
     )
 

ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/point/LatLngConverter.kt

@@ -26,7 +26,7 @@ import kotlin.math.abs
 object LatLngConverter {
 
   /** Converts the given coordinates in decimal format to D°M′S″ format. */
-  fun processCoordinates(coordinates: Coordinates?): String? =
+  fun formatCoordinates(coordinates: Coordinates?): String? =
     coordinates?.let { "${convertLatToDMS(it.lat)} ${convertLongToDMS(it.lng)}" }
 
   private fun convertLatToDMS(lat: Double): String {

ground/src/main/java/com/google/android/ground/ui/datacollection/tasks/polygon/PolygonDrawingViewModel.kt

@@ -24,7 +24,11 @@ import com.google.android.ground.model.geometry.LineString
 import com.google.android.ground.model.geometry.LinearRing
 import com.google.android.ground.model.geometry.Point
 import com.google.android.ground.model.geometry.Polygon
+import com.google.android.ground.model.job.Job
+import com.google.android.ground.model.job.getDefaultColor
 import com.google.android.ground.model.submission.GeometryData
+import com.google.android.ground.model.submission.TaskData
+import com.google.android.ground.model.task.Task
 import com.google.android.ground.persistence.uuid.OfflineUuidGenerator
 import com.google.android.ground.ui.common.SharedViewModel
 import com.google.android.ground.ui.datacollection.tasks.AbstractTaskViewModel
@@ -61,6 +65,13 @@ internal constructor(private val uuidGenerator: OfflineUuidGenerator, resources:
   /** Represents whether the user has completed drawing the polygon or not. */
   private var isMarkedComplete: Boolean = false
 
+  private var strokeColor: Int = 0
+
+  override fun initialize(job: Job, task: Task, taskData: TaskData?) {
+    super.initialize(job, task, taskData)
+    strokeColor = job.getDefaultColor()
+  }
+
   fun isMarkedComplete(): Boolean = isMarkedComplete
 
   /**
@@ -147,15 +158,16 @@ internal constructor(private val uuidGenerator: OfflineUuidGenerator, resources:
   }
 
   /** Returns a set of [Feature] to be drawn on map for the given [Polygon]. */
-  private fun refreshFeatures(points: List<Point>, isMarkedComplete: Boolean) {
+  private fun refreshFeatures(vertices: List<Point>, isMarkedComplete: Boolean) {
     featureFlow.value =
-      if (points.isEmpty()) {
+      if (vertices.isEmpty()) {
         null
       } else {
         Feature(
           id = uuidGenerator.generateUuid(),
           type = FeatureType.USER_POLYGON.ordinal,
-          geometry = createGeometry(points, isMarkedComplete),
+          geometry = createGeometry(vertices, isMarkedComplete),
+          style = Feature.Style(strokeColor, Feature.VertexStyle.CIRCLE),
           clusterable = false
         )
       }