Authored by Justin R. Miller

also sort circles with shapes in z-ordering

... ... @@ -2842,10 +2842,10 @@
// markers above shapes
//
if ( [annotation1.layer isKindOfClass:[RMMarker class]] && [annotation2.layer isKindOfClass:[RMShape class]])
if ( [annotation1.layer isKindOfClass:[RMMarker class]] && [@[[RMShape class], [RMCircle class]] containsObject:[annotation2.layer class]])
return NSOrderedDescending;
if ( [annotation1.layer isKindOfClass:[RMShape class]] && [annotation2.layer isKindOfClass:[RMMarker class]])
if ( [@[[RMShape class], [RMCircle class]] containsObject:[annotation1.layer class]] && [annotation2.layer isKindOfClass:[RMMarker class]])
return NSOrderedAscending;
// the rest in increasing y-position
... ...