尹诚 / Mapbox-iOS-SDK · Commits

Go to a project

Authored by Quazie
Commit 611430d4edca134e3a72ef9bbf747d38ebcb75b6 1 parent 064be182

Fixed issue 79. Also finished fix for issue 71 by updating the RMMapContentsFacade

Inline Side-by-side
Showing 23 changed files with 9 additions and 91 deletions
@@ -24,11 +24,6 @@ @@ -24,11 +24,6 @@
24 2B0C07420F65F1FD00214CE8 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07410F65F1FD00214CE8 /* CoreLocation.framework */; }; 24 2B0C07420F65F1FD00214CE8 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07410F65F1FD00214CE8 /* CoreLocation.framework */; };
25 2B0C07460F65F20700214CE8 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07450F65F20700214CE8 /* QuartzCore.framework */; }; 25 2B0C07460F65F20700214CE8 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07450F65F20700214CE8 /* QuartzCore.framework */; };
26 2B0C074A0F65F23A00214CE8 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07490F65F23A00214CE8 /* libsqlite3.dylib */; }; 26 2B0C074A0F65F23A00214CE8 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07490F65F23A00214CE8 /* libsqlite3.dylib */; };
27 - 96616A520F6714D2002587F2 /* loading.png in Resources */ = {isa = PBXBuildFile; fileRef = 96616A4D0F6714D2002587F2 /* loading.png */; };  
28 - 96616A530F6714D2002587F2 /* marker-blue-withletter.png in Resources */ = {isa = PBXBuildFile; fileRef = 96616A4E0F6714D2002587F2 /* marker-blue-withletter.png */; };  
29 - 96616A540F6714D2002587F2 /* marker-blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 96616A4F0F6714D2002587F2 /* marker-blue.png */; };  
30 - 96616A550F6714D2002587F2 /* marker-red-withletter.png in Resources */ = {isa = PBXBuildFile; fileRef = 96616A500F6714D2002587F2 /* marker-red-withletter.png */; };  
31 - 96616A560F6714D2002587F2 /* marker-red.png in Resources */ = {isa = PBXBuildFile; fileRef = 96616A510F6714D2002587F2 /* marker-red.png */; };  
32 /* End PBXBuildFile section */ 27 /* End PBXBuildFile section */
33 28
34 /* Begin PBXContainerItemProxy section */ 29 /* Begin PBXContainerItemProxy section */
@@ -82,11 +77,6 @@ @@ -82,11 +77,6 @@
82 2B0C07490F65F23A00214CE8 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; }; 77 2B0C07490F65F23A00214CE8 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
83 32CA4F630368D1EE00C91783 /* MapSample_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapSample_Prefix.pch; sourceTree = "<group>"; }; 78 32CA4F630368D1EE00C91783 /* MapSample_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapSample_Prefix.pch; sourceTree = "<group>"; };
84 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 79 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
85 - 96616A4D0F6714D2002587F2 /* loading.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loading.png; sourceTree = "<group>"; };  
86 - 96616A4E0F6714D2002587F2 /* marker-blue-withletter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-blue-withletter.png"; sourceTree = "<group>"; };  
87 - 96616A4F0F6714D2002587F2 /* marker-blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-blue.png"; sourceTree = "<group>"; };  
88 - 96616A500F6714D2002587F2 /* marker-red-withletter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-red-withletter.png"; sourceTree = "<group>"; };  
89 - 96616A510F6714D2002587F2 /* marker-red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-red.png"; sourceTree = "<group>"; };  
90 /* End PBXFileReference section */ 80 /* End PBXFileReference section */
91 81
92 /* Begin PBXFrameworksBuildPhase section */ 82 /* Begin PBXFrameworksBuildPhase section */
@@ -158,7 +148,6 @@ @@ -158,7 +148,6 @@
158 080E96DDFE201D6D7F000001 /* Application Controllers */, 148 080E96DDFE201D6D7F000001 /* Application Controllers */,
159 29B97315FDCFA39411CA2CEA /* Other Sources */, 149 29B97315FDCFA39411CA2CEA /* Other Sources */,
160 29B97317FDCFA39411CA2CEA /* Resources */, 150 29B97317FDCFA39411CA2CEA /* Resources */,
161 - 96616A4C0F6714D2002587F2 /* images */,  
162 29B97323FDCFA39411CA2CEA /* Frameworks */, 151 29B97323FDCFA39411CA2CEA /* Frameworks */,
163 19C28FACFE9D520D11CA2CBB /* Products */, 152 19C28FACFE9D520D11CA2CBB /* Products */,
164 2B0C07410F65F1FD00214CE8 /* CoreLocation.framework */, 153 2B0C07410F65F1FD00214CE8 /* CoreLocation.framework */,
@@ -207,18 +196,6 @@ @@ -207,18 +196,6 @@
207 name = Products; 196 name = Products;
208 sourceTree = "<group>"; 197 sourceTree = "<group>";
209 }; 198 };
210 - 96616A4C0F6714D2002587F2 /* images */ = {  
211 - isa = PBXGroup;  
212 - children = (  
213 - 96616A4D0F6714D2002587F2 /* loading.png */,  
214 - 96616A4E0F6714D2002587F2 /* marker-blue-withletter.png */,  
215 - 96616A4F0F6714D2002587F2 /* marker-blue.png */,  
216 - 96616A500F6714D2002587F2 /* marker-red-withletter.png */,  
217 - 96616A510F6714D2002587F2 /* marker-red.png */,  
218 - );  
219 - path = images;  
220 - sourceTree = "<group>";  
221 - };  
222 /* End PBXGroup section */ 199 /* End PBXGroup section */
223 200
224 /* Begin PBXNativeTarget section */ 201 /* Begin PBXNativeTarget section */
@@ -295,11 +272,6 @@ @@ -295,11 +272,6 @@
295 280E754D0DD40C5E005A515E /* FlipsideView.xib in Resources */, 272 280E754D0DD40C5E005A515E /* FlipsideView.xib in Resources */,
296 280E754E0DD40C5E005A515E /* MainView.xib in Resources */, 273 280E754E0DD40C5E005A515E /* MainView.xib in Resources */,
297 280E754F0DD40C5E005A515E /* MainWindow.xib in Resources */, 274 280E754F0DD40C5E005A515E /* MainWindow.xib in Resources */,
298 - 96616A520F6714D2002587F2 /* loading.png in Resources */,  
299 - 96616A530F6714D2002587F2 /* marker-blue-withletter.png in Resources */,  
300 - 96616A540F6714D2002587F2 /* marker-blue.png in Resources */,  
301 - 96616A550F6714D2002587F2 /* marker-red-withletter.png in Resources */,  
302 - 96616A560F6714D2002587F2 /* marker-red.png in Resources */,  
303 ); 275 );
304 runOnlyForDeploymentPostprocessing = 0; 276 runOnlyForDeploymentPostprocessing = 0;
305 }; 277 };
@@ -24,11 +24,6 @@ @@ -24,11 +24,6 @@
24 2B0C07420F65F1FD00214CE8 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07410F65F1FD00214CE8 /* CoreLocation.framework */; }; 24 2B0C07420F65F1FD00214CE8 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07410F65F1FD00214CE8 /* CoreLocation.framework */; };
25 2B0C07460F65F20700214CE8 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07450F65F20700214CE8 /* QuartzCore.framework */; }; 25 2B0C07460F65F20700214CE8 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07450F65F20700214CE8 /* QuartzCore.framework */; };
26 2B0C074A0F65F23A00214CE8 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07490F65F23A00214CE8 /* libsqlite3.dylib */; }; 26 2B0C074A0F65F23A00214CE8 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07490F65F23A00214CE8 /* libsqlite3.dylib */; };
27 - 96616A020F671458002587F2 /* loading.png in Resources */ = {isa = PBXBuildFile; fileRef = 966169FD0F671458002587F2 /* loading.png */; };  
28 - 96616A030F671458002587F2 /* marker-blue-withletter.png in Resources */ = {isa = PBXBuildFile; fileRef = 966169FE0F671458002587F2 /* marker-blue-withletter.png */; };  
29 - 96616A040F671458002587F2 /* marker-blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 966169FF0F671458002587F2 /* marker-blue.png */; };  
30 - 96616A050F671458002587F2 /* marker-red-withletter.png in Resources */ = {isa = PBXBuildFile; fileRef = 96616A000F671458002587F2 /* marker-red-withletter.png */; };  
31 - 96616A060F671458002587F2 /* marker-red.png in Resources */ = {isa = PBXBuildFile; fileRef = 96616A010F671458002587F2 /* marker-red.png */; };  
32 /* End PBXBuildFile section */ 27 /* End PBXBuildFile section */
33 28
34 /* Begin PBXContainerItemProxy section */ 29 /* Begin PBXContainerItemProxy section */
@@ -82,11 +77,6 @@ @@ -82,11 +77,6 @@
82 2B0C07490F65F23A00214CE8 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; }; 77 2B0C07490F65F23A00214CE8 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
83 2BD68E7A0F664657006DE17B /* MapTestbed_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapTestbed_Prefix.pch; sourceTree = "<group>"; }; 78 2BD68E7A0F664657006DE17B /* MapTestbed_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapTestbed_Prefix.pch; sourceTree = "<group>"; };
84 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 79 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
85 - 966169FD0F671458002587F2 /* loading.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loading.png; sourceTree = "<group>"; };  
86 - 966169FE0F671458002587F2 /* marker-blue-withletter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-blue-withletter.png"; sourceTree = "<group>"; };  
87 - 966169FF0F671458002587F2 /* marker-blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-blue.png"; sourceTree = "<group>"; };  
88 - 96616A000F671458002587F2 /* marker-red-withletter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-red-withletter.png"; sourceTree = "<group>"; };  
89 - 96616A010F671458002587F2 /* marker-red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-red.png"; sourceTree = "<group>"; };  
90 /* End PBXFileReference section */ 80 /* End PBXFileReference section */
91 81
92 /* Begin PBXFrameworksBuildPhase section */ 82 /* Begin PBXFrameworksBuildPhase section */
@@ -158,7 +148,6 @@ @@ -158,7 +148,6 @@
158 080E96DDFE201D6D7F000001 /* Application Controllers */, 148 080E96DDFE201D6D7F000001 /* Application Controllers */,
159 29B97315FDCFA39411CA2CEA /* Other Sources */, 149 29B97315FDCFA39411CA2CEA /* Other Sources */,
160 29B97317FDCFA39411CA2CEA /* Resources */, 150 29B97317FDCFA39411CA2CEA /* Resources */,
161 - 966169FC0F671458002587F2 /* images */,  
162 29B97323FDCFA39411CA2CEA /* Frameworks */, 151 29B97323FDCFA39411CA2CEA /* Frameworks */,
163 19C28FACFE9D520D11CA2CBB /* Products */, 152 19C28FACFE9D520D11CA2CBB /* Products */,
164 2B0C07410F65F1FD00214CE8 /* CoreLocation.framework */, 153 2B0C07410F65F1FD00214CE8 /* CoreLocation.framework */,
@@ -207,22 +196,10 @@ @@ -207,22 +196,10 @@
207 name = Products; 196 name = Products;
208 sourceTree = "<group>"; 197 sourceTree = "<group>";
209 }; 198 };
210 - 966169FC0F671458002587F2 /* images */ = {  
211 - isa = PBXGroup;  
212 - children = (  
213 - 966169FD0F671458002587F2 /* loading.png */,  
214 - 966169FE0F671458002587F2 /* marker-blue-withletter.png */,  
215 - 966169FF0F671458002587F2 /* marker-blue.png */,  
216 - 96616A000F671458002587F2 /* marker-red-withletter.png */,  
217 - 96616A010F671458002587F2 /* marker-red.png */,  
218 - );  
219 - path = images;  
220 - sourceTree = "<group>";  
221 - };  
222 /* End PBXGroup section */ 199 /* End PBXGroup section */
223 200
224 /* Begin PBXNativeTarget section */ 201 /* Begin PBXNativeTarget section */
225 - 1D6058900D05DD3D006BFB54 /* SimpleMap */ = { 202 + 1D6058900D05DD3D006BFB54 /* MapTestbed */ = {
226 isa = PBXNativeTarget; 203 isa = PBXNativeTarget;
227 buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "MapTestbed" */; 204 buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "MapTestbed" */;
228 buildPhases = ( 205 buildPhases = (
@@ -265,7 +242,7 @@ @@ -265,7 +242,7 @@
265 ); 242 );
266 projectRoot = ""; 243 projectRoot = "";
267 targets = ( 244 targets = (
268 - 1D6058900D05DD3D006BFB54 /* SimpleMap */, 245 + 1D6058900D05DD3D006BFB54 /* MapTestbed */,
269 ); 246 );
270 }; 247 };
271 /* End PBXProject section */ 248 /* End PBXProject section */
@@ -295,11 +272,6 @@ @@ -295,11 +272,6 @@
295 280E754D0DD40C5E005A515E /* FlipsideView.xib in Resources */, 272 280E754D0DD40C5E005A515E /* FlipsideView.xib in Resources */,
296 280E754E0DD40C5E005A515E /* MainView.xib in Resources */, 273 280E754E0DD40C5E005A515E /* MainView.xib in Resources */,
297 280E754F0DD40C5E005A515E /* MainWindow.xib in Resources */, 274 280E754F0DD40C5E005A515E /* MainWindow.xib in Resources */,
298 - 96616A020F671458002587F2 /* loading.png in Resources */,  
299 - 96616A030F671458002587F2 /* marker-blue-withletter.png in Resources */,  
300 - 96616A040F671458002587F2 /* marker-blue.png in Resources */,  
301 - 96616A050F671458002587F2 /* marker-red-withletter.png in Resources */,  
302 - 96616A060F671458002587F2 /* marker-red.png in Resources */,  
303 ); 275 );
304 runOnlyForDeploymentPostprocessing = 0; 276 runOnlyForDeploymentPostprocessing = 0;
305 }; 277 };
@@ -38,7 +38,7 @@ static RMConfiguration* RMConfigurationSharedInstance = nil; @@ -38,7 +38,7 @@ static RMConfiguration* RMConfigurationSharedInstance = nil;
38 if (RMConfigurationSharedInstance != nil) return RMConfigurationSharedInstance; 38 if (RMConfigurationSharedInstance != nil) return RMConfigurationSharedInstance;
39 39
40 RMConfigurationSharedInstance = [[RMConfiguration alloc] 40 RMConfigurationSharedInstance = [[RMConfiguration alloc]
41 - initWithPath: [[NSBundle mainBundle] pathForResource:@"routeme" ofType:@"plist"]]; 41 + initWithPath: [[NSBundle bundleForClass:@"RMConfiguration"] pathForResource:@"routeme" ofType:@"plist"]];
42 42
43 return RMConfigurationSharedInstance; 43 return RMConfigurationSharedInstance;
44 } 44 }
@@ -185,9 +185,11 @@ enum { @@ -185,9 +185,11 @@ enum {
185 - (void)moveBy: (CGSize) delta; 185 - (void)moveBy: (CGSize) delta;
186 - (void)zoomByFactor: (float) zoomFactor near:(CGPoint) center; 186 - (void)zoomByFactor: (float) zoomFactor near:(CGPoint) center;
187 - (void)zoomInToNextNativeZoomAt:(CGPoint) pivot animated:(BOOL) animated; 187 - (void)zoomInToNextNativeZoomAt:(CGPoint) pivot animated:(BOOL) animated;
  188 +- (void)zoomOutToNextNativeZoomAt:(CGPoint) pivot animated:(BOOL) animated;
188 - (void)zoomByFactor: (float) zoomFactor near:(CGPoint) center animated:(BOOL) animated; 189 - (void)zoomByFactor: (float) zoomFactor near:(CGPoint) center animated:(BOOL) animated;
189 190
190 - (void)zoomInToNextNativeZoomAt:(CGPoint) pivot; 191 - (void)zoomInToNextNativeZoomAt:(CGPoint) pivot;
  192 +- (void)zoomOutToNextNativeZoomAt:(CGPoint) pivot;
191 - (float)adjustZoomForBoundingMask:(float)zoomFactor; 193 - (float)adjustZoomForBoundingMask:(float)zoomFactor;
192 - (void)adjustMapPlacementWithScale:(float)aScale; 194 - (void)adjustMapPlacementWithScale:(float)aScale;
193 - (void)setZoomBounds:(float)aMinZoom maxZoom:(float)aMaxZoom; 195 - (void)setZoomBounds:(float)aMinZoom maxZoom:(float)aMaxZoom;
@@ -246,7 +246,7 @@ static CGImageRef _markerBlue = nil; @@ -246,7 +246,7 @@ static CGImageRef _markerBlue = nil;
246 246
247 + (CGImageRef) loadPNGFromBundle: (NSString *)filename 247 + (CGImageRef) loadPNGFromBundle: (NSString *)filename
248 { 248 {
249 - NSString *path = [[NSBundle mainBundle] pathForResource:filename ofType:@"png"]; 249 + NSString *path = [[NSBundle bundleForClass:@"RMMarker"] pathForResource:filename ofType:@"png"];
250 CGDataProviderRef dataProvider = CGDataProviderCreateWithFilename([path UTF8String]); 250 CGDataProviderRef dataProvider = CGDataProviderCreateWithFilename([path UTF8String]);
251 CGImageRef image = CGImageCreateWithPNGDataProvider(dataProvider, NULL, FALSE, kCGRenderingIntentDefault); 251 CGImageRef image = CGImageCreateWithPNGDataProvider(dataProvider, NULL, FALSE, kCGRenderingIntentDefault);
252 [NSMakeCollectable(image) autorelease]; 252 [NSMakeCollectable(image) autorelease];
@@ -48,7 +48,7 @@ static RMTileImage *_loadingTile = nil; @@ -48,7 +48,7 @@ static RMTileImage *_loadingTile = nil;
48 return _loadingTile; 48 return _loadingTile;
49 49
50 RMTile t = RMTileDummy(); 50 RMTile t = RMTileDummy();
51 - NSString* file = [[NSBundle mainBundle] pathForResource:@"loading" ofType:@"png"]; 51 + NSString* file = [[NSBundle bundleForClass:@"RMTileProxy"] pathForResource:@"loading" ofType:@"png"];
52 _loadingTile = [[RMTileImage imageWithTile:t FromFile:file] retain]; 52 _loadingTile = [[RMTileImage imageWithTile:t FromFile:file] retain];
53 return _loadingTile; 53 return _loadingTile;
54 // return nil; 54 // return nil;
@@ -137,8 +137,8 @@ @@ -137,8 +137,8 @@
137 137
138 //CGAffineTransform transform = CGContextGetCTM(theContext); 138 //CGAffineTransform transform = CGContextGetCTM(theContext);
139 // NSLog(@"transform scale: a:%f b:%f c:%f d:%f tx:%f ty:%f", transform.a, transform.b, transform.c, transform.d, transform.tx, transform.ty); 139 // NSLog(@"transform scale: a:%f b:%f c:%f d:%f tx:%f ty:%f", transform.a, transform.b, transform.c, transform.d, transform.tx, transform.ty);
140 -  
141 - NSString *path = [[NSBundle mainBundle] pathForResource:@"loading" ofType:@"png"]; 140 +
  141 + NSString *path = [[NSBundle bundleForClass:@"RMTiledLayerController"] pathForResource:@"loading" ofType:@"png"];
142 CGDataProviderRef dataProvider = CGDataProviderCreateWithFilename([path UTF8String]); 142 CGDataProviderRef dataProvider = CGDataProviderCreateWithFilename([path UTF8String]);
143 CGImageRef image = CGImageCreateWithPNGDataProvider(dataProvider, NULL, FALSE, kCGRenderingIntentDefault); 143 CGImageRef image = CGImageCreateWithPNGDataProvider(dataProvider, NULL, FALSE, kCGRenderingIntentDefault);
144 CGDataProviderRelease(dataProvider); 144 CGDataProviderRelease(dataProvider);
@@ -20,11 +20,6 @@ @@ -20,11 +20,6 @@
20 289233AE0DB2D0DB0083E9F9 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 289233A90DB2D0DB0083E9F9 /* MainViewController.m */; }; 20 289233AE0DB2D0DB0083E9F9 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 289233A90DB2D0DB0083E9F9 /* MainViewController.m */; };
21 289233AF0DB2D0DB0083E9F9 /* RootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 289233AB0DB2D0DB0083E9F9 /* RootViewController.m */; }; 21 289233AF0DB2D0DB0083E9F9 /* RootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 289233AB0DB2D0DB0083E9F9 /* RootViewController.m */; };
22 289233B00DB2D0DB0083E9F9 /* FlipsideViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 289233AD0DB2D0DB0083E9F9 /* FlipsideViewController.m */; }; 22 289233B00DB2D0DB0083E9F9 /* FlipsideViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 289233AD0DB2D0DB0083E9F9 /* FlipsideViewController.m */; };
23 - 966169E10F671418002587F2 /* loading.png in Resources */ = {isa = PBXBuildFile; fileRef = 966169DC0F671418002587F2 /* loading.png */; };  
24 - 966169E20F671418002587F2 /* marker-blue-withletter.png in Resources */ = {isa = PBXBuildFile; fileRef = 966169DD0F671418002587F2 /* marker-blue-withletter.png */; };  
25 - 966169E30F671418002587F2 /* marker-blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 966169DE0F671418002587F2 /* marker-blue.png */; };  
26 - 966169E40F671418002587F2 /* marker-red-withletter.png in Resources */ = {isa = PBXBuildFile; fileRef = 966169DF0F671418002587F2 /* marker-red-withletter.png */; };  
27 - 966169E50F671418002587F2 /* marker-red.png in Resources */ = {isa = PBXBuildFile; fileRef = 966169E00F671418002587F2 /* marker-red.png */; };  
28 EB8BE5DE0F66AF6300094BF7 /* libMapView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EB8BE5BF0F66AE6300094BF7 /* libMapView.a */; }; 23 EB8BE5DE0F66AF6300094BF7 /* libMapView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EB8BE5BF0F66AE6300094BF7 /* libMapView.a */; };
29 EB8BE5DF0F66AF6300094BF7 /* MapView.app in Resources */ = {isa = PBXBuildFile; fileRef = EB8BE5BD0F66AE6300094BF7 /* MapView.app */; }; 24 EB8BE5DF0F66AF6300094BF7 /* MapView.app in Resources */ = {isa = PBXBuildFile; fileRef = EB8BE5BD0F66AE6300094BF7 /* MapView.app */; };
30 EBDDE0E00F649CE100377FFE /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EBDDE0DF0F649CE100377FFE /* CoreLocation.framework */; }; 25 EBDDE0E00F649CE100377FFE /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EBDDE0DF0F649CE100377FFE /* CoreLocation.framework */; };
@@ -79,11 +74,6 @@ @@ -79,11 +74,6 @@
79 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; 74 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
80 32CA4F630368D1EE00C91783 /* Sample2_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sample2_Prefix.pch; sourceTree = "<group>"; }; 75 32CA4F630368D1EE00C91783 /* Sample2_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sample2_Prefix.pch; sourceTree = "<group>"; };
81 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 76 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
82 - 966169DC0F671418002587F2 /* loading.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loading.png; sourceTree = "<group>"; };  
83 - 966169DD0F671418002587F2 /* marker-blue-withletter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-blue-withletter.png"; sourceTree = "<group>"; };  
84 - 966169DE0F671418002587F2 /* marker-blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-blue.png"; sourceTree = "<group>"; };  
85 - 966169DF0F671418002587F2 /* marker-red-withletter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-red-withletter.png"; sourceTree = "<group>"; };  
86 - 966169E00F671418002587F2 /* marker-red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-red.png"; sourceTree = "<group>"; };  
87 EB8BE5AF0F66AE6300094BF7 /* MapView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MapView.xcodeproj; path = ../MapView/MapView.xcodeproj; sourceTree = SOURCE_ROOT; }; 77 EB8BE5AF0F66AE6300094BF7 /* MapView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MapView.xcodeproj; path = ../MapView/MapView.xcodeproj; sourceTree = SOURCE_ROOT; };
88 EBDDE0DF0F649CE100377FFE /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; 78 EBDDE0DF0F649CE100377FFE /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
89 EBDDE0E10F649CE100377FFE /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 79 EBDDE0E10F649CE100377FFE /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
@@ -159,7 +149,6 @@ @@ -159,7 +149,6 @@
159 080E96DDFE201D6D7F000001 /* Application Controllers */, 149 080E96DDFE201D6D7F000001 /* Application Controllers */,
160 29B97315FDCFA39411CA2CEA /* Other Sources */, 150 29B97315FDCFA39411CA2CEA /* Other Sources */,
161 29B97317FDCFA39411CA2CEA /* Resources */, 151 29B97317FDCFA39411CA2CEA /* Resources */,
162 - 966169DB0F671418002587F2 /* images */,  
163 29B97323FDCFA39411CA2CEA /* Frameworks */, 152 29B97323FDCFA39411CA2CEA /* Frameworks */,
164 19C28FACFE9D520D11CA2CBB /* Products */, 153 19C28FACFE9D520D11CA2CBB /* Products */,
165 ); 154 );
@@ -199,18 +188,6 @@ @@ -199,18 +188,6 @@
199 name = Frameworks; 188 name = Frameworks;
200 sourceTree = "<group>"; 189 sourceTree = "<group>";
201 }; 190 };
202 - 966169DB0F671418002587F2 /* images */ = {  
203 - isa = PBXGroup;  
204 - children = (  
205 - 966169DC0F671418002587F2 /* loading.png */,  
206 - 966169DD0F671418002587F2 /* marker-blue-withletter.png */,  
207 - 966169DE0F671418002587F2 /* marker-blue.png */,  
208 - 966169DF0F671418002587F2 /* marker-red-withletter.png */,  
209 - 966169E00F671418002587F2 /* marker-red.png */,  
210 - );  
211 - path = images;  
212 - sourceTree = "<group>";  
213 - };  
214 EB8BE5B00F66AE6300094BF7 /* Products */ = { 191 EB8BE5B00F66AE6300094BF7 /* Products */ = {
215 isa = PBXGroup; 192 isa = PBXGroup;
216 children = ( 193 children = (
@@ -297,11 +274,6 @@ @@ -297,11 +274,6 @@
297 280E754E0DD40C5E005A515E /* MainView.xib in Resources */, 274 280E754E0DD40C5E005A515E /* MainView.xib in Resources */,
298 280E754F0DD40C5E005A515E /* MainWindow.xib in Resources */, 275 280E754F0DD40C5E005A515E /* MainWindow.xib in Resources */,
299 EB8BE5DF0F66AF6300094BF7 /* MapView.app in Resources */, 276 EB8BE5DF0F66AF6300094BF7 /* MapView.app in Resources */,
300 - 966169E10F671418002587F2 /* loading.png in Resources */,  
301 - 966169E20F671418002587F2 /* marker-blue-withletter.png in Resources */,  
302 - 966169E30F671418002587F2 /* marker-blue.png in Resources */,  
303 - 966169E40F671418002587F2 /* marker-red-withletter.png in Resources */,  
304 - 966169E50F671418002587F2 /* marker-red.png in Resources */,  
305 ); 277 );
306 runOnlyForDeploymentPostprocessing = 0; 278 runOnlyForDeploymentPostprocessing = 0;
307 }; 279 };