Skip to content

Commit

Permalink
fixes Outdooractive#95: don't pre-rotate non-marker annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
incanus committed Aug 9, 2012
1 parent 3c9c1b2 commit 9600903
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions MapView/Map/RMMapView.m
Original file line number Diff line number Diff line change
Expand Up @@ -2301,7 +2301,8 @@ - (void)correctPositionOfAllAnnotationsIncludingInvisibles:(BOOL)correctAllAnnot
if (annotation.layer == nil)
continue;

annotation.layer.transform = _annotationTransform;
if ([annotation.layer isKindOfClass:[RMMarker class]] && ! annotation.isUserLocationAnnotation)
annotation.layer.transform = _annotationTransform;

// Use the zPosition property to order the layer hierarchy
if ( ! [_visibleAnnotations containsObject:annotation])
Expand Down Expand Up @@ -2354,7 +2355,8 @@ - (void)correctPositionOfAllAnnotationsIncludingInvisibles:(BOOL)correctAllAnnot
if (annotation.layer == nil)
continue;

annotation.layer.transform = _annotationTransform;
if ([annotation.layer isKindOfClass:[RMMarker class]] && ! annotation.isUserLocationAnnotation)
annotation.layer.transform = _annotationTransform;

if (![_visibleAnnotations containsObject:annotation])
{
Expand Down Expand Up @@ -2609,7 +2611,8 @@ - (void)setUserTrackingMode:(RMUserTrackingMode)mode animated:(BOOL)animated
_overlayView.transform = _mapTransform;

for (RMAnnotation *annotation in _annotations)
annotation.layer.transform = _annotationTransform;
if ([annotation.layer isKindOfClass:[RMMarker class]] && ! annotation.isUserLocationAnnotation)
annotation.layer.transform = _annotationTransform;
}
completion:nil];

Expand Down Expand Up @@ -2659,7 +2662,8 @@ - (void)setUserTrackingMode:(RMUserTrackingMode)mode animated:(BOOL)animated
_overlayView.transform = _mapTransform;

for (RMAnnotation *annotation in _annotations)
annotation.layer.transform = _annotationTransform;
if ([annotation.layer isKindOfClass:[RMMarker class]] && ! annotation.isUserLocationAnnotation)
annotation.layer.transform = _annotationTransform;
}
completion:nil];

Expand Down

0 comments on commit 9600903

Please sign in to comment.