o Fixes, improvements

@@ -116,11 +116,12 @@
 
 
 - (void)setLayer:(RMMapLayer *)aLayer
 - (void)setLayer:(RMMapLayer *)aLayer
 {
 {
-    if (layer == aLayer) return;
-    [layer removeFromSuperlayer]; [layer release];
-    layer = [aLayer retain];
+    if (layer != aLayer) {
+        [layer removeFromSuperlayer]; [layer release];
+        layer = [aLayer retain];
+        layer.annotation = self;
+    }
     layer.position = self.position;
     layer.position = self.position;
-    layer.annotation = self;
 }
 }
 
 
 - (BOOL)isAnnotationWithinBounds:(CGRect)bounds
 - (BOOL)isAnnotationWithinBounds:(CGRect)bounds
@@ -139,4 +140,12 @@
     return [self isAnnotationWithinBounds:screenBounds];
     return [self isAnnotationWithinBounds:screenBounds];
 }
 }
 
 
+- (NSString *)description
+{
+    if (self.hasBoundingBox)
+        return [NSString stringWithFormat:@"<%@: %@ @ (%.0f,%.0f) {(%.0f,%.0f) - (%.0f,%.0f)}>", NSStringFromClass([self class]), self.title, self.projectedLocation.easting, self.projectedLocation.northing, self.projectedBoundingBox.origin.easting, self.projectedBoundingBox.origin.northing, self.projectedBoundingBox.origin.easting + self.projectedBoundingBox.size.width, self.projectedBoundingBox.origin.northing + self.projectedBoundingBox.size.height];
+    else
+        return [NSString stringWithFormat:@"<%@: %@ @ (%.0f,%.0f)>", NSStringFromClass([self class]), self.title, self.projectedLocation.easting, self.projectedLocation.northing];
+}
+
 @end
 @end

@@ -58,7 +58,7 @@
     return self;
     return self;
 }
 }
 
 
-/// \bug why return nil for the "position" and "bounds" actionForKey? Does this do anything besides block Core Animation?
+/// return nil for certain animation keys to block core animation
 - (id <CAAction>)actionForKey:(NSString *)key
 - (id <CAAction>)actionForKey:(NSString *)key
 {
 {
     if ([key isEqualToString:@"position"] || [key isEqualToString:@"bounds"])
     if ([key isEqualToString:@"position"] || [key isEqualToString:@"bounds"])

@@ -52,9 +52,9 @@
 
 
 #pragma mark --- begin constants ----
 #pragma mark --- begin constants ----
 
 
-#define kDefaultDecelerationFactor .88f
+#define kDefaultDecelerationFactor .80f
 #define kMinDecelerationDelta 0.6f
 #define kMinDecelerationDelta 0.6f
-#define kDecelerationTimerInterval 0.02f
+#define kDecelerationTimerInterval 0.04f
 
 
 #define kZoomAnimationStepTime 0.03f
 #define kZoomAnimationStepTime 0.03f
 #define kZoomAnimationAnimationTime 0.1f
 #define kZoomAnimationAnimationTime 0.1f
@@ -420,10 +420,10 @@
     if (![self tileSourceBoundsContainProjectedPoint:projectedCenter])
     if (![self tileSourceBoundsContainProjectedPoint:projectedCenter])
         return;
         return;
 
 
-	[mercatorToScreenProjection moveScreenBy:delta];
-	[imagesOnScreen moveBy:delta];
-	[tileLoader moveBy:delta];
-	[self correctPositionOfAllAnnotationsIncludingInvisibles:correctAllSublayers];
+    [mercatorToScreenProjection moveScreenBy:delta];
+    [imagesOnScreen moveBy:delta];
+    [tileLoader moveBy:delta];
+    [self correctPositionOfAllAnnotationsIncludingInvisibles:correctAllSublayers];
 }
 }
 
 
 - (void)moveToCoordinate:(CLLocationCoordinate2D)coordinate animated:(BOOL)animated
 - (void)moveToCoordinate:(CLLocationCoordinate2D)coordinate animated:(BOOL)animated
@@ -1088,9 +1088,8 @@
         return;
         return;
 
 
     [mercatorToScreenProjection setProjectedCenter:projectedPoint];
     [mercatorToScreenProjection setProjectedCenter:projectedPoint];
-    [self correctPositionOfAllAnnotations];
     [tileLoader reload];
     [tileLoader reload];
-    [overlay setNeedsDisplay];
+    [self correctPositionOfAllAnnotations];
 }
 }
 
 
 - (RMProjectedRect)projectedBounds
 - (RMProjectedRect)projectedBounds
@@ -1101,6 +1100,8 @@
 - (void)setProjectedBounds:(RMProjectedRect)boundsRect
 - (void)setProjectedBounds:(RMProjectedRect)boundsRect
 {
 {
     [mercatorToScreenProjection setProjectedBounds:boundsRect];
     [mercatorToScreenProjection setProjectedBounds:boundsRect];
+    [tileLoader reload];
+    [self correctPositionOfAllAnnotations];
 }
 }
 
 
 - (RMTileRect)tileBounds
 - (RMTileRect)tileBounds
@@ -1308,6 +1309,10 @@
     CGRect screenBounds = [[self mercatorToScreenProjection] screenBounds];
     CGRect screenBounds = [[self mercatorToScreenProjection] screenBounds];
     CALayer *lastLayer = nil;
     CALayer *lastLayer = nil;
 
 
+    // Prevent blurry movements
+    [CATransaction begin];
+    [CATransaction setAnimationDuration:0];
+
     @synchronized (annotations)
     @synchronized (annotations)
     {
     {
         if (correctAllAnnotations)
         if (correctAllAnnotations)
@@ -1329,21 +1334,23 @@
 
 
                         [visibleAnnotations addObject:annotation];
                         [visibleAnnotations addObject:annotation];
                     }
                     }
+                    lastLayer = annotation.layer;
                 } else {
                 } else {
                     annotation.layer = nil;
                     annotation.layer = nil;
                     [visibleAnnotations removeObject:annotation];
                     [visibleAnnotations removeObject:annotation];
                 }
                 }
-                lastLayer = annotation.layer;
             }
             }
-            RMLog(@"%d annotations on screen, %d total", [[overlay sublayers] count], [annotations count]);
+//            RMLog(@"%d annotations on screen, %d total", [[overlay sublayers] count], [annotations count]);
         } else {
         } else {
             for (RMAnnotation *annotation in visibleAnnotations)
             for (RMAnnotation *annotation in visibleAnnotations)
             {
             {
                 [self correctScreenPosition:annotation];
                 [self correctScreenPosition:annotation];
             }
             }
-            RMLog(@"%d annotations corrected", [visibleAnnotations count]);
+//            RMLog(@"%d annotations corrected", [visibleAnnotations count]);
         }
         }
     }
     }
+
+    [CATransaction commit];
 }
 }
 
 
 - (void)correctPositionOfAllAnnotations
 - (void)correctPositionOfAllAnnotations

@@ -242,7 +242,7 @@
     if (!scaleLineWidth) {
     if (!scaleLineWidth) {
         scaledLineWidth *= renderedScale;
         scaledLineWidth *= renderedScale;
     }
     }
-    //NSLog(@"line width = %f, content scale = %f", scaledLineWidth, renderedScale);
+    // NSLog(@"line width = %f, content scale = %f", scaledLineWidth, renderedScale);
 
 
     if (!scaleLineDash && _lineDashLengths) {
     if (!scaleLineDash && _lineDashLengths) {
         dashLengths = _scaledLineDashLengths;
         dashLengths = _scaledLineDashLengths;