Encapsulate MapboxCoreMaps protocol conformances #265
Merged
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 no longer conforms to MapClient or MBMMetalViewProvider. Instead, it owns and acts as the delegate for a DelegatingMapClient which implements the protocols instead. This allows the required methods to be internal instead of public. - Snapshotter no longer conforms to Observer - ObserverConcrete was refactored into DelegatingObserver and is now used by both BaseMapView and Snapshotter. Misc ACL Changes - BaseMapView setters for __map, metalView, resourceOptions, mapInitOptionsDataSource, and cameraView are now private - BaseMapView properties needsDisplayRefresh, dormant, displayCallback, and styleURI__ are now private - Snapshotter.eventHandlers is now private Other Refactoring - The metal support checks in BaseMapView.commonInit were factored out into a separate helper method to avoid the need for a local variable - In awakeFromNib(), the default styleURI is accessed via StyleURI rather than via a string literal. - PreferredFPS moved to separate file
macdrevx
added
the
breaking change ⚠️
Comment on lines
+392
to
+400
| extension BaseMapView: DelegatingObserverDelegate { | ||
| /// Notify correct handler | ||
| internal func notify(for event: MapboxCoreMaps.Event) { | ||
| let handlers = eventHandlers[event.type] | ||
| handlers?.forEach { (handler) in | ||
| handler(event) | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Can we move this to a new file called BaseMapView+DelefatingObserverDelegate
There was a problem hiding this comment.
We could, but it seems unnecessary to me. What problem would we be solving by moving it?
There was a problem hiding this comment.
I don't think it solves a problem, but if these extensions have the potential to grow in the future, it would be nice to have a bloated 500 + line map view file.
There was a problem hiding this comment.
If BaseMapView gets that big, the solution is probably to refactor it into multiple components rather than breaking it up into multiple files. I'd be in favor of leaving this as-is for now.
Comment on lines
+402
to
+432
| extension BaseMapView: DelegatingMapClientDelegate { | ||
| internal func scheduleRepaint() { | ||
| needsDisplayRefresh = true | ||
| } | ||
|
|
||
| internal func scheduleTask(forTask task: @escaping Task) { | ||
| fatalError("scheduleTask is not supported") | ||
| } | ||
|
|
||
| internal func getMetalView(for metalDevice: MTLDevice?) -> MTKView? { | ||
| let metalView = MTKView(frame: frame, device: metalDevice) | ||
| displayCallback = { | ||
| metalView.setNeedsDisplay() | ||
| } | ||
|
|
||
| metalView.autoresizingMask = [.flexibleHeight, .flexibleWidth] | ||
| metalView.autoResizeDrawable = true | ||
| metalView.contentScaleFactor = UIScreen.main.scale | ||
| metalView.contentMode = .center | ||
| metalView.isOpaque = isOpaque | ||
| metalView.layer.isOpaque = isOpaque | ||
| metalView.isPaused = true | ||
| metalView.enableSetNeedsDisplay = true | ||
| metalView.presentsWithTransaction = true | ||
|
|
||
| insertSubview(metalView, at: 0) | ||
| self.metalView = metalView | ||
|
|
||
| return metalView | ||
| } | ||
| } |
There was a problem hiding this comment.
similar to above, Can we move this to a new file called BaseMapView+DelefatingMapClientDelegate
neelmistry94
approved these changes
Apr 15, 2021
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
Implement Core interfaces via delegation
Instead, it owns and acts as the delegate for a DelegatingMapClient
which implements the protocols instead. This allows the required
methods to be internal instead of public.
used by both BaseMapView and Snapshotter.
Misc ACL Changes
mapInitOptionsDataSource, and cameraView are now private
and styleURI__ are now private
Other Refactoring
into a separate helper method to avoid the need for a local variable
rather than via a string literal.