o Updated the sample projects

@@ -620,7 +620,7 @@
 		0867D690FE84028FC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0430;
+				LastUpgradeCheck = 0450;
 			};
 			buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "Proj4" */;
 			compatibilityVersion = "Xcode 3.2";

@@ -183,7 +183,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0450;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "LayeredMap" */;
 			compatibilityVersion = "Xcode 3.2";

@@ -198,7 +198,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0450;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MBTilesDemo" */;
 			compatibilityVersion = "Xcode 3.2";

@@ -188,7 +188,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0450;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MapMemoryLeaksCheck" */;
 			compatibilityVersion = "Xcode 3.2";

@@ -8,6 +8,7 @@
 
 #import "MainView.h"
 #import "RMPath.h"
+#import "RMShape.h"
 #import "RMMarker.h"
 #import "RMAnnotation.h"
 
@@ -29,7 +30,7 @@
 {
     [super viewDidLoad];
     mapView.delegate = self;
-	mapView.decelerationMode = RMMapDecelerationFast;
+	mapView.decelerationMode = RMMapDecelerationNormal;
     [self updateInfo];
 }
 
@@ -88,16 +89,14 @@
 
 - (RMMapLayer *)mapView:(RMMapView *)aMapView layerForAnnotation:(RMAnnotation *)annotation
 {
-    if ([annotation.annotationType isEqualToString:@"path"]) {
-        RMPath *testPath = [[[RMPath alloc] initWithView:aMapView] autorelease];
+    if ([annotation.annotationType isEqualToString:@"path"])
+    {
+//        RMPath *testPath = [[[RMPath alloc] initWithView:aMapView] autorelease];
+        RMShape *testPath = [[[RMShape alloc] initWithView:aMapView] autorelease];
         [testPath setLineColor:[annotation.userInfo objectForKey:@"lineColor"]];
         [testPath setFillColor:[annotation.userInfo objectForKey:@"fillColor"]];
         [testPath setLineWidth:[[annotation.userInfo objectForKey:@"lineWidth"] floatValue]];
-
-        CGPathDrawingMode drawingMode = kCGPathStroke;
-        if ([annotation.userInfo containsObject:@"pathDrawingMode"])
-            drawingMode = [[annotation.userInfo objectForKey:@"pathDrawingMode"] intValue];
-        [testPath setDrawingMode:drawingMode];
+//        testPath.scaleLineWidth = YES;
 
         if ([[annotation.userInfo objectForKey:@"closePath"] boolValue])
             [testPath closePath];
@@ -109,7 +108,9 @@
 
         return testPath;
     }
-    if ([annotation.annotationType isEqualToString:@"marker"]) {
+
+    if ([annotation.annotationType isEqualToString:@"marker"])
+    {
         return [[[RMMarker alloc] initWithUIImage:annotation.annotationIcon anchorPoint:annotation.anchorPoint] autorelease];
     }
 

@@ -226,7 +226,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0430;
+				LastUpgradeCheck = 0450;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MapTestbed" */;
 			compatibilityVersion = "Xcode 3.2";

@@ -235,7 +235,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0450;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MapTestbedFlipMaps" */;
 			compatibilityVersion = "Xcode 3.2";

@@ -26,7 +26,6 @@
 // Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
 - (void)viewDidLoad
 {
-	LogMethod();
     [super viewDidLoad];
 
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(tileNotification:) name:RMTileRequested object:nil];

@@ -223,7 +223,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0450;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MapTestbedTwoMaps" */;
 			compatibilityVersion = "Xcode 3.2";

@@ -238,7 +238,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0430;
+				LastUpgradeCheck = 0450;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MarkerMurder" */;
 			compatibilityVersion = "Xcode 3.2";

@@ -186,7 +186,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0450;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ProgrammaticMap" */;
 			compatibilityVersion = "Xcode 3.2";

@@ -226,7 +226,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0450;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SampleMap" */;
 			compatibilityVersion = "Xcode 3.2";

@@ -122,7 +122,7 @@
 - (void)tapOnLabelForAnnotation:(RMAnnotation *)annotation onMap:(RMMapView *)map
 {
 	NSLog(@"Label <%@, RC:%d> tapped for marker <%@, RC:%d>",  ((RMMarker *)annotation.layer).label, [((RMMarker *)annotation.layer).label retainCount], (RMMarker *)annotation.layer, [(RMMarker *)annotation.layer retainCount]);
-	[(RMMarker *)annotation.layer changeLabelUsingText:[NSString stringWithFormat:@"Tapped! (%U)", ++tapCount]];
+	[(RMMarker *)annotation.layer changeLabelUsingText:[NSString stringWithFormat:@"Tapped! (%d)", ++tapCount]];
 }
 
 // Implement viewDidLoad to do additional setup after loading the view.

@@ -201,7 +201,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0450;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SimpleMap" */;
 			compatibilityVersion = "Xcode 3.2";

@@ -116,7 +116,7 @@
 - (void)tapOnLabelForAnnotation:(RMAnnotation *)annotation onMap:(RMMapView *)map
 {
 	NSLog(@"Label <%@, RC:%d> tapped for marker <%@, RC:%d>",  ((RMMarker *)annotation.layer).label, [((RMMarker *)annotation.layer).label retainCount], (RMMarker *)annotation.layer, [(RMMarker *)annotation.layer retainCount]);
-	[(RMMarker *)annotation.layer changeLabelUsingText:[NSString stringWithFormat:@"Tapped! (%U)", ++tapCount]];
+	[(RMMarker *)annotation.layer changeLabelUsingText:[NSString stringWithFormat:@"Tapped! (%d)", ++tapCount]];
 }
 
 - (RMMapLayer *)mapView:(RMMapView *)mapView layerForAnnotation:(RMAnnotation *)annotation

@@ -200,7 +200,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0420;
+				LastUpgradeCheck = 0450;
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SimpleSampleMap" */;
 			compatibilityVersion = "Xcode 3.2";