Skip to content

Task/mt 7354 crash incase change map provider gg map box and camera is moving #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kaytran2992 merged 2 commits into from
Mar 7, 2025
Merged

Task/mt 7354 crash incase change map provider gg map box and camera is moving #108

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebf8ec2
Not change map provider while camera isMoving to avoid crashing
kaytran2992 Mar 7, 2025
63fbf6e
Update feedback with check null for cameraState
kaytran2992 Mar 7, 2025
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
44 changes: 29 additions & 15 deletions lib-compose/src/main/java/com/what3words/components/compose/maps/W3WMapManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import com.what3words.components.compose.maps.state.camera.W3WGoogleCameraState
import com.what3words.components.compose.maps.state.camera.W3WMapboxCameraState
import com.what3words.components.compose.maps.utils.angleOfPoints
import com.what3words.core.datasource.text.W3WTextDataSource
import com.what3words.core.types.common.W3WError
import com.what3words.core.types.common.W3WResult
import com.what3words.core.types.domain.W3WAddress
import com.what3words.core.types.domain.W3WSuggestion
Expand Down Expand Up @@ -265,24 +266,37 @@ class W3WMapManager(
* bearing, and tilt.
*
* @param mapProvider The new [MapProvider] to be set (either [MapProvider.MAPBOX] or [MapProvider.GOOGLE_MAP]).
* @return A [W3WResult] containing either the successfully set [MapProvider] or a failure with an error message.
*
*/
fun setMapProvider(mapProvider: MapProvider) {
if (this.mapProvider != mapProvider) {
this.mapProvider = mapProvider

_mapState.update { currentState ->
currentState.copy(
cameraState = when (mapProvider) {
MapProvider.MAPBOX -> createMapboxCameraState(
_mapState.value.cameraState
)
fun setMapProvider(mapProvider: MapProvider): W3WResult<MapProvider> {
return if (this.mapProvider != mapProvider) {
val cameraState = _mapState.value.cameraState
if(cameraState == null) {
W3WResult.Failure(W3WError("Map provider change failed because the camera state is null"))
} else if(!cameraState.isCameraMoving) {
this.mapProvider = mapProvider

_mapState.update { currentState ->
currentState.copy(
cameraState = when (mapProvider) {
MapProvider.MAPBOX -> createMapboxCameraState(
_mapState.value.cameraState
)

MapProvider.GOOGLE_MAP -> createGoogleCameraState(
_mapState.value.cameraState
)
}
)
}

MapProvider.GOOGLE_MAP -> createGoogleCameraState(
_mapState.value.cameraState
)
}
)
W3WResult.Success(mapProvider)
} else {
W3WResult.Failure(W3WError("Map provider change failed because the camera is moving"))
}
} else {
W3WResult.Failure(W3WError("Map provider not changed"))
}
}

Expand Down
Loading