Skip to content
Browse files

updated mapbox sdk and minor fixes

  • Loading branch information...
1 parent 13ef132 commit fee544a1be2b8f366decefe54779745a09b3b36a @davidchiles committed Nov 30, 2012
View
BIN ...xcodeproj/project.xcworkspace/xcuserdata/David.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
View
69 OSM POI Editor.xcodeproj/xcuserdata/David.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
@@ -214,11 +214,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSM POI Editor/OPEInfoViewController.m"
- timestampString = "375765657.38644"
+ timestampString = "375845522.142041"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "324"
- endingLineNumber = "324"
+ startingLineNumber = "334"
+ endingLineNumber = "334"
landmarkName = "-loggedIn"
landmarkType = "5">
</FileBreakpoint>
@@ -760,11 +760,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSM POI Editor/OPEInfoViewController.m"
- timestampString = "373496867.031686"
+ timestampString = "375845522.142041"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "161"
- endingLineNumber = "161"
+ startingLineNumber = "162"
+ endingLineNumber = "162"
landmarkName = "-signInToOSM"
landmarkType = "5">
</FileBreakpoint>
@@ -773,11 +773,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSM POI Editor/OPEInfoViewController.m"
- timestampString = "375765657.38644"
+ timestampString = "375845522.142041"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "283"
- endingLineNumber = "283"
+ startingLineNumber = "293"
+ endingLineNumber = "293"
landmarkName = "-tableView:didSelectRowAtIndexPath:"
landmarkType = "5">
</FileBreakpoint>
@@ -786,11 +786,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSM POI Editor/OPEInfoViewController.m"
- timestampString = "375765738.368491"
+ timestampString = "375845522.142041"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "371"
- endingLineNumber = "371"
+ startingLineNumber = "381"
+ endingLineNumber = "381"
landmarkName = "-viewDidAppear:"
landmarkType = "5">
</FileBreakpoint>
@@ -799,11 +799,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "OSM POI Editor/OPEInfoViewController.m"
- timestampString = "375765657.38644"
+ timestampString = "375845522.142041"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "315"
- endingLineNumber = "315"
+ startingLineNumber = "325"
+ endingLineNumber = "325"
landmarkName = "-loggedIn"
landmarkType = "5">
</FileBreakpoint>
@@ -1054,6 +1054,45 @@
landmarkName = "+fileFromBundleOrDocumentsForResource:ofType:"
landmarkType = "5">
</FileBreakpoint>
+ <FileBreakpoint
+ shouldBeEnabled = "No"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "OSM POI Editor/OPEOpenMapQuestAerialTileSource.m"
+ timestampString = "375845886.272193"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "17"
+ endingLineNumber = "17"
+ landmarkName = "-init"
+ landmarkType = "5">
+ </FileBreakpoint>
+ <FileBreakpoint
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "OSM POI Editor/OPEInfoViewController.m"
+ timestampString = "375845943.484833"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "363"
+ endingLineNumber = "363"
+ landmarkName = "+getTileSourceFromNumber:"
+ landmarkType = "5">
+ </FileBreakpoint>
+ <FileBreakpoint
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ filePath = "OSM POI Editor/OPEOpenMapQuestAerialTileSource.m"
+ timestampString = "375846039.092228"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "19"
+ endingLineNumber = "19"
+ landmarkName = "-init"
+ landmarkType = "5">
+ </FileBreakpoint>
</FileBreakpoints>
<ExceptionBreakpoints>
<ExceptionBreakpoint
View
1 OSM POI Editor/OPEInfoViewController.h
@@ -37,6 +37,7 @@
@property (nonatomic, strong) UITableView * settingsTableView;
@property (nonatomic, strong) id<OPEInfoViewControllerDelegate> delegate;
@property (nonatomic) int currentNumber;
+@property (nonatomic, strong) NSString * attributionString;
- (IBAction)doneButtonPressed:(id)sender;
View
10 OSM POI Editor/OPEInfoViewController.m
@@ -34,6 +34,7 @@ @implementation OPEInfoViewController
@synthesize delegate;
@synthesize currentNumber;
@synthesize settingsTableView;
+@synthesize attributionString;
- (void)viewDidLoad
{
@@ -204,6 +205,15 @@ -(NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteg
}
}
+-(NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section
+{
+ if(section == 0 && self.attributionString)
+ {
+ return self.attributionString;
+ }
+ return @"";
+}
+
-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
UITableViewCell * cell;
View
14 OSM POI Editor/OPEViewController.m
@@ -584,9 +584,23 @@ -(IBAction)locationButtonPressed:(id)sender
- (IBAction)infoButtonPressed:(id)sender
{
+ NSMutableString *attribution = [NSMutableString string];
+
+ for (id <RMTileSource>tileSource in mapView.tileSources)
+ {
+ if ([tileSource respondsToSelector:@selector(shortAttribution)])
+ {
+ if ([attribution length])
+ [attribution appendString:@" "];
+
+ if ([tileSource shortAttribution])
+ [attribution appendString:[tileSource shortAttribution]];
+ }
+ }
//NSLog(@"info button pressed");
OPEInfoViewController * viewer = [[OPEInfoViewController alloc] init];
[viewer setDelegate:self];
+ viewer.attributionString = attribution;
//[viewer setCurrentNumber:currentTile];
viewer.modalTransitionStyle = UIModalTransitionStyleFlipHorizontal;
viewer.title = @"Settings";
View
2 OSM POI Editor/about.html
@@ -1 +1 @@
-<!--
+<!--
2 lib/mapbox
@@ -1 +1 @@
-Subproject commit d85c61bd3e7adada246fd1a77b7128a90e0de6a4
+Subproject commit 7f9b51b69922f5f3b0582b2fec6e4754ce637ed9

0 comments on commit fee544a

Please sign in to comment.
Something went wrong with that request. Please try again.