Browse files

move from Alpstein to MapBox iOS SDK

  • Loading branch information...
1 parent 61b735a commit 56e0cd8dadcf43043d0ff36e980adb18c462c2a4 @incanus incanus committed May 18, 2012
View
6 .gitmodules
@@ -1,9 +1,9 @@
-[submodule "Externals/alpstein-route-me"]
- path = Externals/alpstein-route-me
- url = https://github.com/mapbox/alpstein-route-me.git
[submodule "Externals/MBProgressHUD"]
path = Externals/MBProgressHUD
url = https://github.com/matej/MBProgressHUD.git
[submodule "Externals/QuadCurveMenu"]
path = Externals/QuadCurveMenu
url = https://github.com/levey/QuadCurveMenu.git
+[submodule "Externals/MapBox-iOS-SDK"]
+ path = Externals/MapBox-iOS-SDK
+ url = git://github.com/mapbox/mapbox-ios-sdk.git
1 Externals/MapBox-iOS-SDK
@@ -0,0 +1 @@
+Subproject commit edd22c9b7c0e94fc64959c0aadc07286fbfc7b13
1 Externals/alpstein-route-me
@@ -1 +0,0 @@
-Subproject commit dce3bbadbccf1a171f0003a07d3cab130009866a
View
78 Mapresent.xcodeproj/project.pbxproj
@@ -15,7 +15,6 @@
DD2B335114CF75AE008DE8CB /* DSMRAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DD2B335014CF75AE008DE8CB /* DSMRAppDelegate.m */; };
DD2B335414CF75AE008DE8CB /* DSMRMainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DD2B335314CF75AE008DE8CB /* DSMRMainViewController.m */; };
DD2B335714CF75AE008DE8CB /* DSMRMainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DD2B335514CF75AE008DE8CB /* DSMRMainViewController.xib */; };
- DD2B373814CF7A4D008DE8CB /* libMapView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD2B373114CF79ED008DE8CB /* libMapView.a */; };
DD2B373A14CF7AAB008DE8CB /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DD2B373914CF7AAB008DE8CB /* libsqlite3.dylib */; };
DD2B373C14CF7AC7008DE8CB /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD2B373B14CF7AC7008DE8CB /* QuartzCore.framework */; };
DD2B373E14CF7BFB008DE8CB /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD2B373D14CF7BFB008DE8CB /* CoreLocation.framework */; };
@@ -40,6 +39,7 @@
DD7779E214EB32D6002089D0 /* DSMRExportModalView.xib in Resources */ = {isa = PBXBuildFile; fileRef = DD7779E114EB32D6002089D0 /* DSMRExportModalView.xib */; };
DD777A6014EC976A002089D0 /* DSMRAudioRecorderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = DD777A5F14EC976A002089D0 /* DSMRAudioRecorderView.xib */; };
DD777A6314EC98BC002089D0 /* DSMRAudioRecorderView.m in Sources */ = {isa = PBXBuildFile; fileRef = DD777A6214EC98BC002089D0 /* DSMRAudioRecorderView.m */; };
+ DD77D4551566D087005CF03A /* libMapView.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD77D44F1566D072005CF03A /* libMapView.a */; };
DD8B4ED314E4A6FA00D15AF9 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD8B4ED214E4A6FA00D15AF9 /* CoreVideo.framework */; };
DD8B4ED514E4A73200D15AF9 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD8B4ED414E4A73200D15AF9 /* CoreMedia.framework */; };
DD8B4F1714E50C2800D15AF9 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD8B4F1614E50C2800D15AF9 /* MediaPlayer.framework */; };
@@ -78,23 +78,23 @@
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
- DD2B373014CF79ED008DE8CB /* PBXContainerItemProxy */ = {
+ DD77D44E1566D072005CF03A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = DD2B372114CF79ED008DE8CB /* MapView.xcodeproj */;
+ containerPortal = DD77D43F1566D071005CF03A /* MapView.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 17F31EFA1331050A00122B16;
remoteInfo = MapView;
};
- DD2B373214CF79ED008DE8CB /* PBXContainerItemProxy */ = {
+ DD77D4501566D072005CF03A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = DD2B372114CF79ED008DE8CB /* MapView.xcodeproj */;
+ containerPortal = DD77D43F1566D071005CF03A /* MapView.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 2BF3078F0F8AC5C0007014EE;
remoteInfo = "Unit Tests";
};
- DD2B373614CF7A08008DE8CB /* PBXContainerItemProxy */ = {
+ DD77D4531566D07F005CF03A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
- containerPortal = DD2B372114CF79ED008DE8CB /* MapView.xcodeproj */;
+ containerPortal = DD77D43F1566D071005CF03A /* MapView.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = B8C974130E8A19B2007D16AD;
remoteInfo = MapView;
@@ -115,7 +115,6 @@
DD2B335214CF75AE008DE8CB /* DSMRMainViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DSMRMainViewController.h; sourceTree = "<group>"; };
DD2B335314CF75AE008DE8CB /* DSMRMainViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DSMRMainViewController.m; sourceTree = "<group>"; };
DD2B335614CF75AE008DE8CB /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/DSMRMainViewController.xib; sourceTree = "<group>"; };
- DD2B372114CF79ED008DE8CB /* MapView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MapView.xcodeproj; path = "Externals/alpstein-route-me/MapView/MapView.xcodeproj"; sourceTree = SOURCE_ROOT; };
DD2B373914CF7AAB008DE8CB /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
DD2B373B14CF7AC7008DE8CB /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
DD2B373D14CF7BFB008DE8CB /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
@@ -144,6 +143,7 @@
DD777A5F14EC976A002089D0 /* DSMRAudioRecorderView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DSMRAudioRecorderView.xib; sourceTree = "<group>"; };
DD777A6114EC98BC002089D0 /* DSMRAudioRecorderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DSMRAudioRecorderView.h; sourceTree = "<group>"; };
DD777A6214EC98BC002089D0 /* DSMRAudioRecorderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DSMRAudioRecorderView.m; sourceTree = "<group>"; };
+ DD77D43F1566D071005CF03A /* MapView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = MapView.xcodeproj; path = "Externals/MapBox-iOS-SDK/MapView/MapView.xcodeproj"; sourceTree = SOURCE_ROOT; };
DD8B4ED214E4A6FA00D15AF9 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
DD8B4ED414E4A73200D15AF9 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
DD8B4F1614E50C2800D15AF9 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
@@ -239,7 +239,7 @@
DD2B373C14CF7AC7008DE8CB /* QuartzCore.framework in Frameworks */,
DD2B334114CF75AE008DE8CB /* UIKit.framework in Frameworks */,
DDDAD26615069283004DDB59 /* libBlocksKit.a in Frameworks */,
- DD2B373814CF7A4D008DE8CB /* libMapView.a in Frameworks */,
+ DD77D4551566D087005CF03A /* libMapView.a in Frameworks */,
DD2B373A14CF7AAB008DE8CB /* libsqlite3.dylib in Frameworks */,
DD9607D114D36FDE00FA2CBA /* libTestFlight.a in Frameworks */,
DDFC94A314F30CD60094E791 /* libz.dylib in Frameworks */,
@@ -318,8 +318,8 @@
DD2B336214CF79BF008DE8CB /* Externals */ = {
isa = PBXGroup;
children = (
- DD2B373514CF79F2008DE8CB /* Alpstein Route-Me */,
DDC6E5A314E5B467000F611E /* BlocksKit */,
+ DD77D43E1566D04C005CF03A /* MapBox iOS SDK */,
DDC6E5A914E5BA2E000F611E /* MBProgressHUD */,
DDBEDB6C14FD62380023C9F8 /* QuadCurveMenu */,
DD9607CC14D36FDE00FA2CBA /* TestFlight SDK */,
@@ -329,23 +329,6 @@
path = Mapresent;
sourceTree = "<group>";
};
- DD2B372214CF79ED008DE8CB /* Products */ = {
- isa = PBXGroup;
- children = (
- DD2B373114CF79ED008DE8CB /* libMapView.a */,
- DD2B373314CF79ED008DE8CB /* RM Unit Tests.app */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- DD2B373514CF79F2008DE8CB /* Alpstein Route-Me */ = {
- isa = PBXGroup;
- children = (
- DD2B372114CF79ED008DE8CB /* MapView.xcodeproj */,
- );
- name = "Alpstein Route-Me";
- sourceTree = "<group>";
- };
DD2B375714CF81F1008DE8CB /* Resources */ = {
isa = PBXGroup;
children = (
@@ -398,6 +381,23 @@
name = Themes;
sourceTree = "<group>";
};
+ DD77D43E1566D04C005CF03A /* MapBox iOS SDK */ = {
+ isa = PBXGroup;
+ children = (
+ DD77D43F1566D071005CF03A /* MapView.xcodeproj */,
+ );
+ name = "MapBox iOS SDK";
+ sourceTree = "<group>";
+ };
+ DD77D4401566D071005CF03A /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ DD77D44F1566D072005CF03A /* libMapView.a */,
+ DD77D4511566D072005CF03A /* RM Unit Tests.app */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
DD96079014D32C2D00FA2CBA /* UIImage-Extensions */ = {
isa = PBXGroup;
children = (
@@ -594,7 +594,7 @@
buildRules = (
);
dependencies = (
- DD2B373714CF7A08008DE8CB /* PBXTargetDependency */,
+ DD77D4541566D07F005CF03A /* PBXTargetDependency */,
);
name = Mapresent;
productName = Mapresent;
@@ -622,8 +622,8 @@
projectDirPath = "";
projectReferences = (
{
- ProductGroup = DD2B372214CF79ED008DE8CB /* Products */;
- ProjectRef = DD2B372114CF79ED008DE8CB /* MapView.xcodeproj */;
+ ProductGroup = DD77D4401566D071005CF03A /* Products */;
+ ProjectRef = DD77D43F1566D071005CF03A /* MapView.xcodeproj */;
},
);
projectRoot = "";
@@ -634,18 +634,18 @@
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
- DD2B373114CF79ED008DE8CB /* libMapView.a */ = {
+ DD77D44F1566D072005CF03A /* libMapView.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libMapView.a;
- remoteRef = DD2B373014CF79ED008DE8CB /* PBXContainerItemProxy */;
+ remoteRef = DD77D44E1566D072005CF03A /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- DD2B373314CF79ED008DE8CB /* RM Unit Tests.app */ = {
+ DD77D4511566D072005CF03A /* RM Unit Tests.app */ = {
isa = PBXReferenceProxy;
fileType = wrapper.application;
path = "RM Unit Tests.app";
- remoteRef = DD2B373214CF79ED008DE8CB /* PBXContainerItemProxy */;
+ remoteRef = DD77D4501566D072005CF03A /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
@@ -724,10 +724,10 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
- DD2B373714CF7A08008DE8CB /* PBXTargetDependency */ = {
+ DD77D4541566D07F005CF03A /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = MapView;
- targetProxy = DD2B373614CF7A08008DE8CB /* PBXContainerItemProxy */;
+ targetProxy = DD77D4531566D07F005CF03A /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
@@ -808,7 +808,7 @@
GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
HEADER_SEARCH_PATHS = (
"\"$(SRCROOT)/Externals/BlocksKit/Header\"/**",
- "\"$(SRCROOT)/Externals/alpstein-route-me/MapView/Map\"/**",
+ "\"$(SRCROOT)/Externals/MapBox-iOS-SDK/MapView/Map\"/**",
);
INFOPLIST_FILE = "Mapresent/Mapresent-Info.plist";
LIBRARY_SEARCH_PATHS = (
@@ -834,7 +834,7 @@
GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
HEADER_SEARCH_PATHS = (
"\"$(SRCROOT)/Externals/BlocksKit/Header\"/**",
- "\"$(SRCROOT)/Externals/alpstein-route-me/MapView/Map\"/**",
+ "\"$(SRCROOT)/Externals/MapBox-iOS-SDK/MapView/Map\"/**",
);
INFOPLIST_FILE = "Mapresent/Mapresent-Info.plist";
LIBRARY_SEARCH_PATHS = (
@@ -885,7 +885,7 @@
GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
HEADER_SEARCH_PATHS = (
"\"$(SRCROOT)/Externals/BlocksKit/Header\"/**",
- "\"$(SRCROOT)/Externals/alpstein-route-me/MapView/Map\"/**",
+ "\"$(SRCROOT)/Externals/MapBox-iOS-SDK/MapView/Map\"/**",
);
INFOPLIST_FILE = "Mapresent/Mapresent-Info.plist";
LIBRARY_SEARCH_PATHS = (
View
12 Mapresent/DSMRMainViewController.m
@@ -17,8 +17,8 @@
#import "DSMRTimelineMarkerView.h"
#import "RMMapView.h"
-#import "RMMBTilesTileSource.h"
-#import "RMTileStreamSource.h"
+#import "RMMBTilesSource.h"
+#import "RMMapBoxSource.h"
#import "MBProgressHUD.h"
@@ -198,8 +198,8 @@ - (void)dealloc
- (void)resetMapView
{
self.mapView.backgroundColor = [UIColor blackColor];
- self.mapView.tileSource = [[RMMBTilesTileSource alloc] initWithTileSetURL:[[NSBundle mainBundle] URLForResource:@"geography-class"
- withExtension:@"mbtiles"]];
+ self.mapView.tileSource = [[RMMBTilesSource alloc] initWithTileSetURL:[[NSBundle mainBundle] URLForResource:@"geography-class"
+ withExtension:@"mbtiles"]];
self.mapView.decelerationMode = RMMapDecelerationFast;
self.mapView.zoom = 2.0;
@@ -433,7 +433,7 @@ - (void)fireMarkerAtIndex:(NSInteger)index
//
dispatch_async(dispatch_get_main_queue(), ^(void)
{
- self.mapView.tileSource = [[RMTileStreamSource alloc] initWithInfo:marker.tileSourceInfo];
+ self.mapView.tileSource = [[RMMapBoxSource alloc] initWithInfo:marker.tileSourceInfo];
});
break;
@@ -871,7 +871,7 @@ - (IBAction)pressedTheme:(id)sender
for (NSMutableDictionary *tileset in [NSJSONSerialization JSONObjectWithData:responseData options:NSJSONReadingMutableContainers error:nil])
{
- RMTileStreamSource *source = [[RMTileStreamSource alloc] initWithInfo:tileset];
+ RMMapBoxSource *source = [[RMMapBoxSource alloc] initWithInfo:tileset];
if ([source coversFullWorld])
{
View
4 Mapresent/DSMRThemePickerController.m
@@ -9,7 +9,7 @@
#import "DSMRThemePickerController.h"
#import "RMMapView.h"
-#import "RMTileStreamSource.h"
+#import "RMMapBoxSource.h"
#import <QuartzCore/QuartzCore.h>
@@ -50,7 +50,7 @@ - (void)viewDidLoad
self.label.text = [self.info objectForKey:@"name"];
self.pageLabel.text = [self.info objectForKey:@"pageNumber"];
- self.mapView.tileSource = [[RMTileStreamSource alloc] initWithInfo:self.info];
+ self.mapView.tileSource = [[RMMapBoxSource alloc] initWithInfo:self.info];
if ([self.info objectForKey:@"center"])
{
View
4 Mapresent/DSMRVideoExporter.m
@@ -12,7 +12,7 @@
#import "RMMapView.h"
#import "RMTileSource.h"
-#import "RMTileStreamSource.h"
+#import "RMMapBoxSource.h"
#import <AVFoundation/AVFoundation.h>
#import <CoreMedia/CoreMedia.h>
@@ -233,7 +233,7 @@ - (void)exportToPath:(NSString *)exportPath
{
[self.mapView removeAllCachedImages];
- self.mapView.tileSource = [[RMTileStreamSource alloc] initWithInfo:marker.tileSourceInfo];
+ self.mapView.tileSource = [[RMMapBoxSource alloc] initWithInfo:marker.tileSourceInfo];
}];
if (self.shouldCancel)

0 comments on commit 56e0cd8

Please sign in to comment.