Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,47 @@ class GoogleMapViewTests {
assertThat(cameraPositionState.position.target).isEqualTo(startingPosition)
}

@Test
fun testInitialCameraPositionIsAppliedToGoogleMapOptions() {
var capturedOptions: GoogleMapOptions? = null
composeTestRule.setContent {
GoogleMap(
cameraPositionState = cameraPositionState,
mapViewFactory = { context, options ->
capturedOptions = options
MapView(context, options)
}
)
}

assertThat(capturedOptions?.camera?.target).isEqualTo(startingPosition)
assertThat(capturedOptions?.camera?.zoom).isEqualTo(startingZoom)
}

@Test
fun testInitialCameraPositionDoesNotOverrideGoogleMapOptionsFactory() {
val configuredPosition = LatLng(7.89, 10.11)
val configuredZoom = 12f
var capturedOptions: GoogleMapOptions? = null
composeTestRule.setContent {
GoogleMap(
cameraPositionState = cameraPositionState,
googleMapOptionsFactory = {
GoogleMapOptions().camera(
CameraPosition.fromLatLngZoom(configuredPosition, configuredZoom)
)
},
mapViewFactory = { context, options ->
capturedOptions = options
MapView(context, options)
}
)
}

assertThat(capturedOptions?.camera?.target).isEqualTo(configuredPosition)
assertThat(capturedOptions?.camera?.zoom).isEqualTo(configuredZoom)
}

@Test
fun testDefaultColorSchemeIsFollowSystem() {
var capturedOptions: GoogleMapOptions? = null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,12 @@ public fun GoogleMap(
modifier = if (focusable) modifier.focusable() else modifier,
factory = { context ->
val options = googleMapOptionsFactory().let { opts ->
// If the initial camera position is not explicitly set in
// googleMapOptionsFactory, apply CameraPositionState.position before MapView
// creation to avoid displaying the default camera while the map initializes.
if (opts.camera == null) {
opts.camera(cameraPositionState.position)
}
// If mapColorScheme is passed to GoogleMap() and has not been explicitly set
// in googleMapOptionsFactory (where 0 / MapColorScheme.LIGHT is the Java int default),
// apply it to GoogleMapOptions so MapView is created with it.
Expand Down
Loading