[mage-1438] (#85)

1) Fix non-point observations not showing the associated form icon in the observations list
2) Refactor MapAnnotation's factory methods and associated style classes to make the logic clearer

Author: nruss11-om

mage/src/main/java/mil/nga/giat/mage/LandingViewModel.kt

@@ -74,7 +74,7 @@ class LandingViewModel @Inject constructor(
                eventLocalDataSource.getForm(it)
             }
 
-            val icon = MapAnnotation.fromObservation(
+            val icon = MapAnnotation.getAnnotationWithStyleFromObservation(
                event = event,
                formDefinition = formDefinition,
                observationForm = observationForm,
@@ -107,7 +107,7 @@ class LandingViewModel @Inject constructor(
                   id.toString(),
                   NavigableType.USER,
                   location.geometry,
-                  MapAnnotation.fromUser(user, location)
+                  MapAnnotation.getAnnotationWithBaseStyleFromUser(user, location)
                )
             )
          }
@@ -117,7 +117,7 @@ class LandingViewModel @Inject constructor(
    fun startFeedNavigation(feedId: String, itemId: String) {
       viewModelScope.launch {
          val itemWithFeed = feedItemDao.item(feedId, itemId).first()
-         val icon = MapAnnotation.fromFeedItem(itemWithFeed, application)
+         val icon = MapAnnotation.getAnnotationWithBaseStyleFromFeedItem(itemWithFeed, application)
          _navigateTo.postValue(
             Navigable(
                FeedItemId(itemWithFeed.feed.id, itemWithFeed.item.id),

mage/src/main/java/mil/nga/giat/mage/form/edit/dialog/GeometryFieldDialog.kt

@@ -55,7 +55,7 @@ import mil.nga.giat.mage.coordinate.CoordinateType
 import mil.nga.giat.mage.coordinate.DMS
 import mil.nga.giat.mage.coordinate.DMSLocation
 import mil.nga.giat.mage.databinding.DialogGeometryFieldBinding
-import mil.nga.giat.mage.map.annotation.ShapeStyle
+import mil.nga.giat.mage.map.annotation.ShapeObservationStyle
 import mil.nga.giat.mage.map.hasKinks
 import mil.nga.giat.mage.observation.InputFilterDecimal
 import mil.nga.giat.mage.observation.ObservationLocation
@@ -257,7 +257,7 @@ class GeometryFieldDialog : DialogFragment(),
             mapCoordinateSystem = CoordinateSystem.GARS
         }
 
-        val style = ShapeStyle(requireContext())
+        val style = ShapeObservationStyle(null, requireContext())
         editMarkerOptions = getEditMarkerOptions()
         editPolylineOptions = getEditPolylineOptions(style)
         editPolygonOptions = getEditPolygonOptions(style)
@@ -1268,7 +1268,7 @@ class GeometryFieldDialog : DialogFragment(),
      * @param style observation shape style
      * @return edit polyline options
      */
-    private fun getEditPolylineOptions(style: ShapeStyle): PolylineOptions {
+    private fun getEditPolylineOptions(style: ShapeObservationStyle): PolylineOptions {
         val polylineOptions = PolylineOptions()
         polylineOptions.width(style.strokeWidth)
         polylineOptions.color(style.strokeColor)
@@ -1281,7 +1281,7 @@ class GeometryFieldDialog : DialogFragment(),
      * @param style observation shape style
      * @return edit polygon options
      */
-    private fun getEditPolygonOptions(style: ShapeStyle): PolygonOptions {
+    private fun getEditPolygonOptions(style: ShapeObservationStyle): PolygonOptions {
         val polygonOptions = PolygonOptions()
         polygonOptions.strokeWidth(style.strokeWidth)
         polygonOptions.strokeColor(style.strokeColor)

mage/src/main/java/mil/nga/giat/mage/form/view/MapViewContent.kt

@@ -24,7 +24,7 @@ import mil.nga.giat.mage.form.FormState
 import mil.nga.giat.mage.form.field.FieldValue
 import mil.nga.giat.mage.glide.target.MarkerTarget
 import mil.nga.giat.mage.map.annotation.MapAnnotation
-import mil.nga.giat.mage.map.annotation.ShapeStyle
+import mil.nga.giat.mage.map.annotation.ShapeObservationStyle
 import mil.nga.giat.mage.observation.ObservationLocation
 import mil.nga.sf.GeometryType
 import mil.nga.sf.util.GeometryUtils
@@ -88,7 +88,7 @@ fun MapViewContent(
         if (formState != null) {
           Glide.with(context)
             .asBitmap()
-            .load(MapAnnotation.fromObservationProperties(formState.id ?: 0, location.geometry, location.time, location.accuracy, formState.eventId, formState.definition.id, primary, secondary, context))
+            .load(MapAnnotation.getAnnotationWithBaseStyleFromObservationProperties(formState.id ?: 0, location.geometry, location.time, location.accuracy, formState.eventId, formState.definition.id, primary, secondary, context))
             .error(R.drawable.default_marker)
             .into(MarkerTarget(context, marker, 32, 32))
         }
@@ -104,7 +104,7 @@ fun MapViewContent(
         }
       } else {
         val shape = GoogleMapShapeConverter().toShape(location.geometry).shape
-        val style = ShapeStyle.fromForm(event, formState, context)
+        val style = ShapeObservationStyle.getStyleFromForm(event, formState, null, context)
 
         if (shape is PolylineOptions) {
           googleMap.addPolyline {

mage/src/main/java/mil/nga/giat/mage/glide/loader/MapIconLoader.kt

@@ -5,7 +5,7 @@ import com.bumptech.glide.load.Options
 import com.bumptech.glide.load.model.ModelLoader
 import com.bumptech.glide.load.model.ModelLoaderFactory
 import com.bumptech.glide.load.model.MultiModelLoaderFactory
-import mil.nga.giat.mage.map.annotation.IconStyle
+import mil.nga.giat.mage.map.annotation.BaseObservationStyle
 import mil.nga.giat.mage.map.annotation.MapAnnotation
 import java.io.InputStream
 
@@ -14,7 +14,7 @@ class MapIconLoader private constructor(
 ) : ModelLoader<MapAnnotation<*>, InputStream> {
 
     override fun buildLoadData(model: MapAnnotation<*>, width: Int, height: Int, options: Options): ModelLoader.LoadData<InputStream>? {
-        val iconStyle = model.style as IconStyle
+        val iconStyle = model.style as BaseObservationStyle
         return if (iconStyle.uri == null && !model.allowEmptyIcon) {
             null
         } else if (iconStyle.uri != null) {
@@ -25,7 +25,7 @@ class MapIconLoader private constructor(
         }
     }
 
-    override fun handles(model: MapAnnotation<*>): Boolean = model.style is IconStyle
+    override fun handles(model: MapAnnotation<*>): Boolean = model.style is BaseObservationStyle
 
     class Factory : ModelLoaderFactory<MapAnnotation<*>, InputStream> {
         override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<MapAnnotation<*>, InputStream> {

mage/src/main/java/mil/nga/giat/mage/map/MapViewModel.kt

@@ -74,7 +74,7 @@ class MapViewModel @Inject constructor(
                     eventLocalDataSource.getForm(formId)
                 }
 
-                MapAnnotation.fromObservation(
+                MapAnnotation.getAnnotationWithStyleFromObservation(
                     event = event,
                     observation = observation,
                     formDefinition = formDefinition,
@@ -91,7 +91,7 @@ class MapViewModel @Inject constructor(
 
     val locations = locationRepository.getLocations().transform { locations ->
         val states = locations.map { location ->
-            MapAnnotation.fromUser(location.user, location)
+            MapAnnotation.getAnnotationWithBaseStyleFromUser(location.user, location)
         }
 
         emit(states)
@@ -103,7 +103,7 @@ class MapViewModel @Inject constructor(
             val annotations = layers.associateBy({ it.id }, { layer ->
                 val features = layerRepository.getStaticFeatures(layer.id)
                 val annotations = features.map { feature ->
-                    MapAnnotation.fromStaticFeature(feature, application)
+                    MapAnnotation.getAnnotationWithStyleFromStaticFeature(feature, application)
                 }
                 annotations
             })
@@ -142,7 +142,7 @@ class MapViewModel @Inject constructor(
     data class FeedState(val feed: Feed, val items: List<MapAnnotation<String>>)
     private fun toFeedItemState(feedWithItems: FeedWithItems): FeedState {
         val mapFeatures = feedWithItems.items.mapNotNull {
-            MapAnnotation.fromFeedItem(ItemWithFeed(feedWithItems.feed, it), application)
+            MapAnnotation.getAnnotationWithBaseStyleFromFeedItem(ItemWithFeed(feedWithItems.feed, it), application)
         }
         return FeedState(feedWithItems.feed, mapFeatures)
     }
@@ -194,7 +194,7 @@ class MapViewModel @Inject constructor(
         }
 
         val event = eventLocalDataSource.currentEvent
-        val iconFeature = MapAnnotation.fromObservation(
+        val iconFeature = MapAnnotation.getAnnotationWithStyleFromObservation(
             event = event,
             observation = observation,
             formDefinition = formDefinition,

mage/src/main/java/mil/nga/giat/mage/map/annotation/AnnotationStyle.kt

@@ -0,0 +1,6 @@
+package mil.nga.giat.mage.map.annotation
+
+import android.net.Uri
+
+//for Point observation image icons
+open class BaseObservationStyle(val uri: Uri? = null)