Bring back bounds layer and simplify code (#2912)

* Bring back bounds layer and simplify code

* Fix rsync install package failure

Author: jush

app/src/main/java/com/mapbox/maps/testapp/examples/camera/RestrictBoundsActivity.kt

@@ -16,9 +16,13 @@ import com.mapbox.maps.CameraBoundsOptions
 import com.mapbox.maps.CoordinateBounds
 import com.mapbox.maps.MapboxMap
 import com.mapbox.maps.Style
+import com.mapbox.maps.extension.style.layers.generated.FillLayer
+import com.mapbox.maps.extension.style.layers.generated.fillLayer
+import com.mapbox.maps.extension.style.layers.getLayerAs
+import com.mapbox.maps.extension.style.layers.properties.generated.Visibility
 import com.mapbox.maps.extension.style.sources.generated.GeoJsonSource
 import com.mapbox.maps.extension.style.sources.generated.geoJsonSource
-import com.mapbox.maps.extension.style.sources.getSource
+import com.mapbox.maps.extension.style.sources.getSourceAs
 import com.mapbox.maps.extension.style.style
 import com.mapbox.maps.testapp.R
 import com.mapbox.maps.testapp.databinding.ActivityRestrictBoundsBinding
@@ -41,6 +45,12 @@ class RestrictBoundsActivity : AppCompatActivity() {
         +geoJsonSource(BOUNDS_ID) {
           featureCollection(FeatureCollection.fromFeatures(listOf()))
         }
+        +fillLayer(BOUNDS_ID, BOUNDS_ID) {
+          fillColor(Color.RED)
+          fillOpacity(0.15)
+          visibility(Visibility.NONE)
+          slot("bottom")
+        }
       }
     ) { setupBounds(SAN_FRANCISCO_BOUND) }
     showCrosshair()
@@ -69,39 +79,47 @@ class RestrictBoundsActivity : AppCompatActivity() {
         setupBounds(INFINITE_BOUNDS)
         true
       }
+      R.id.menu_action_toggle_bounds -> {
+        toggleShowBounds()
+        true
+      }
       else -> {
         super.onOptionsItemSelected(item)
       }
     }
   }
 
+  private fun toggleShowBounds() {
+    mapboxMap.getStyle {
+      val boundsFillLayer = it.getLayerAs<FillLayer>(BOUNDS_ID)!!
+      val visibility: Visibility = boundsFillLayer.visibility!!
+      when (visibility) {
+        Visibility.NONE -> boundsFillLayer.visibility(Visibility.VISIBLE)
+        Visibility.VISIBLE -> boundsFillLayer.visibility(Visibility.NONE)
+      }
+    }
+  }
+
   private fun setupBounds(bounds: CameraBoundsOptions) {
     mapboxMap.getStyle { style ->
-      mapboxMap.setBounds(bounds)
-      showBoundsArea(bounds, style)
+      setupBoundsArea(bounds, style)
     }
   }
 
-  private fun showBoundsArea(boundsOptions: CameraBoundsOptions, style: Style) {
-    val source = style.getSource(BOUNDS_ID) as GeoJsonSource
-    val bounds = boundsOptions.bounds
-    val list = mutableListOf<List<Point>>()
-    bounds?.let {
-      if (!it.infiniteBounds) {
-        val northEast = it.northeast
-        val southWest = it.southwest
-        val northWest = Point.fromLngLat(southWest.longitude(), northEast.latitude())
-        val southEast = Point.fromLngLat(northEast.longitude(), southWest.latitude())
-        list.add(
-          mutableListOf(northEast, southEast, southWest, northWest, northEast)
-        )
-      }
-    }
-    if (list.isNotEmpty()) {
-      source.geometry(
-        Polygon.fromLngLats(
-          list
-        )
+  private fun setupBoundsArea(boundsOptions: CameraBoundsOptions, style: Style) {
+    mapboxMap.setBounds(boundsOptions)
+    // In this example we always have bounds
+    val bounds = boundsOptions.bounds!!
+    if (!bounds.infiniteBounds) {
+      val northEast = bounds.northeast
+      val southWest = bounds.southwest
+      val northWest = Point.fromLngLat(southWest.longitude(), northEast.latitude())
+      val southEast = Point.fromLngLat(northEast.longitude(), southWest.latitude())
+      val boundsBox = listOf(northEast, southEast, southWest, northWest, northEast)
+      // Update the source with the new bounds
+      style.getSourceAs<GeoJsonSource>(BOUNDS_ID)!!.geometry(
+        // We only want one polygon: the box around the bounds
+        Polygon.fromLngLats(listOf(boundsBox))
       )
     }
   }

app/src/main/res/menu/menu_bounds.xml

@@ -17,4 +17,8 @@
         android:id="@+id/menu_action_reset"
         android:title="@string/restrict_reset"
         app:showAsAction="never"/>
+    <item
+        android:id="@+id/menu_action_toggle_bounds"
+        android:title="@string/toggle_show_bounds"
+        app:showAsAction="never"/>
 </menu>

app/src/main/res/values/strings.xml

@@ -47,6 +47,7 @@
     <string name="restrict_almost_worldview">Restrict almost worldview</string>
     <string name="restrict_across_idl">Restrict across IDL</string>
     <string name="restrict_reset">Reset bounds</string>
+    <string name="toggle_show_bounds">Toggle show bounds</string>
 
     <!--Space station toast-->
     <string name="space_station_toast">Zoom in closely on the space station\nto see it moving across the map</string>