summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@users.noreply.github.com>2015-07-08 12:53:50 -0700
committerJustin R. Miller <incanus@users.noreply.github.com>2015-07-08 12:53:50 -0700
commitaa51c15670f2a304eb270f64bb65aff41ac3f2a6 (patch)
tree9f48f1775a03b20e666ed28bac8e0f43dc55f5af
parentfb230dda51721842036bb9102168e99ed2251f91 (diff)
parented04e6d9f712437bc29502e134250cd979c74b64 (diff)
downloadqtlocation-mapboxgl-aa51c15670f2a304eb270f64bb65aff41ac3f2a6.tar.gz
Merge pull request #1852 from mapbox/update-user-dot-once
refs #1125, 1813: update user dot tracking in one place
-rw-r--r--platform/ios/MGLMapView.mm8
1 files changed, 2 insertions, 6 deletions
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm
index 6f6a6d9ae1..d6500889f9 100644
--- a/platform/ios/MGLMapView.mm
+++ b/platform/ios/MGLMapView.mm
@@ -688,6 +688,8 @@ std::chrono::steady_clock::duration secondsAsDuration(float duration)
_mbglMap->setSourceTileCacheSize(cacheSize);
_mbglMap->renderSync();
+
+ [self updateUserLocationAnnotationView];
}
}
@@ -2351,8 +2353,6 @@ CLLocationCoordinate2D MGLLocationCoordinate2DFromLatLng(mbgl::LatLng latLng)
self.userLocationAnnotationView.haloLayer.hidden = ! CLLocationCoordinate2DIsValid(self.userLocation.coordinate) ||
newLocation.horizontalAccuracy > 10;
-
- [self updateUserLocationAnnotationView];
}
- (BOOL)locationManagerShouldDisplayHeadingCalibration:(CLLocationManager *)manager
@@ -2509,8 +2509,6 @@ CLLocationCoordinate2D MGLLocationCoordinate2DFromLatLng(mbgl::LatLng latLng)
case mbgl::MapChangeRegionWillChange:
case mbgl::MapChangeRegionWillChangeAnimated:
{
- [self updateUserLocationAnnotationView];
-
[self deselectAnnotation:self.selectedAnnotation animated:NO];
BOOL animated = (change == mbgl::MapChangeRegionWillChangeAnimated);
@@ -2545,7 +2543,6 @@ CLLocationCoordinate2D MGLLocationCoordinate2DFromLatLng(mbgl::LatLng latLng)
}
case mbgl::MapChangeRegionIsChanging:
{
- [self updateUserLocationAnnotationView];
[self updateCompass];
if ([self.delegate respondsToSelector:@selector(mapViewRegionIsChanging:)])
@@ -2557,7 +2554,6 @@ CLLocationCoordinate2D MGLLocationCoordinate2DFromLatLng(mbgl::LatLng latLng)
case mbgl::MapChangeRegionDidChange:
case mbgl::MapChangeRegionDidChangeAnimated:
{
- [self updateUserLocationAnnotationView];
[self updateCompass];
if (self.pan.state == UIGestureRecognizerStateChanged ||