Correct visibility of Tour Intro marker (AIC-584)

map/src/main/kotlin/edu/artic/map/MapFragment.kt

@@ -196,6 +196,24 @@ class MapFragment : BaseViewModelFragment<MapViewModel>() {
              * locks us into just that area
              */
             setLatLngBoundsForCameraTarget(mapDisplayBounds)
+
+            /**
+             * Marker.showInfoWindow() method is used (see [MapViewModel.retrieveMarkerByObjectId]
+             * to bring the selected marker to front (markers sometime overlap).
+             * We are using this method just to bring the targeted marker to front without
+             * displaying info window.
+             *
+             * Purpose of setting this infoWindowAdapter is for displaying an empty info window.
+             */
+            setInfoWindowAdapter(object : GoogleMap.InfoWindowAdapter {
+                override fun getInfoContents(p0: Marker?): View {
+                    return View(requireContext())
+                }
+
+                override fun getInfoWindow(p0: Marker?): View {
+                    return View(requireContext())
+                }
+            })
         }
     }
 
@@ -426,12 +444,16 @@ class MapFragment : BaseViewModelFragment<MapViewModel>() {
          */
         viewModel
                 .selectedTourStopMarkerId
-                .flatMap { viewModel.retrieveObjectById(it) }
+                .flatMap { viewModel.retrieveMarkerByObjectId(it) }
                 .filterValue()
                 .withLatestFrom(viewModel.currentMap.filterValue())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribeBy { (markerHolder, map) ->
-                    val (_, _, marker) = markerHolder
+                .subscribeBy { (marker, map) ->
+
+                    /**
+                     * showInfoWindow() is only used for bringing targeted marker to front.
+                     */
+                    marker.showInfoWindow()
                     val currentZoomLevel = map.cameraPosition.zoom
                     map.animateCamera(CameraUpdateFactory.newLatLngZoom(marker.position,
                             Math.max(ZOOM_INDIVIDUAL, currentZoomLevel)))

map/src/main/kotlin/edu/artic/map/MapMarkerConstructor.kt

@@ -36,7 +36,7 @@ class MapMarkerConstructor
     private val amenitiesMapItemRenderer = AmenitiesMapItemRenderer(articMapAnnotationDao)
     private val departmentsMapItemRenderer = DepartmentsMapItemRenderer(articMapAnnotationDao)
     private val galleriesMapItemRenderer = GalleriesMapItemRenderer(galleryDao)
-    private val tourIntroMapItemRenderer = TourIntroMapItemRenderer()
+    val tourIntroMapItemRenderer = TourIntroMapItemRenderer()
     private val lionMapItemRenderer = LionMapItemRenderer()
     val objectsMapItemRenderer = ObjectsMapItemRenderer(objectsDao)
 

map/src/main/kotlin/edu/artic/map/MapViewModel.kt

@@ -5,12 +5,14 @@ import com.fuzz.rx.*
 import com.fuzz.rx.Optional
 import com.google.android.gms.maps.GoogleMap
 import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.Marker
 import com.google.android.gms.maps.model.VisibleRegion
 import com.jakewharton.rxrelay2.PublishRelay
 import com.jakewharton.rxrelay2.Relay
 import edu.artic.analytics.AnalyticsAction
 import edu.artic.analytics.AnalyticsTracker
 import edu.artic.analytics.EventCategoryName
+import edu.artic.db.INTRO_TOUR_STOP_OBJECT_ID
 import edu.artic.db.daos.ArticMapAnnotationDao
 import edu.artic.db.daos.ArticMapFloorDao
 import edu.artic.db.daos.ArticObjectDao
@@ -22,8 +24,7 @@ import edu.artic.location.LocationService
 import edu.artic.location.isLocationInMuseum
 
 import edu.artic.map.helpers.toLatLng
-import edu.artic.map.rendering.MapItemModel
-import edu.artic.map.rendering.MarkerHolder
+import edu.artic.map.rendering.MapItemRenderer
 import edu.artic.map.tutorial.TutorialPreferencesManager
 import edu.artic.tours.manager.TourProgressManager
 import edu.artic.viewmodel.NavViewViewModel
@@ -575,12 +576,25 @@ class MapViewModel @Inject constructor(val mapMarkerConstructor: MapMarkerConstr
     }
 
     /**
-     * Retrieve an object from the [MapMarkerConstructor]
+     * Retrieve a Marker from the [MapMarkerConstructor]
      */
-    fun retrieveObjectById(nid: String): Observable<Optional<MarkerHolder<MapItemModel>>> {
-        return mapMarkerConstructor.objectsMapItemRenderer.getMarkerHolderById(nid)
+    fun retrieveMarkerByObjectId(nid: String): Observable<Optional<Marker>> {
+
+        val markerRenderer: MapItemRenderer<*> = if (nid == INTRO_TOUR_STOP_OBJECT_ID) {
+            mapMarkerConstructor.tourIntroMapItemRenderer
+        } else {
+            mapMarkerConstructor.objectsMapItemRenderer
+        }
+
+        return markerRenderer
+                .getMarkerHolderById(nid)
+                .filterFlatMap({ it.value != null }, { it.value })
+                .map { data ->
+                    Optional(data.marker)
+                }
     }
 
+
     override fun onCleared() {
         super.onCleared()
         mapMarkerConstructor.cleanup()

map/src/main/kotlin/edu/artic/map/rendering/TourIntroMapItemRenderer.kt

@@ -5,6 +5,7 @@ import com.fuzz.rx.asFlowable
 import com.google.android.gms.maps.model.BitmapDescriptor
 import com.google.android.gms.maps.model.BitmapDescriptorFactory
 import com.google.android.gms.maps.model.LatLng
+import edu.artic.db.INTRO_TOUR_STOP_OBJECT_ID
 import edu.artic.db.debug
 import edu.artic.db.models.ArticTour
 import edu.artic.image.asRequestObservable
@@ -46,7 +47,7 @@ class TourIntroMapItemRenderer : MapItemRenderer<ArticTour>(useBitmapQueue = tru
 
     override fun getLocationFromItem(item: ArticTour): LatLng = item.toLatLng()
 
-    override fun getIdFromItem(item: ArticTour): String = item.nid
+    override fun getIdFromItem(item: ArticTour): String = INTRO_TOUR_STOP_OBJECT_ID
 
     override fun getMarkerAlpha(floor: Int, mapDisplayMode: MapDisplayMode, item: ArticTour): Float {
         // on tour, set the alpha depending on current floor.