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

Merge iOS SDK 3.3.0 release branch into master (after 3.3.1) #5729

Merged
merged 14 commits into from
Jul 19, 2016
Merged

Merge iOS SDK 3.3.0 release branch into master (after 3.3.1) #5729

merged 14 commits into from
Jul 19, 2016

Conversation

1ec5
Copy link
Contributor

@1ec5 1ec5 commented Jul 19, 2016 •
edited
Loading

This PR incorporates all the changes that are in v3.3.1. No keycaps were harmed in the making of this pull request. (Had to resolve conflicts, alas.)

friedbunny and others added 14 commits July 14, 2016 19:50
@friedbunny
[ios] Pass animated property when deselecting annotation views (#5677)
d303980
@friedbunny
[core] Guard against camera's minScale being NaN
09221ec 
Fixes a bug where calculating the padded bounds for a single point would cause division by zero, resulting in NaN for `minScale`. This invalid `minScale` would then be used to create an invalid padded `centerPixel`.
@1ec5
[ios] Reenabled long tap to drop pins
bdd2d02 
Long pressing drops pins again. The minimum press duration has been extended to a second to avoid preempting the built-in gesture for draggable annotations.
@frederoni
[ios] fixes #3697 compass, logo and attribution now respects insets (#…
ede1e71 
…5671)

* [ios] fixes #3697 compass, logo and attribution now respects mapview's content inset

* [ios] fixed a bug which added duplicated constraints instead of updating

* [ios] layout guides are already taken into account in contentInset
@1ec5
[core] Restored shape annotation z-order
8179f2f 
Shapes are once again always added to the top z-index.

Fixes #5691.

Cherry-picked from 74fe96d.
@1ec5
[ios] Updated changelog for v3.3.1
1d96191 
Added entries for #5693, #5677, and #5671.
@1ec5
[ios, macos] Offline storage size API
e421180 
Added a property to MGLOfflineStorage that indicates the disk space occupied by all cached and offline resources.

Fixes #5580.

Cherry-picked from 1bc4f0e.
@brunoabinader
[core] Set annotation tileset max zoom to 18
2a0e296
@1ec5
[ios, macos] Updated changelog
223e3b3
@jingsam @1ec5
mapbox: URL containing query string causes infinite loop (#5554)
12b431e 
* correct all EXPECT_EQ(actual, expected) to EXPECT_EQ(expected, actual)

* fix getMapboxURLPathname() of URL with querystring

* add test for normalizeSourceURL of non-mapbox protocal

* Update mapbox.cpp

Cherry-picked from e82ecc6.
@kkaefer @1ec5
[core] add check for missing sprite URL file extension
d640c22 
Cherry-picked from 559f3a6.
@kkaefer @1ec5
[core] use more const, auto and refs
c261d0b 
Cherry-picked from 40ea424.
@1ec5
[ios, macos] Updated changelogs
91fc58d 
Updated changelogs for #5723, #5554.

Cherry-picked from a53dfcd.
@1ec5
ios-v3.3.1
59f1b2b
@1ec5 1ec5 added the iOS Mapbox Maps SDK for iOS label Jul 19, 2016
@1ec5 1ec5 added this to the ios-v3.3.1 milestone Jul 19, 2016
@1ec5 1ec5 self-assigned this Jul 19, 2016
@1ec5 1ec5 merged commit 59f1b2b into master Jul 19, 2016
1ec5 added a commit that referenced this pull request Jul 19, 2016
@1ec5
[core] Fixed test build errors
53131de 
Missed this bad merge from #5729.
@1ec5
Copy link
Contributor Author

1ec5 commented Jul 19, 2016

Git left a bad merge in annotations.cpp, which I addressed but failed to add to the merge commit before pushing. I’ve followed up in 53131de.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@1ec5 1ec5

Labels
iOS Mapbox Maps SDK for iOS
Projects
None yet
Milestone
ios-v3.3.1
Development

Successfully merging this pull request may close these issues.
6 participants
@1ec5 @friedbunny @frederoni @brunoabinader @jingsam @kkaefer