fix: remove MultiGeometry features from the map in removeFeature

data/src/main/java/com/google/maps/android/data/renderer/mapview/MapViewRenderer.kt

@@ -29,6 +29,7 @@ import com.google.maps.android.data.renderer.IconProvider
 import com.google.maps.android.data.renderer.model.DataLayer
 import com.google.maps.android.data.renderer.model.DataScene
 import com.google.maps.android.data.renderer.model.Feature
+import com.google.maps.android.data.renderer.model.Geometry
 import com.google.maps.android.data.renderer.model.GroundOverlay
 import com.google.maps.android.data.renderer.model.GroundOverlayStyle
 import com.google.maps.android.data.renderer.model.LineString
@@ -109,9 +110,25 @@ class MapViewRenderer(
 
     override fun addFeature(feature: Feature) {
         val mapObjects = mutableListOf<Any>()
-        when (feature.geometry) {
+        addGeometry(feature.geometry, feature, mapObjects)
+        if (mapObjects.isNotEmpty()) {
+            renderedFeatures[feature] = mapObjects
+        }
+    }
+
+    /**
+     * Renders a single [geometry] (recursing into [MultiGeometry] members) with [feature]'s style and
+     * properties, accumulating every created map object into [mapObjects] so nested geometries stay
+     * associated with the original [feature] and can be removed later via [removeFeature].
+     */
+    private fun addGeometry(
+        geometry: Geometry,
+        feature: Feature,
+        mapObjects: MutableList<Any>,
+    ) {
+        when (geometry) {
             is PointGeometry -> {
-                val point = feature.geometry.point
+                val point = geometry.point
                 val style = feature.style as? PointStyle
                 if (useAdvancedMarkers) {
                     val markerOptions = createAdvancedMarkerOptions(point, style, feature.properties)
@@ -159,31 +176,25 @@ class MapViewRenderer(
             }
 
             is LineString -> {
-                val lineString = feature.geometry
                 val style = feature.style as? LineStyle
-                val polylineOptions = createPolylineOptions(lineString, style)
+                val polylineOptions = createPolylineOptions(geometry, style)
                 mapObjects.add(map.addPolyline(polylineOptions))
             }
 
             is Polygon -> {
-                val polygon = feature.geometry
                 val style = feature.style as? PolygonStyle
-                val polygonOptions = createPolygonOptions(polygon, style)
+                val polygonOptions = createPolygonOptions(geometry, style)
                 mapObjects.add(map.addPolygon(polygonOptions))
             }
 
             is MultiGeometry -> {
-                feature.geometry.geometries.forEach { geometry ->
-                    val childFeature = feature.copy(geometry = geometry)
-                    addFeature(childFeature)
-                    renderedFeatures[childFeature]?.let { childObjects ->
-                        mapObjects.addAll(childObjects)
-                    }
-                }
+                // Recursively render each member into the same list so the rendered objects stay
+                // keyed by the original feature rather than by intermediate copies.
+                geometry.geometries.forEach { addGeometry(it, feature, mapObjects) }
             }
 
             is GroundOverlay -> {
-                val groundOverlay = feature.geometry
+                val groundOverlay = geometry
                 val style = feature.style as? GroundOverlayStyle
                 val options = createGroundOverlayOptions(groundOverlay, style)
 
@@ -226,9 +237,6 @@ class MapViewRenderer(
                 }
             }
         }
-        if (mapObjects.isNotEmpty()) {
-            renderedFeatures[feature] = mapObjects
-        }
     }
 
     override fun removeFeature(feature: Feature) {

data/src/test/java/com/google/maps/android/data/renderer/MapViewRendererTest.kt

@@ -21,8 +21,12 @@ import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.Marker
 import com.google.android.gms.maps.model.MarkerOptions
 import com.google.android.gms.maps.model.PolygonOptions
+import com.google.android.gms.maps.model.Polyline
+import com.google.android.gms.maps.model.PolylineOptions
 import com.google.maps.android.data.renderer.mapview.MapViewRenderer
 import com.google.maps.android.data.renderer.model.Feature
+import com.google.maps.android.data.renderer.model.LineString
+import com.google.maps.android.data.renderer.model.LineStyle
 import com.google.maps.android.data.renderer.model.MultiGeometry
 import com.google.maps.android.data.renderer.model.Point
 import com.google.maps.android.data.renderer.model.PointGeometry
@@ -35,11 +39,6 @@ import io.mockk.verify
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
-import com.google.android.gms.maps.model.Polyline
-import com.google.android.gms.maps.model.PolylineOptions
-import com.google.maps.android.data.renderer.model.LineString
-import com.google.maps.android.data.renderer.model.LineStyle
-
 /**
  * Unit tests for [MapViewRenderer] verifying correct translation of platform-agnostic
  * feature models to Google Maps SDK marker options.
@@ -153,6 +152,71 @@ class MapViewRendererTest {
         assertEquals("Be careful here!", capturedOptions.snippet)
     }
 
+    @Test
+fun testRemoveFeature_multiGeometry_removesAllRenderedObjects() {
+        // Given
+        val mockMap = mockk<GoogleMap>(relaxed = true)
+        val mockIconProvider = mockk<IconProvider>(relaxed = true)
+
+        val addedPolygons = mutableListOf<com.google.android.gms.maps.model.Polygon>()
+        every { mockMap.addPolygon(any()) } answers {
+            mockk<com.google.android.gms.maps.model.Polygon>(relaxed = true).also { addedPolygons.add(it) }
+        }
+
+        val renderer = MapViewRenderer(mockMap, mockIconProvider)
+        val feature =
+            Feature(
+                geometry =
+                    MultiGeometry(
+                        listOf(
+                            Polygon(listOf(Point(0.0, 0.0), Point(0.0, 1.0), Point(1.0, 1.0))),
+                            Polygon(listOf(Point(2.0, 2.0), Point(2.0, 3.0), Point(3.0, 3.0))),
+                        ),
+                    ),
+            )
+
+        // When
+        renderer.addFeature(feature)
+        renderer.removeFeature(feature)
+
+        // Then: both rendered polygons are removed via the original feature reference.
+        assertEquals(2, addedPolygons.size)
+        addedPolygons.forEach { polygon -> verify(exactly = 1) { polygon.remove() } }
+    }
+
+    @Test
+    fun testAddFeature_multiGeometry_addedTwice_doesNotLeakOnRemove() {
+        // Given
+        val mockMap = mockk<GoogleMap>(relaxed = true)
+        val mockIconProvider = mockk<IconProvider>(relaxed = true)
+
+        val addedPolylines = mutableListOf<com.google.android.gms.maps.model.Polyline>()
+        every { mockMap.addPolyline(any()) } answers {
+            mockk<com.google.android.gms.maps.model.Polyline>(relaxed = true).also { addedPolylines.add(it) }
+        }
+
+        val renderer = MapViewRenderer(mockMap, mockIconProvider)
+        val feature =
+            Feature(
+                geometry =
+                    MultiGeometry(
+                        listOf(
+                            LineString(listOf(Point(0.0, 0.0), Point(1.0, 1.0))),
+                        ),
+                    ),
+            )
+
+        // When: a hide/show cycle (remove + re-add) followed by a final remove.
+        renderer.addFeature(feature)
+        renderer.removeFeature(feature)
+        renderer.addFeature(feature)
+        renderer.removeFeature(feature)
+
+        // Then: every polyline ever added has been removed — nothing is left on the map.
+        assertEquals(2, addedPolylines.size)
+        addedPolylines.forEach { polyline -> verify(exactly = 1) { polyline.remove() } }
+    }
+
     @Test
     fun testAddFeatureMultiPolygon_appliesPolygonStyleToChildPolygons() {
         // Given