Move camera before setting camera restriction

Author: dkhawk

snippets/CATALOG.md

@@ -53,10 +53,10 @@ This section maps high-level concepts (groups) to specific demonstration files a
   - *Description*: Restricts the camera to a specific altitude range and bounding box.
   - **Kotlin**
     - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:220](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L220)
-    - Tag: `maps_android_3d_camera_restriction_kt`
+    - Tag: `maps_android_3d_camera_steady_kt`
   - **Java**
     - [java-app/src/main/java/com/example/snippets/java/snippets/CameraControlSnippets.java:170](java-app/src/main/java/com/example/snippets/java/snippets/CameraControlSnippets.java#L170)
-    - Tag: `maps_android_3d_camera_restriction_java`
+    - Tag: `maps_android_3d_camera_steady_java`
 
 ### Map Initialization
 > Snippets demonstrating map lifecycle, listeners and readiness states.
@@ -210,7 +210,7 @@ This matrix ensures that every critical feature in the 3D Maps SDK is actively d
 - `setCenter`:
   - [MapActivity.kt:191](MapActivity.kt#L191) (Tag: `No Tag`)
   - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:130](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L130) (Tag: `maps_android_3d_camera_stop_kt`)
-  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:244](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L244) (Tag: `No Tag`)
+  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:227](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L227) (Tag: `No Tag`)
   - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:54](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L54) (Tag: `maps_android_3d_camera_fly_to_kt`)
   - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:86](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L86) (Tag: `maps_android_3d_camera_fly_around_kt`)
   - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/MapInitSnippets.kt:61](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/MapInitSnippets.kt#L61) (Tag: `maps_android_3d_init_basic_kt`)
@@ -289,13 +289,13 @@ This matrix ensures that every critical feature in the 3D Maps SDK is actively d
 
 ### `CameraRestriction`
 - `setBounds`:
-  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:236](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L236) (Tag: `maps_android_3d_camera_restriction_kt`)
+  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:245](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L245) (Tag: `maps_android_3d_camera_restriction_kt`)
 - `setMaxAltitude`:
-  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:235](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L235) (Tag: `maps_android_3d_camera_restriction_kt`)
+  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:244](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L244) (Tag: `maps_android_3d_camera_restriction_kt`)
 - `setMaxHeading`: ❌ No coverage
 - `setMaxTilt`: ❌ No coverage
 - `setMinAltitude`:
-  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:234](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L234) (Tag: `maps_android_3d_camera_restriction_kt`)
+  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:243](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L243) (Tag: `maps_android_3d_camera_restriction_kt`)
 - `setMinHeading`: ❌ No coverage
 - `setMinTilt`: ❌ No coverage
 - `writeToParcel`: ❌ No coverage
@@ -446,7 +446,7 @@ This matrix ensures that every critical feature in the 3D Maps SDK is actively d
 - `setAltitude`:
   - [MapActivity.kt:194](MapActivity.kt#L194) (Tag: `No Tag`)
   - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:133](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L133) (Tag: `maps_android_3d_camera_stop_kt`)
-  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:247](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L247) (Tag: `No Tag`)
+  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:230](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L230) (Tag: `No Tag`)
   - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:57](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L57) (Tag: `maps_android_3d_camera_fly_to_kt`)
   - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:89](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L89) (Tag: `maps_android_3d_camera_fly_around_kt`)
   - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/MapInitSnippets.kt:64](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/MapInitSnippets.kt#L64) (Tag: `maps_android_3d_init_basic_kt`)
@@ -486,7 +486,7 @@ This matrix ensures that every critical feature in the 3D Maps SDK is actively d
 - `setLatitude`:
   - [MapActivity.kt:192](MapActivity.kt#L192) (Tag: `No Tag`)
   - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:131](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L131) (Tag: `maps_android_3d_camera_stop_kt`)
-  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:245](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L245) (Tag: `No Tag`)
+  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:228](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L228) (Tag: `No Tag`)
   - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:55](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L55) (Tag: `maps_android_3d_camera_fly_to_kt`)
   - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:87](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L87) (Tag: `maps_android_3d_camera_fly_around_kt`)
   - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/MapInitSnippets.kt:62](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/MapInitSnippets.kt#L62) (Tag: `maps_android_3d_init_basic_kt`)
@@ -526,7 +526,7 @@ This matrix ensures that every critical feature in the 3D Maps SDK is actively d
 - `setLongitude`:
   - [MapActivity.kt:193](MapActivity.kt#L193) (Tag: `No Tag`)
   - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:132](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L132) (Tag: `maps_android_3d_camera_stop_kt`)
-  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:246](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L246) (Tag: `No Tag`)
+  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:229](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L229) (Tag: `No Tag`)
   - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:56](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L56) (Tag: `maps_android_3d_camera_fly_to_kt`)
   - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:88](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L88) (Tag: `maps_android_3d_camera_fly_around_kt`)
   - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/MapInitSnippets.kt:63](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/MapInitSnippets.kt#L63) (Tag: `maps_android_3d_init_basic_kt`)
@@ -571,13 +571,13 @@ This matrix ensures that every critical feature in the 3D Maps SDK is actively d
 - `getSouthWestLat`: ❌ No coverage
 - `getSouthWestLng`: ❌ No coverage
 - `setNorthEastLat`:
-  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:227](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L227) (Tag: `maps_android_3d_camera_restriction_kt`)
+  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:236](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L236) (Tag: `maps_android_3d_camera_restriction_kt`)
 - `setNorthEastLng`:
