Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Cherry pick 7242 into iOS 3.4.0 release branch #7408

Merged
merged 1 commit into from
Dec 13, 2016

Conversation

boundsj
Copy link
Contributor

@boundsj boundsj commented Dec 13, 2016

No description provided.

Style::relayout uses source.baseImpl->loaded, a flag which is updated by Style::recalculate. So recalculate first, then relayout.
@boundsj boundsj added the ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold label Dec 13, 2016
@mention-bot
Copy link

@boundsj, thanks for your PR! By analyzing this pull request, we identified @jfirebaugh, @1ec5 and @incanus to be potential reviewers.

@boundsj boundsj self-assigned this Dec 13, 2016
@boundsj boundsj added bug iOS Mapbox Maps SDK for iOS runtime styling and removed ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold labels Dec 13, 2016
@boundsj boundsj added this to the ios-v3.4.0 milestone Dec 13, 2016
@boundsj
Copy link
Contributor Author

boundsj commented Dec 13, 2016

Noting that this cherry picks:

  • [core] Swap order of Style::recalculate and Style::relayout 904f1a3

but not:

  • [tests] Implement "wait" command with Map#render 768837a
  • [core] Ensure a non-zero source tile cache size 2d32321

from: #7242

I don't think 2d32321 is critical for iOS (Darwin) so we can just pick it up in the eventual merge back to master.

cc @1ec5 @jfirebaugh fyi @ivovandongen

@boundsj boundsj merged commit b221b6c into release-ios-v3.4.0 Dec 13, 2016
@boundsj boundsj deleted the boundsj-cherry-pick-7242 branch December 13, 2016 20:56
@1ec5
Copy link
Contributor

1ec5 commented Dec 14, 2016

I don't think 2d32321 is critical for iOS (Darwin) so we can just pick it up in the eventual merge back to master.

FYI, I think that change would affect small map views in both iOS and macOS. (The calculation appears to depend on the viewport size, not the screen size.)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug iOS Mapbox Maps SDK for iOS runtime styling
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants