diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-02-13 11:40:40 -0500 |
|---|---|---|
| committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-02-13 11:40:40 -0500 |
| commit | b68266953fab505ad257c7ab471a75eb9bd634bc (patch) | |
| tree | 0fb029e6b2a967a678a69993bd0e018291143f92 /platform/ios/app/MBXViewController.m | |
| parent | 44ca0a5ec4979138514e8dda10dd1b1173dd0db1 (diff) | |
| parent | 3a0c87b1b4d4f2789a2ca5e995a79a7bad4f761f (diff) | |
| download | qtlocation-mapboxgl-b68266953fab505ad257c7ab471a75eb9bd634bc.tar.gz | |
Merge tag 'ios-v3.7.4' into master
# Conflicts:
# include/mbgl/style/conversion/tileset.hpp
# include/mbgl/util/tileset.hpp
# platform/android/CHANGELOG.md
# platform/android/MapboxGLAndroidSDK/gradle.properties
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
# platform/ios/CHANGELOG.md
# platform/ios/ios.xcodeproj/project.pbxproj
# platform/macos/CHANGELOG.md
# src/mbgl/layout/symbol_projection.cpp
# src/mbgl/renderer/tile_pyramid.cpp
# src/mbgl/style/conversion/tileset.cpp
Diffstat (limited to 'platform/ios/app/MBXViewController.m')
| -rw-r--r-- | platform/ios/app/MBXViewController.m | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m index 0f617188b9..282dc901d6 100644 --- a/platform/ios/app/MBXViewController.m +++ b/platform/ios/app/MBXViewController.m @@ -1280,6 +1280,7 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) { - (void)styleDynamicPointCollection { [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(36.9979, -109.0441) zoomLevel:14 animated:NO]; + CLLocationCoordinate2D coordinates[] = { {37.00145594210082, -109.04960632324219}, {37.00173012609867, -109.0404224395752}, @@ -1889,7 +1890,8 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) { [self updateHUD]; } -- (void)mapView:(MGLMapView *)mapView regionDidChangeAnimated:(BOOL)animated { +- (void)mapView:(MGLMapView *)mapView regionDidChangeWithReason:(MGLCameraChangeReason)reason animated:(BOOL)animated +{ [self updateHUD]; } |