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

[ios, macos] CP 11831 into release-chai #12087

Merged
merged 6 commits into from
Jun 7, 2018
Merged

[ios, macos] CP 11831 into release-chai #12087

merged 6 commits into from
Jun 7, 2018

Commits on Jun 7, 2018

  1. [ios] Bump podspec to v4.1.0-beta.1

    @fabian-guerra
    fabian-guerra committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    d440457 View commit details
    Browse the repository at this point in the history

  2. [test,ios] Disable multiple mapsnapshotter test. 

    8 simultaneous mapsnapshotter test periodically deadlocks in simulator.
Also, increase timeouts to decrease chance of spurious test failure.

# Conflicts:
#	platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterTest.m
    @ChrisLoer @fabian-guerra
    ChrisLoer authored and fabian-guerra committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    d005fa9 View commit details
    Browse the repository at this point in the history

  3. [docs,ios,macos] Changelog entries for MGLMapSnapshotter fix.

    @ChrisLoer @fabian-guerra
    ChrisLoer authored and fabian-guerra committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    81c2ff9 View commit details
    Browse the repository at this point in the history

  4. [ios, test] Add MGLMapSnapshotter integration tests. 

    # Conflicts:
#	platform/ios/Integration Tests/Snapshotter Tests/MGLMapSnapshotterTest.m
    @ChrisLoer @fabian-guerra
    ChrisLoer authored and fabian-guerra committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    914923b View commit details
    Browse the repository at this point in the history

  5. [ios, macos] Use NSCAssert instead of assert. 

    # Conflicts:
#	platform/darwin/src/MGLMapSnapshotter.mm
    @ChrisLoer @fabian-guerra
    ChrisLoer authored and fabian-guerra committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    82b776a View commit details
    Browse the repository at this point in the history

  6. [ios, macos] Fix MGLMapSnapshotter concurrency bugs (issue #11827). 

    - Biggest change: when we apply the watermark on a background thread, don't capture self (turn most of the related instance methods into class methods)
- Don't call mbglMapSnapshotter->snapshot from a user-provided queue, since it's an asynchronous call anyway and starting it on the user's queue requires capturing self.

# Conflicts:
#	platform/darwin/src/MGLMapSnapshotter.mm
    @ChrisLoer @fabian-guerra
    ChrisLoer authored and fabian-guerra committed Jun 7, 2018
    Configuration menu
    Copy the full SHA
    6f78d86 View commit details
    Browse the repository at this point in the history