Introduce MapboxMap #280
Merged
Introduce MapboxMap #280
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- BaseMapView's `__map` property has been removed - BaseMapView has a new `mapboxMap` property - Conversion initializers between Size and CGSize have been added - MapboxMap is introduced. It creates and owns the Map - MapboxMap exposes internal conveniences for `size`, `cameraOptions`, and `updateCamera(with:)`
macdrevx
added
skip changelog
macdrevx
commented
Apr 20, 2021
| @@ -7,10 +7,18 @@ import Turf | |||
|
|
|||
| internal typealias PendingAnimationCompletion = (completion: AnimationCompletion, animatingPosition: UIViewAnimatingPosition) | |||
|
|
|||
| // swiftlint:disable:next type_body_length | |||
There was a problem hiding this comment.
This will be removed in a follow-on PR that migrates more functionality from BaseMapView into MapboxMap
macdrevx
commented
Apr 20, 2021
| return __map.getCameraOptions(forPadding: nil) | ||
| } | ||
|
|
||
| internal func updateCamera(with cameraOptions: CameraOptions) { |
There was a problem hiding this comment.
Not unit tested because __map.setCameraFor(_:) may clamp the output.
macdrevx
commented
Apr 20, 2021
| crossSourceCollisions: NSNumber(value: mapInitOptions.mapOptions.crossSourceCollisions), | ||
| size: mapInitOptions.mapOptions.size.map(Size.init), | ||
| pixelRatio: mapInitOptions.mapOptions.pixelRatio, | ||
| glyphsRasterizationOptions: nil) // __map.getOptions() always returns nil for glyphsRasterizationOptions |
There was a problem hiding this comment.
__map.getOptions() always returns nil for glyphsRasterizationOptions
Is this expected behavior @alexshalamov?
I was hoping that the input map options when creating the Map would be equal to the output when getting the options from the Map. It would certainly clean up this test :)
macdrevx
commented
Apr 20, 2021
Comment on lines
-89
to
+118
| public static func == (lhs: CameraOptions, rhs: CameraOptions) -> Bool { | ||
| return lhs.center == rhs.center && | ||
| lhs.padding == rhs.padding && | ||
| lhs.anchor == rhs.anchor && | ||
| lhs.zoom == rhs.zoom && | ||
| lhs.bearing == rhs.bearing && | ||
| lhs.pitch == rhs.pitch | ||
|
|
||
| /// :nodoc: | ||
| public override func isEqual(_ object: Any?) -> Bool { | ||
| guard let other = object as? CameraOptions else { | ||
| return false | ||
| } | ||
| return other.isMember(of: CameraOptions.self) | ||
| && center == other.center | ||
| && padding == other.padding | ||
| && anchor == other.anchor | ||
| && zoom == other.zoom | ||
| && bearing == other.bearing | ||
| && pitch == other.pitch | ||
| } | ||
|
|
||
| /// :nodoc: | ||
| public override var hash: Int { | ||
| var hasher = Hasher() | ||
| hasher.combine(center?.latitude) | ||
| hasher.combine(center?.longitude) | ||
| hasher.combine(padding?.top) | ||
| hasher.combine(padding?.left) | ||
| hasher.combine(padding?.bottom) | ||
| hasher.combine(padding?.right) | ||
| hasher.combine(anchor?.x) | ||
| hasher.combine(anchor?.y) | ||
| hasher.combine(zoom) | ||
| hasher.combine(bearing) | ||
| hasher.combine(pitch) | ||
| return hasher.finalize() |
There was a problem hiding this comment.
I didn't test these directly yet. I think we'll be able to delete all of this if we are successful with our plan to use structs for types like CameraOptions
julianrex
approved these changes
Apr 21, 2021
macdrevx
force-pushed
the
ah/mapbox-map-2
branch
from
d1f5536
to
d2435f1
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request checklist:
Summary of changes
Breaking
__mapproperty has been moved tomapboxMap.__mapNon-breaking
mapboxMappropertySizeandCGSizehave been addedMapboxMapis introduced. It creates and owns theMapMapboxMapexposes internal conveniences forsize,cameraOptions,and
updateCamera(with:)