Skip to content

Commit 728c3ee

Browse files
committed
Move camera before setting camera restriction
1 parent 2c27fc0 commit 728c3ee

3 files changed

Lines changed: 31 additions & 31 deletions

File tree

snippets/CATALOG.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ This section maps high-level concepts (groups) to specific demonstration files a
5353
- *Description*: Restricts the camera to a specific altitude range and bounding box.
5454
- **Kotlin**
5555
- [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)
56-
- Tag: `maps_android_3d_camera_restriction_kt`
56+
- Tag: `maps_android_3d_camera_steady_kt`
5757
- **Java**
5858
- [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)
59-
- Tag: `maps_android_3d_camera_restriction_java`
59+
- Tag: `maps_android_3d_camera_steady_java`
6060

6161
### Map Initialization
6262
> 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
210210
- `setCenter`:
211211
- [MapActivity.kt:191](MapActivity.kt#L191) (Tag: `No Tag`)
212212
- [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`)
213-
- [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`)
213+
- [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`)
214214
- [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`)
215215
- [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`)
216216
- [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
289289

290290
### `CameraRestriction`
291291
- `setBounds`:
292-
- [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`)
292+
- [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`)
293293
- `setMaxAltitude`:
294-
- [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`)
294+
- [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`)
295295
- `setMaxHeading`: ❌ No coverage
296296
- `setMaxTilt`: ❌ No coverage
297297
- `setMinAltitude`:
298-
- [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`)
298+
- [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`)
299299
- `setMinHeading`: ❌ No coverage
300300
- `setMinTilt`: ❌ No coverage
301301
- `writeToParcel`: ❌ No coverage
@@ -446,7 +446,7 @@ This matrix ensures that every critical feature in the 3D Maps SDK is actively d
446446
- `setAltitude`:
447447
- [MapActivity.kt:194](MapActivity.kt#L194) (Tag: `No Tag`)
448448
- [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`)
449-
- [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`)
449+
- [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`)
450450
- [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`)
451451
- [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`)
452452
- [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
486486
- `setLatitude`:
487487
- [MapActivity.kt:192](MapActivity.kt#L192) (Tag: `No Tag`)
488488
- [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`)
489-
- [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`)
489+
- [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`)
490490
- [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`)
491491
- [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`)
492492
- [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
526526
- `setLongitude`:
527527
- [MapActivity.kt:193](MapActivity.kt#L193) (Tag: `No Tag`)
528528
- [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`)
529-
- [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`)
529+
- [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`)
530530
- [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`)
531531
- [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`)
532532
- [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
571571
- `getSouthWestLat`: ❌ No coverage
572572
- `getSouthWestLng`: ❌ No coverage
573573
- `setNorthEastLat`:
574-
- [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`)
574+
- [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`)
575575
- `setNorthEastLng`:
576-
- [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`)
576+
- [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`)
577577
- `setSouthWestLat`:
578-
- [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`)
578+
- [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`)
579579
- `setSouthWestLng`:
580-
- [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`)
580+
- [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`)
581581
- `writeToParcel`: ❌ No coverage
582582

583583
### `Map3DOptions`

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,15 @@ public void listenToMapSteadyState() {
172172
description = "Restricts the camera to a specific altitude range and bounding box."
173173
)
174174
public void setCameraRestrictions() {
175+
com.google.android.gms.maps3d.model.Camera camera = new com.google.android.gms.maps3d.model.Camera(
176+
new com.google.android.gms.maps3d.model.LatLngAltitude(40.748233, -73.985663, 1500.0), // center
177+
0.0, // heading
178+
45.0, // tilt
179+
0.0, // roll
180+
1000.0 // range
181+
);
182+
map.setCamera(camera);
183+
175184
// [START maps_android_3d_camera_restriction_java]
176185
LatLngBounds nycBounds = new LatLngBounds(
177186
40.856492, -73.802409, 40.685630, -74.050304
@@ -183,14 +192,5 @@ public void setCameraRestrictions() {
183192

184193
map.setCameraRestriction(restriction);
185194
// [END maps_android_3d_camera_restriction_java]
186-
187-
com.google.android.gms.maps3d.model.Camera camera = new com.google.android.gms.maps3d.model.Camera(
188-
new com.google.android.gms.maps3d.model.LatLngAltitude(40.748233, -73.985663, 1500.0), // center
189-
0.0, // heading
190-
45.0, // tilt
191-
0.0, // roll
192-
1000.0 // range
193-
);
194-
map.setCamera(camera);
195195
}
196196
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,15 @@ class CameraControlSnippets(
222222
description = "Restricts the camera to a specific altitude range and bounding box."
223223
)
224224
fun setCameraRestrictions() {
225+
// Move the camera inside the restricted bounds so we focus on NYC
226+
map.setCamera(camera {
227+
center = latLngAltitude {
228+
latitude = 40.748233
229+
longitude = -73.985663
230+
altitude = 1500.0
231+
}
232+
})
233+
225234
// [START maps_android_3d_camera_restriction_kt]
226235
val nycBounds = latLngBounds {
227236
northEastLat = 40.856492
@@ -238,14 +247,5 @@ class CameraControlSnippets(
238247

239248
map.setCameraRestriction(restriction)
240249
// [END maps_android_3d_camera_restriction_kt]
241-
242-
// Move the camera inside the restricted bounds so we focus on NYC
243-
map.setCamera(camera {
244-
center = latLngAltitude {
245-
latitude = 40.748233
246-
longitude = -73.985663
247-
altitude = 1500.0
248-
}
249-
})
250250
}
251251
}

0 commit comments

Comments
 (0)