Skip to content

refactor(iOS): ios lateinit #3157

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
mfazekas merged 2 commits into from
Nov 2, 2023
Merged

refactor(iOS): ios lateinit #3157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b4c19d
fix: clear changes when applying it
mfazekas Oct 27, 2023
e4f5ada
refactor(ios): late init MapView
mfazekas Nov 1, 2023
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
2 changes: 1 addition & 1 deletion android/src/main/java/com/rnmapbox/rnmbx/utils/PropertyChanges.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ class PropertyChanges<T : Any> {

fun apply(target: T) {
for (entry in changes.entries.iterator()) {
print("key => ${entry.key}")
entry.value.apply(target)
}
changes.clear()
}
}
8 changes: 4 additions & 4 deletions ios/RNMBX/RNMBXCamera.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ struct CameraUpdateItem {
}
switch mode {
case .flight:
map.camera.fly(to: camera, duration: duration)
map.mapView.camera.fly(to: camera, duration: duration)
case .ease:
map.camera.ease(to: camera, duration: duration ?? 0, curve: .easeInOut, completion: nil)
map.mapView.camera.ease(to: camera, duration: duration ?? 0, curve: .easeInOut, completion: nil)
case .linear:
map.camera.ease(to: camera, duration: duration ?? 0, curve: .linear, completion: nil)
map.mapView.camera.ease(to: camera, duration: duration ?? 0, curve: .linear, completion: nil)
default:
map.mapboxMap.setCamera(to: camera)
}
Expand Down Expand Up @@ -524,7 +524,7 @@ open class RNMBXCamera : RNMBXMapComponentBase {
return false
}

map.viewport.removeStatusObserver(self)
map.mapView.viewport.removeStatusObserver(self)
return super.removeFromMap(map, reason:reason)
}
}
Expand Down
Loading