尹诚 / 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 @@
2B0C07420F65F1FD00214CE8 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07410F65F1FD00214CE8 /* CoreLocation.framework */; };
2B0C07460F65F20700214CE8 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07450F65F20700214CE8 /* QuartzCore.framework */; };
2B0C074A0F65F23A00214CE8 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07490F65F23A00214CE8 /* libsqlite3.dylib */; };
96616A520F6714D2002587F2 /* loading.png in Resources */ = {isa = PBXBuildFile; fileRef = 96616A4D0F6714D2002587F2 /* loading.png */; };
96616A530F6714D2002587F2 /* marker-blue-withletter.png in Resources */ = {isa = PBXBuildFile; fileRef = 96616A4E0F6714D2002587F2 /* marker-blue-withletter.png */; };
96616A540F6714D2002587F2 /* marker-blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 96616A4F0F6714D2002587F2 /* marker-blue.png */; };
96616A550F6714D2002587F2 /* marker-red-withletter.png in Resources */ = {isa = PBXBuildFile; fileRef = 96616A500F6714D2002587F2 /* marker-red-withletter.png */; };
96616A560F6714D2002587F2 /* marker-red.png in Resources */ = {isa = PBXBuildFile; fileRef = 96616A510F6714D2002587F2 /* marker-red.png */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
... ... @@ -82,11 +77,6 @@
2B0C07490F65F23A00214CE8 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
32CA4F630368D1EE00C91783 /* MapSample_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapSample_Prefix.pch; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
96616A4D0F6714D2002587F2 /* loading.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loading.png; sourceTree = "<group>"; };
96616A4E0F6714D2002587F2 /* marker-blue-withletter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-blue-withletter.png"; sourceTree = "<group>"; };
96616A4F0F6714D2002587F2 /* marker-blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-blue.png"; sourceTree = "<group>"; };
96616A500F6714D2002587F2 /* marker-red-withletter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-red-withletter.png"; sourceTree = "<group>"; };
96616A510F6714D2002587F2 /* marker-red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-red.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
... ... @@ -158,7 +148,6 @@
080E96DDFE201D6D7F000001 /* Application Controllers */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
29B97317FDCFA39411CA2CEA /* Resources */,
96616A4C0F6714D2002587F2 /* images */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
2B0C07410F65F1FD00214CE8 /* CoreLocation.framework */,
... ... @@ -207,18 +196,6 @@
name = Products;
sourceTree = "<group>";
};
96616A4C0F6714D2002587F2 /* images */ = {
isa = PBXGroup;
children = (
96616A4D0F6714D2002587F2 /* loading.png */,
96616A4E0F6714D2002587F2 /* marker-blue-withletter.png */,
96616A4F0F6714D2002587F2 /* marker-blue.png */,
96616A500F6714D2002587F2 /* marker-red-withletter.png */,
96616A510F6714D2002587F2 /* marker-red.png */,
);
path = images;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
... ... @@ -295,11 +272,6 @@
280E754D0DD40C5E005A515E /* FlipsideView.xib in Resources */,
280E754E0DD40C5E005A515E /* MainView.xib in Resources */,
280E754F0DD40C5E005A515E /* MainWindow.xib in Resources */,
96616A520F6714D2002587F2 /* loading.png in Resources */,
96616A530F6714D2002587F2 /* marker-blue-withletter.png in Resources */,
96616A540F6714D2002587F2 /* marker-blue.png in Resources */,
96616A550F6714D2002587F2 /* marker-red-withletter.png in Resources */,
96616A560F6714D2002587F2 /* marker-red.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
... ...
... ... @@ -24,11 +24,6 @@
2B0C07420F65F1FD00214CE8 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07410F65F1FD00214CE8 /* CoreLocation.framework */; };
2B0C07460F65F20700214CE8 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07450F65F20700214CE8 /* QuartzCore.framework */; };
2B0C074A0F65F23A00214CE8 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B0C07490F65F23A00214CE8 /* libsqlite3.dylib */; };
96616A020F671458002587F2 /* loading.png in Resources */ = {isa = PBXBuildFile; fileRef = 966169FD0F671458002587F2 /* loading.png */; };
96616A030F671458002587F2 /* marker-blue-withletter.png in Resources */ = {isa = PBXBuildFile; fileRef = 966169FE0F671458002587F2 /* marker-blue-withletter.png */; };
96616A040F671458002587F2 /* marker-blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 966169FF0F671458002587F2 /* marker-blue.png */; };
96616A050F671458002587F2 /* marker-red-withletter.png in Resources */ = {isa = PBXBuildFile; fileRef = 96616A000F671458002587F2 /* marker-red-withletter.png */; };
96616A060F671458002587F2 /* marker-red.png in Resources */ = {isa = PBXBuildFile; fileRef = 96616A010F671458002587F2 /* marker-red.png */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
... ... @@ -82,11 +77,6 @@
2B0C07490F65F23A00214CE8 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
2BD68E7A0F664657006DE17B /* MapTestbed_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapTestbed_Prefix.pch; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
966169FD0F671458002587F2 /* loading.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loading.png; sourceTree = "<group>"; };
966169FE0F671458002587F2 /* marker-blue-withletter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-blue-withletter.png"; sourceTree = "<group>"; };
966169FF0F671458002587F2 /* marker-blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-blue.png"; sourceTree = "<group>"; };
96616A000F671458002587F2 /* marker-red-withletter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-red-withletter.png"; sourceTree = "<group>"; };
96616A010F671458002587F2 /* marker-red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-red.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
... ... @@ -158,7 +148,6 @@
080E96DDFE201D6D7F000001 /* Application Controllers */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
29B97317FDCFA39411CA2CEA /* Resources */,
966169FC0F671458002587F2 /* images */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
2B0C07410F65F1FD00214CE8 /* CoreLocation.framework */,
... ... @@ -207,22 +196,10 @@
name = Products;
sourceTree = "<group>";
};
966169FC0F671458002587F2 /* images */ = {
isa = PBXGroup;
children = (
966169FD0F671458002587F2 /* loading.png */,
966169FE0F671458002587F2 /* marker-blue-withletter.png */,
966169FF0F671458002587F2 /* marker-blue.png */,
96616A000F671458002587F2 /* marker-red-withletter.png */,
96616A010F671458002587F2 /* marker-red.png */,
);
path = images;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
1D6058900D05DD3D006BFB54 /* SimpleMap */ = {
1D6058900D05DD3D006BFB54 /* MapTestbed */ = {
isa = PBXNativeTarget;
buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "MapTestbed" */;
buildPhases = (
... ... @@ -265,7 +242,7 @@
);
projectRoot = "";
targets = (
1D6058900D05DD3D006BFB54 /* SimpleMap */,
1D6058900D05DD3D006BFB54 /* MapTestbed */,
);
};
/* End PBXProject section */
... ... @@ -295,11 +272,6 @@
280E754D0DD40C5E005A515E /* FlipsideView.xib in Resources */,
280E754E0DD40C5E005A515E /* MainView.xib in Resources */,
280E754F0DD40C5E005A515E /* MainWindow.xib in Resources */,
96616A020F671458002587F2 /* loading.png in Resources */,
96616A030F671458002587F2 /* marker-blue-withletter.png in Resources */,
96616A040F671458002587F2 /* marker-blue.png in Resources */,
96616A050F671458002587F2 /* marker-red-withletter.png in Resources */,
96616A060F671458002587F2 /* marker-red.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
... ...
... ... @@ -38,7 +38,7 @@ static RMConfiguration* RMConfigurationSharedInstance = nil;
if (RMConfigurationSharedInstance != nil) return RMConfigurationSharedInstance;
RMConfigurationSharedInstance = [[RMConfiguration alloc]
initWithPath: [[NSBundle mainBundle] pathForResource:@"routeme" ofType:@"plist"]];
initWithPath: [[NSBundle bundleForClass:@"RMConfiguration"] pathForResource:@"routeme" ofType:@"plist"]];
return RMConfigurationSharedInstance;
}
... ...
... ... @@ -185,9 +185,11 @@ enum {
- (void)moveBy: (CGSize) delta;
- (void)zoomByFactor: (float) zoomFactor near:(CGPoint) center;
- (void)zoomInToNextNativeZoomAt:(CGPoint) pivot animated:(BOOL) animated;
- (void)zoomOutToNextNativeZoomAt:(CGPoint) pivot animated:(BOOL) animated;
- (void)zoomByFactor: (float) zoomFactor near:(CGPoint) center animated:(BOOL) animated;
- (void)zoomInToNextNativeZoomAt:(CGPoint) pivot;
- (void)zoomOutToNextNativeZoomAt:(CGPoint) pivot;
- (float)adjustZoomForBoundingMask:(float)zoomFactor;
- (void)adjustMapPlacementWithScale:(float)aScale;
- (void)setZoomBounds:(float)aMinZoom maxZoom:(float)aMaxZoom;
... ...
... ... @@ -246,7 +246,7 @@ static CGImageRef _markerBlue = nil;
+ (CGImageRef) loadPNGFromBundle: (NSString *)filename
{
NSString *path = [[NSBundle mainBundle] pathForResource:filename ofType:@"png"];
NSString *path = [[NSBundle bundleForClass:@"RMMarker"] pathForResource:filename ofType:@"png"];
CGDataProviderRef dataProvider = CGDataProviderCreateWithFilename([path UTF8String]);
CGImageRef image = CGImageCreateWithPNGDataProvider(dataProvider, NULL, FALSE, kCGRenderingIntentDefault);
[NSMakeCollectable(image) autorelease];
... ...
... ... @@ -48,7 +48,7 @@ static RMTileImage *_loadingTile = nil;
return _loadingTile;
RMTile t = RMTileDummy();
NSString* file = [[NSBundle mainBundle] pathForResource:@"loading" ofType:@"png"];
NSString* file = [[NSBundle bundleForClass:@"RMTileProxy"] pathForResource:@"loading" ofType:@"png"];
_loadingTile = [[RMTileImage imageWithTile:t FromFile:file] retain];
return _loadingTile;
// return nil;
... ...
... ... @@ -137,8 +137,8 @@
//CGAffineTransform transform = CGContextGetCTM(theContext);
// 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);
NSString *path = [[NSBundle mainBundle] pathForResource:@"loading" ofType:@"png"];
NSString *path = [[NSBundle bundleForClass:@"RMTiledLayerController"] pathForResource:@"loading" ofType:@"png"];
CGDataProviderRef dataProvider = CGDataProviderCreateWithFilename([path UTF8String]);
CGImageRef image = CGImageCreateWithPNGDataProvider(dataProvider, NULL, FALSE, kCGRenderingIntentDefault);
CGDataProviderRelease(dataProvider);
... ...
... ... @@ -20,11 +20,6 @@
289233AE0DB2D0DB0083E9F9 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 289233A90DB2D0DB0083E9F9 /* MainViewController.m */; };
289233AF0DB2D0DB0083E9F9 /* RootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 289233AB0DB2D0DB0083E9F9 /* RootViewController.m */; };
289233B00DB2D0DB0083E9F9 /* FlipsideViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 289233AD0DB2D0DB0083E9F9 /* FlipsideViewController.m */; };
966169E10F671418002587F2 /* loading.png in Resources */ = {isa = PBXBuildFile; fileRef = 966169DC0F671418002587F2 /* loading.png */; };
966169E20F671418002587F2 /* marker-blue-withletter.png in Resources */ = {isa = PBXBuildFile; fileRef = 966169DD0F671418002587F2 /* marker-blue-withletter.png */; };
966169E30F671418002587F2 /* marker-blue.png in Resources */ = {isa = PBXBuildFile; fileRef = 966169DE0F671418002587F2 /* marker-blue.png */; };
966169E40F671418002587F2 /* marker-red-withletter.png in Resources */ = {isa = PBXBuildFile; fileRef = 966169DF0F671418002587F2 /* marker-red-withletter.png */; };
966169E50F671418002587F2 /* marker-red.png in Resources */ = {isa = PBXBuildFile; fileRef = 966169E00F671418002587F2 /* marker-red.png */; };
EB8BE5DE0F66AF6300094BF7 /* libMapView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EB8BE5BF0F66AE6300094BF7 /* libMapView.a */; };
EB8BE5DF0F66AF6300094BF7 /* MapView.app in Resources */ = {isa = PBXBuildFile; fileRef = EB8BE5BD0F66AE6300094BF7 /* MapView.app */; };
EBDDE0E00F649CE100377FFE /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EBDDE0DF0F649CE100377FFE /* CoreLocation.framework */; };
... ... @@ -79,11 +74,6 @@
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
32CA4F630368D1EE00C91783 /* Sample2_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sample2_Prefix.pch; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
966169DC0F671418002587F2 /* loading.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loading.png; sourceTree = "<group>"; };
966169DD0F671418002587F2 /* marker-blue-withletter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-blue-withletter.png"; sourceTree = "<group>"; };
966169DE0F671418002587F2 /* marker-blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-blue.png"; sourceTree = "<group>"; };
966169DF0F671418002587F2 /* marker-red-withletter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-red-withletter.png"; sourceTree = "<group>"; };
966169E00F671418002587F2 /* marker-red.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "marker-red.png"; sourceTree = "<group>"; };
EB8BE5AF0F66AE6300094BF7 /* MapView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MapView.xcodeproj; path = ../MapView/MapView.xcodeproj; sourceTree = SOURCE_ROOT; };
EBDDE0DF0F649CE100377FFE /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
EBDDE0E10F649CE100377FFE /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
... ... @@ -159,7 +149,6 @@
080E96DDFE201D6D7F000001 /* Application Controllers */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
29B97317FDCFA39411CA2CEA /* Resources */,
966169DB0F671418002587F2 /* images */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
);
... ... @@ -199,18 +188,6 @@
name = Frameworks;
sourceTree = "<group>";
};
966169DB0F671418002587F2 /* images */ = {
isa = PBXGroup;
children = (
966169DC0F671418002587F2 /* loading.png */,
966169DD0F671418002587F2 /* marker-blue-withletter.png */,
966169DE0F671418002587F2 /* marker-blue.png */,
966169DF0F671418002587F2 /* marker-red-withletter.png */,
966169E00F671418002587F2 /* marker-red.png */,
);
path = images;
sourceTree = "<group>";
};
EB8BE5B00F66AE6300094BF7 /* Products */ = {
isa = PBXGroup;
children = (
... ... @@ -297,11 +274,6 @@
280E754E0DD40C5E005A515E /* MainView.xib in Resources */,
280E754F0DD40C5E005A515E /* MainWindow.xib in Resources */,
EB8BE5DF0F66AF6300094BF7 /* MapView.app in Resources */,
966169E10F671418002587F2 /* loading.png in Resources */,
966169E20F671418002587F2 /* marker-blue-withletter.png in Resources */,
966169E30F671418002587F2 /* marker-blue.png in Resources */,
966169E40F671418002587F2 /* marker-red-withletter.png in Resources */,
966169E50F671418002587F2 /* marker-red.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
... ...