revert ivar rename for upstream merge ease

yarry · Nov 2, 2012 · be69e00 · be69e00
1 parent 1ee61cd
commit be69e00
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/MapView/Map/RMMapView.m b/MapView/Map/RMMapView.m
@@ -193,7 +193,7 @@ @implementation RMMapView
 @synthesize quadTree = _quadTree;
 @synthesize enableClustering = _enableClustering;
 @synthesize positionClusterMarkersAtTheGravityCenter = _positionClusterMarkersAtTheGravityCenter;
-@synthesize orderClusterMarkersAboveOthers = _orderClusterMarkersOnTop;
+@synthesize orderClusterMarkersAboveOthers = _orderClusterMarkersAboveOthers;
 @synthesize clusterMarkerSize = _clusterMarkerSize, clusterAreaSize = _clusterAreaSize;
 @synthesize adjustTilesForRetinaDisplay = _adjustTilesForRetinaDisplay;
 @synthesize userLocation = _userLocation;
@@ -2614,10 +2614,10 @@ - (void)correctPositionOfAllAnnotationsIncludingInvisibles:(BOOL)correctAllAnnot
         RMAnnotation *annotation2 = (RMAnnotation *)obj2;
 
         if (   [annotation1.annotationType isEqualToString:kRMClusterAnnotationTypeName] && ! [annotation2.annotationType isEqualToString:kRMClusterAnnotationTypeName])
-            return (_orderClusterMarkersOnTop ? NSOrderedDescending : NSOrderedAscending);
+            return (_orderClusterMarkersAboveOthers ? NSOrderedDescending : NSOrderedAscending);
 
         if ( ! [annotation1.annotationType isEqualToString:kRMClusterAnnotationTypeName] &&   [annotation2.annotationType isEqualToString:kRMClusterAnnotationTypeName])
-            return (_orderClusterMarkersOnTop ? NSOrderedAscending : NSOrderedDescending);
+            return (_orderClusterMarkersAboveOthers ? NSOrderedAscending : NSOrderedDescending);
 
         CGPoint obj1Point = [self convertPoint:annotation1.position fromView:_overlayView];
         CGPoint obj2Point = [self convertPoint:annotation2.position fromView:_overlayView];