尹诚 / Mapbox-iOS-SDK · Commits

Go to a project

Authored by Thomas Rasch
Commit 8b63016007fdd7c2602703e3accce50d2e1e6e8b 1 parent e0fb7ec2

o Updated the sample projects

Inline Side-by-side
Showing 16 changed files with 24 additions and 24 deletions
@@ -620,7 +620,7 @@ @@ -620,7 +620,7 @@
620 0867D690FE84028FC02AAC07 /* Project object */ = { 620 0867D690FE84028FC02AAC07 /* Project object */ = {
621 isa = PBXProject; 621 isa = PBXProject;
622 attributes = { 622 attributes = {
623 - LastUpgradeCheck = 0430; 623 + LastUpgradeCheck = 0450;
624 }; 624 };
625 buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "Proj4" */; 625 buildConfigurationList = 1DEB922208733DC00010E9CD /* Build configuration list for PBXProject "Proj4" */;
626 compatibilityVersion = "Xcode 3.2"; 626 compatibilityVersion = "Xcode 3.2";
@@ -183,7 +183,7 @@ @@ -183,7 +183,7 @@
183 29B97313FDCFA39411CA2CEA /* Project object */ = { 183 29B97313FDCFA39411CA2CEA /* Project object */ = {
184 isa = PBXProject; 184 isa = PBXProject;
185 attributes = { 185 attributes = {
186 - LastUpgradeCheck = 0420; 186 + LastUpgradeCheck = 0450;
187 }; 187 };
188 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "LayeredMap" */; 188 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "LayeredMap" */;
189 compatibilityVersion = "Xcode 3.2"; 189 compatibilityVersion = "Xcode 3.2";
@@ -198,7 +198,7 @@ @@ -198,7 +198,7 @@
198 29B97313FDCFA39411CA2CEA /* Project object */ = { 198 29B97313FDCFA39411CA2CEA /* Project object */ = {
199 isa = PBXProject; 199 isa = PBXProject;
200 attributes = { 200 attributes = {
201 - LastUpgradeCheck = 0420; 201 + LastUpgradeCheck = 0450;
202 }; 202 };
203 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MBTilesDemo" */; 203 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MBTilesDemo" */;
204 compatibilityVersion = "Xcode 3.2"; 204 compatibilityVersion = "Xcode 3.2";
@@ -188,7 +188,7 @@ @@ -188,7 +188,7 @@
188 29B97313FDCFA39411CA2CEA /* Project object */ = { 188 29B97313FDCFA39411CA2CEA /* Project object */ = {
189 isa = PBXProject; 189 isa = PBXProject;
190 attributes = { 190 attributes = {
191 - LastUpgradeCheck = 0420; 191 + LastUpgradeCheck = 0450;
192 }; 192 };
193 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MapMemoryLeaksCheck" */; 193 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MapMemoryLeaksCheck" */;
194 compatibilityVersion = "Xcode 3.2"; 194 compatibilityVersion = "Xcode 3.2";
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 8
9 #import "MainView.h" 9 #import "MainView.h"
10 #import "RMPath.h" 10 #import "RMPath.h"
  11 +#import "RMShape.h"
11 #import "RMMarker.h" 12 #import "RMMarker.h"
12 #import "RMAnnotation.h" 13 #import "RMAnnotation.h"
13 14
@@ -29,7 +30,7 @@ @@ -29,7 +30,7 @@
29 { 30 {
30 [super viewDidLoad]; 31 [super viewDidLoad];
31 mapView.delegate = self; 32 mapView.delegate = self;
32 - mapView.decelerationMode = RMMapDecelerationFast; 33 + mapView.decelerationMode = RMMapDecelerationNormal;
33 [self updateInfo]; 34 [self updateInfo];
34 } 35 }
35 36
@@ -88,16 +89,14 @@ @@ -88,16 +89,14 @@
88 89
89 - (RMMapLayer *)mapView:(RMMapView *)aMapView layerForAnnotation:(RMAnnotation *)annotation 90 - (RMMapLayer *)mapView:(RMMapView *)aMapView layerForAnnotation:(RMAnnotation *)annotation
90 { 91 {
91 - if ([annotation.annotationType isEqualToString:@"path"]) {  
92 - RMPath *testPath = [[[RMPath alloc] initWithView:aMapView] autorelease]; 92 + if ([annotation.annotationType isEqualToString:@"path"])
  93 + {
  94 +// RMPath *testPath = [[[RMPath alloc] initWithView:aMapView] autorelease];
  95 + RMShape *testPath = [[[RMShape alloc] initWithView:aMapView] autorelease];
93 [testPath setLineColor:[annotation.userInfo objectForKey:@"lineColor"]]; 96 [testPath setLineColor:[annotation.userInfo objectForKey:@"lineColor"]];
94 [testPath setFillColor:[annotation.userInfo objectForKey:@"fillColor"]]; 97 [testPath setFillColor:[annotation.userInfo objectForKey:@"fillColor"]];
95 [testPath setLineWidth:[[annotation.userInfo objectForKey:@"lineWidth"] floatValue]]; 98 [testPath setLineWidth:[[annotation.userInfo objectForKey:@"lineWidth"] floatValue]];
96 -  
97 - CGPathDrawingMode drawingMode = kCGPathStroke;  
98 - if ([annotation.userInfo containsObject:@"pathDrawingMode"])  
99 - drawingMode = [[annotation.userInfo objectForKey:@"pathDrawingMode"] intValue];  
100 - [testPath setDrawingMode:drawingMode]; 99 +// testPath.scaleLineWidth = YES;
101 100
102 if ([[annotation.userInfo objectForKey:@"closePath"] boolValue]) 101 if ([[annotation.userInfo objectForKey:@"closePath"] boolValue])
103 [testPath closePath]; 102 [testPath closePath];
@@ -109,7 +108,9 @@ @@ -109,7 +108,9 @@
109 108
110 return testPath; 109 return testPath;
111 } 110 }
112 - if ([annotation.annotationType isEqualToString:@"marker"]) { 111 +
  112 + if ([annotation.annotationType isEqualToString:@"marker"])
  113 + {
113 return [[[RMMarker alloc] initWithUIImage:annotation.annotationIcon anchorPoint:annotation.anchorPoint] autorelease]; 114 return [[[RMMarker alloc] initWithUIImage:annotation.annotationIcon anchorPoint:annotation.anchorPoint] autorelease];
114 } 115 }
115 116
@@ -226,7 +226,7 @@ @@ -226,7 +226,7 @@
226 29B97313FDCFA39411CA2CEA /* Project object */ = { 226 29B97313FDCFA39411CA2CEA /* Project object */ = {
227 isa = PBXProject; 227 isa = PBXProject;
228 attributes = { 228 attributes = {
229 - LastUpgradeCheck = 0430; 229 + LastUpgradeCheck = 0450;
230 }; 230 };
231 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MapTestbed" */; 231 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MapTestbed" */;
232 compatibilityVersion = "Xcode 3.2"; 232 compatibilityVersion = "Xcode 3.2";
@@ -235,7 +235,7 @@ @@ -235,7 +235,7 @@
235 29B97313FDCFA39411CA2CEA /* Project object */ = { 235 29B97313FDCFA39411CA2CEA /* Project object */ = {
236 isa = PBXProject; 236 isa = PBXProject;
237 attributes = { 237 attributes = {
238 - LastUpgradeCheck = 0420; 238 + LastUpgradeCheck = 0450;
239 }; 239 };
240 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MapTestbedFlipMaps" */; 240 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MapTestbedFlipMaps" */;
241 compatibilityVersion = "Xcode 3.2"; 241 compatibilityVersion = "Xcode 3.2";
@@ -26,7 +26,6 @@ @@ -26,7 +26,6 @@
26 // Implement viewDidLoad to do additional setup after loading the view, typically from a nib. 26 // Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
27 - (void)viewDidLoad 27 - (void)viewDidLoad
28 { 28 {
29 - LogMethod();  
30 [super viewDidLoad]; 29 [super viewDidLoad];
31 30
32 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(tileNotification:) name:RMTileRequested object:nil]; 31 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(tileNotification:) name:RMTileRequested object:nil];
@@ -223,7 +223,7 @@ @@ -223,7 +223,7 @@
223 29B97313FDCFA39411CA2CEA /* Project object */ = { 223 29B97313FDCFA39411CA2CEA /* Project object */ = {
224 isa = PBXProject; 224 isa = PBXProject;
225 attributes = { 225 attributes = {
226 - LastUpgradeCheck = 0420; 226 + LastUpgradeCheck = 0450;
227 }; 227 };
228 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MapTestbedTwoMaps" */; 228 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MapTestbedTwoMaps" */;
229 compatibilityVersion = "Xcode 3.2"; 229 compatibilityVersion = "Xcode 3.2";
@@ -238,7 +238,7 @@ @@ -238,7 +238,7 @@
238 29B97313FDCFA39411CA2CEA /* Project object */ = { 238 29B97313FDCFA39411CA2CEA /* Project object */ = {
239 isa = PBXProject; 239 isa = PBXProject;
240 attributes = { 240 attributes = {
241 - LastUpgradeCheck = 0430; 241 + LastUpgradeCheck = 0450;
242 }; 242 };
243 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MarkerMurder" */; 243 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MarkerMurder" */;
244 compatibilityVersion = "Xcode 3.2"; 244 compatibilityVersion = "Xcode 3.2";
@@ -186,7 +186,7 @@ @@ -186,7 +186,7 @@
186 29B97313FDCFA39411CA2CEA /* Project object */ = { 186 29B97313FDCFA39411CA2CEA /* Project object */ = {
187 isa = PBXProject; 187 isa = PBXProject;
188 attributes = { 188 attributes = {
189 - LastUpgradeCheck = 0420; 189 + LastUpgradeCheck = 0450;
190 }; 190 };
191 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ProgrammaticMap" */; 191 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ProgrammaticMap" */;
192 compatibilityVersion = "Xcode 3.2"; 192 compatibilityVersion = "Xcode 3.2";
@@ -226,7 +226,7 @@ @@ -226,7 +226,7 @@
226 29B97313FDCFA39411CA2CEA /* Project object */ = { 226 29B97313FDCFA39411CA2CEA /* Project object */ = {
227 isa = PBXProject; 227 isa = PBXProject;
228 attributes = { 228 attributes = {
229 - LastUpgradeCheck = 0420; 229 + LastUpgradeCheck = 0450;
230 }; 230 };
231 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SampleMap" */; 231 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SampleMap" */;
232 compatibilityVersion = "Xcode 3.2"; 232 compatibilityVersion = "Xcode 3.2";
@@ -122,7 +122,7 @@ @@ -122,7 +122,7 @@
122 - (void)tapOnLabelForAnnotation:(RMAnnotation *)annotation onMap:(RMMapView *)map 122 - (void)tapOnLabelForAnnotation:(RMAnnotation *)annotation onMap:(RMMapView *)map
123 { 123 {
124 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]); 124 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]);
125 - [(RMMarker *)annotation.layer changeLabelUsingText:[NSString stringWithFormat:@"Tapped! (%U)", ++tapCount]]; 125 + [(RMMarker *)annotation.layer changeLabelUsingText:[NSString stringWithFormat:@"Tapped! (%d)", ++tapCount]];
126 } 126 }
127 127
128 // Implement viewDidLoad to do additional setup after loading the view. 128 // Implement viewDidLoad to do additional setup after loading the view.
@@ -201,7 +201,7 @@ @@ -201,7 +201,7 @@
201 29B97313FDCFA39411CA2CEA /* Project object */ = { 201 29B97313FDCFA39411CA2CEA /* Project object */ = {
202 isa = PBXProject; 202 isa = PBXProject;
203 attributes = { 203 attributes = {
204 - LastUpgradeCheck = 0420; 204 + LastUpgradeCheck = 0450;
205 }; 205 };
206 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SimpleMap" */; 206 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SimpleMap" */;
207 compatibilityVersion = "Xcode 3.2"; 207 compatibilityVersion = "Xcode 3.2";
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
116 - (void)tapOnLabelForAnnotation:(RMAnnotation *)annotation onMap:(RMMapView *)map 116 - (void)tapOnLabelForAnnotation:(RMAnnotation *)annotation onMap:(RMMapView *)map
117 { 117 {
118 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]); 118 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]);
119 - [(RMMarker *)annotation.layer changeLabelUsingText:[NSString stringWithFormat:@"Tapped! (%U)", ++tapCount]]; 119 + [(RMMarker *)annotation.layer changeLabelUsingText:[NSString stringWithFormat:@"Tapped! (%d)", ++tapCount]];
120 } 120 }
121 121
122 - (RMMapLayer *)mapView:(RMMapView *)mapView layerForAnnotation:(RMAnnotation *)annotation 122 - (RMMapLayer *)mapView:(RMMapView *)mapView layerForAnnotation:(RMAnnotation *)annotation
@@ -200,7 +200,7 @@ @@ -200,7 +200,7 @@
200 29B97313FDCFA39411CA2CEA /* Project object */ = { 200 29B97313FDCFA39411CA2CEA /* Project object */ = {
201 isa = PBXProject; 201 isa = PBXProject;
202 attributes = { 202 attributes = {
203 - LastUpgradeCheck = 0420; 203 + LastUpgradeCheck = 0450;
204 }; 204 };
205 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SimpleSampleMap" */; 205 buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SimpleSampleMap" */;
206 compatibilityVersion = "Xcode 3.2"; 206 compatibilityVersion = "Xcode 3.2";