-  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:228](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L228) (Tag: `maps_android_3d_camera_restriction_kt`)
+  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:237](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L237) (Tag: `maps_android_3d_camera_restriction_kt`)
 - `setSouthWestLat`:
-  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:229](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L229) (Tag: `maps_android_3d_camera_restriction_kt`)
+  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:238](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L238) (Tag: `maps_android_3d_camera_restriction_kt`)
 - `setSouthWestLng`:
-  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:230](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L230) (Tag: `maps_android_3d_camera_restriction_kt`)
+  - [kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt:239](kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt#L239) (Tag: `maps_android_3d_camera_restriction_kt`)
 - `writeToParcel`: ❌ No coverage
 
 ### `Map3DOptions`

snippets/java-app/src/main/java/com/example/snippets/java/snippets/CameraControlSnippets.java

@@ -172,6 +172,15 @@ public void listenToMapSteadyState() {
         description = "Restricts the camera to a specific altitude range and bounding box."
     )
     public void setCameraRestrictions() {
+        com.google.android.gms.maps3d.model.Camera camera = new com.google.android.gms.maps3d.model.Camera(
+             new com.google.android.gms.maps3d.model.LatLngAltitude(40.748233, -73.985663, 1500.0), // center
+             0.0, // heading
+             45.0, // tilt
+             0.0, // roll
+             1000.0 // range
+        );
+        map.setCamera(camera);
+
         // [START maps_android_3d_camera_restriction_java]
         LatLngBounds nycBounds = new LatLngBounds(
             40.856492, -73.802409, 40.685630, -74.050304
@@ -183,14 +192,5 @@ public void setCameraRestrictions() {
 
         map.setCameraRestriction(restriction);
         // [END maps_android_3d_camera_restriction_java]
-
-        com.google.android.gms.maps3d.model.Camera camera = new com.google.android.gms.maps3d.model.Camera(
-             new com.google.android.gms.maps3d.model.LatLngAltitude(40.748233, -73.985663, 1500.0), // center
-             0.0, // heading
-             45.0, // tilt
-             0.0, // roll
-             1000.0 // range
-        );
-        map.setCamera(camera);
     }
 }

snippets/kotlin-app/src/main/java/com/example/snippets/kotlin/snippets/CameraControlSnippets.kt

@@ -222,6 +222,15 @@ class CameraControlSnippets(
         description = "Restricts the camera to a specific altitude range and bounding box."
     )
     fun setCameraRestrictions() {
+        // Move the camera inside the restricted bounds so we focus on NYC
+        map.setCamera(camera {
+            center = latLngAltitude {
+                latitude = 40.748233
+                longitude = -73.985663
+                altitude = 1500.0
+            }
+        })
+
         // [START maps_android_3d_camera_restriction_kt]
         val nycBounds = latLngBounds {
             northEastLat = 40.856492
@@ -238,14 +247,5 @@ class CameraControlSnippets(
 
         map.setCameraRestriction(restriction)
         // [END maps_android_3d_camera_restriction_kt]
-
-        // Move the camera inside the restricted bounds so we focus on NYC
-        map.setCamera(camera {
-            center = latLngAltitude {
-                latitude = 40.748233
-                longitude = -73.985663
-                altitude = 1500.0
-            }
-        })
     }
 }