尹诚 / Mapbox-iOS-SDK · Commits

Go to a project

Authored by Justin R. Miller
Commit cffd593b5d4ff2503737a0157bf36b91b3391a11 1 parent b0638797

company rename in contents

Inline Side-by-side
Showing 23 changed files with 167 additions and 167 deletions
1 -MapBox iOS SDK copyright (c) 2012, MapBox. 1 +Mapbox iOS SDK copyright (c) 2012-2013, Mapbox.
2 2
3 The Route-Me library is copyright (c) 2008-2012, Route-Me Contributors 3 The Route-Me library is copyright (c) 2008-2012, Route-Me Contributors
4 All rights reserved. 4 All rights reserved.
1 Pod::Spec.new do |m| 1 Pod::Spec.new do |m|
2 2
3 - m.name = 'MapBox' 3 + m.name = 'Mapbox'
4 m.version = '1.0.0' 4 m.version = '1.0.0'
5 5
6 m.summary = 'Open source alternative to MapKit.' 6 m.summary = 'Open source alternative to MapKit.'
7 m.description = 'Open source alternative to MapKit supporting custom tile sources, offline use, and complete cache control.' 7 m.description = 'Open source alternative to MapKit supporting custom tile sources, offline use, and complete cache control.'
8 m.homepage = 'http://mapbox.com/mobile' 8 m.homepage = 'http://mapbox.com/mobile'
9 m.license = 'BSD' 9 m.license = 'BSD'
10 - m.author = { 'MapBox' => 'ios@mapbox.com' } 10 + m.author = { 'Mapbox' => 'ios@mapbox.com' }
11 m.screenshot = 'https://raw.github.com/mapbox/mapbox-ios-sdk/packaging/screenshot.png' 11 m.screenshot = 'https://raw.github.com/mapbox/mapbox-ios-sdk/packaging/screenshot.png'
12 12
13 m.source = { :git => 'https://github.com/mapbox/mapbox-ios-sdk.git', :branch => 'develop' } 13 m.source = { :git => 'https://github.com/mapbox/mapbox-ios-sdk.git', :branch => 'develop' }
@@ -25,18 +25,18 @@ Pod::Spec.new do |m| @@ -25,18 +25,18 @@ Pod::Spec.new do |m|
25 Dir.chdir(pod.root) do 25 Dir.chdir(pod.root) do
26 command = "xcodebuild -project MapView/MapView.xcodeproj -target Resources CONFIGURATION_BUILD_DIR=../Resources 2>&1 > /dev/null" 26 command = "xcodebuild -project MapView/MapView.xcodeproj -target Resources CONFIGURATION_BUILD_DIR=../Resources 2>&1 > /dev/null"
27 unless system(command) 27 unless system(command)
28 - raise ::Pod::Informative, "Failed to generate MapBox resources bundle" 28 + raise ::Pod::Informative, "Failed to generate Mapbox resources bundle"
29 end 29 end
30 end 30 end
31 end 31 end
32 32
33 - m.resource = 'Resources/MapBox.bundle' 33 + m.resource = 'Resources/Mapbox.bundle'
34 34
35 m.documentation = { 35 m.documentation = {
36 :html => 'http://mapbox.com/mapbox-ios-sdk/api/', 36 :html => 'http://mapbox.com/mapbox-ios-sdk/api/',
37 :appledoc => [ 37 :appledoc => [
38 - '--project-company', 'MapBox',  
39 - '--docset-copyright', 'MapBox', 38 + '--project-company', 'Mapbox',
  39 + '--docset-copyright', 'Mapbox',
40 '--no-keep-undocumented-objects', 40 '--no-keep-undocumented-objects',
41 '--no-keep-undocumented-members', 41 '--no-keep-undocumented-members',
42 '--ignore', '.c', 42 '--ignore', '.c',
@@ -74,7 +74,7 @@ Pod::Spec.new do |m| @@ -74,7 +74,7 @@ Pod::Spec.new do |m|
74 74
75 m.libraries = 'Proj4', 'sqlite3', 'z' 75 m.libraries = 'Proj4', 'sqlite3', 'z'
76 76
77 - m.xcconfig = { 'OTHER_LDFLAGS' => '-ObjC', 'LIBRARY_SEARCH_PATHS' => '"${PODS_ROOT}/MapBox/Proj4"' } 77 + m.xcconfig = { 'OTHER_LDFLAGS' => '-ObjC', 'LIBRARY_SEARCH_PATHS' => '"${PODS_ROOT}/Mapbox/Proj4"' }
78 78
79 m.preserve_paths = 'Proj4/libProj4.a', 'MapView/MapView.xcodeproj', 'MapView/Map/Resources' 79 m.preserve_paths = 'Proj4/libProj4.a', 'MapView/MapView.xcodeproj', 'MapView/Map/Resources'
80 80
1 // 1 //
2 -// MapBox.h 2 +// Mapbox.h
3 // 3 //
4 -// Copyright (c) 2008-2013, Route-Me Contributors 4 +// Copyright (c) 2008-2013, Mapbox & Route-Me Contributors
5 // All rights reserved. 5 // All rights reserved.
6 // 6 //
7 // Redistribution and use in source and binary forms, with or without 7 // Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 #import "RMDatabaseCache.h" 38 #import "RMDatabaseCache.h"
39 #import "RMInteractiveSource.h" 39 #import "RMInteractiveSource.h"
40 #import "RMMBTilesSource.h" 40 #import "RMMBTilesSource.h"
41 -#import "RMMapBoxSource.h" 41 +#import "RMMapboxSource.h"
42 #import "RMMapView.h" 42 #import "RMMapView.h"
43 #import "RMMapViewDelegate.h" 43 #import "RMMapViewDelegate.h"
44 #import "RMMarker.h" 44 #import "RMMarker.h"
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 // MapView 3 // MapView
4 // 4 //
5 // Created by Justin Miller on 6/19/12. 5 // Created by Justin Miller on 6/19/12.
6 -// Copyright (c) 2012 MapBox / Development Seed. All rights reserved. 6 +// Copyright (c) 2012-2013 Mapbox. All rights reserved.
7 // 7 //
8 8
9 #import <UIKit/UIKit.h> 9 #import <UIKit/UIKit.h>
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 // MapView 3 // MapView
4 // 4 //
5 // Created by Justin Miller on 6/19/12. 5 // Created by Justin Miller on 6/19/12.
6 -// Copyright (c) 2012 MapBox / Development Seed. All rights reserved. 6 +// Copyright (c) 2012-2013 Mapbox. All rights reserved.
7 // 7 //
8 8
9 #import "RMAttributionViewController.h" 9 #import "RMAttributionViewController.h"
@@ -133,7 +133,7 @@ @@ -133,7 +133,7 @@
133 { 133 {
134 // add SDK info 134 // add SDK info
135 // 135 //
136 - [attribution insertString:[NSString stringWithFormat:@"%@ uses the MapBox iOS SDK © 2013 MapBox, Inc.<br/><a href='http://mapbox.com/mapbox-ios-sdk'>More</a><br/><br/>", [[[NSBundle mainBundle] infoDictionary] valueForKey:@"CFBundleDisplayName"]] atIndex:0]; 136 + [attribution insertString:[NSString stringWithFormat:@"%@ uses the Mapbox iOS SDK © 2013 Mapbox, Inc.<br/><a href='http://mapbox.com/mapbox-ios-sdk'>More</a><br/><br/>", [[[NSBundle mainBundle] infoDictionary] valueForKey:@"CFBundleDisplayName"]] atIndex:0];
137 137
138 // add tinted logo 138 // add tinted logo
139 // 139 //
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 46
47 /** Access and change the global user agent for HTTP requests using the library. 47 /** Access and change the global user agent for HTTP requests using the library.
48 * 48 *
49 -* If unset, defaults to `MapBox iOS SDK` followed by generic hardware model and software version information. 49 +* If unset, defaults to `Mapbox iOS SDK` followed by generic hardware model and software version information.
50 * 50 *
51 * Example: `MyMapApp/1.2` */ 51 * Example: `MyMapApp/1.2` */
52 @property (nonatomic, retain) NSString *userAgent; 52 @property (nonatomic, retain) NSString *userAgent;
@@ -101,7 +101,7 @@ static RMConfiguration *RMConfigurationSharedInstance = nil; @@ -101,7 +101,7 @@ static RMConfiguration *RMConfigurationSharedInstance = nil;
101 if (!(self = [super init])) 101 if (!(self = [super init]))
102 return nil; 102 return nil;
103 103
104 - _userAgent = [NSString stringWithFormat:@"MapBox iOS SDK (%@/%@)", [[UIDevice currentDevice] model], [[UIDevice currentDevice] systemVersion]]; 104 + _userAgent = [NSString stringWithFormat:@"Mapbox iOS SDK (%@/%@)", [[UIDevice currentDevice] model], [[UIDevice currentDevice] systemVersion]];
105 105
106 if (path == nil) 106 if (path == nil)
107 { 107 {
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 // RMInteractiveSource.h 2 // RMInteractiveSource.h
3 // 3 //
4 // Created by Justin R. Miller on 6/22/11. 4 // Created by Justin R. Miller on 6/22/11.
5 -// Copyright 2012 MapBox. 5 +// Copyright 2012-2013 Mapbox.
6 // All rights reserved. 6 // All rights reserved.
7 // 7 //
8 // Redistribution and use in source and binary forms, with or without 8 // Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 // notice, this list of conditions and the following disclaimer in the 15 // notice, this list of conditions and the following disclaimer in the
16 // documentation and/or other materials provided with the distribution. 16 // documentation and/or other materials provided with the distribution.
17 // 17 //
18 -// * Neither the name of MapBox, nor the names of its contributors may be 18 +// * Neither the name of Mapbox, nor the names of its contributors may be
19 // used to endorse or promote products derived from this software 19 // used to endorse or promote products derived from this software
20 // without specific prior written permission. 20 // without specific prior written permission.
21 // 21 //
@@ -35,14 +35,14 @@ @@ -35,14 +35,14 @@
35 35
36 #import "RMMapView.h" 36 #import "RMMapView.h"
37 #import "RMMBTilesSource.h" 37 #import "RMMBTilesSource.h"
38 -#import "RMMapBoxSource.h" 38 +#import "RMMapboxSource.h"
39 39
40 typedef enum : NSUInteger { 40 typedef enum : NSUInteger {
41 RMInteractiveSourceOutputTypeTeaser = 0, 41 RMInteractiveSourceOutputTypeTeaser = 0,
42 RMInteractiveSourceOutputTypeFull = 1, 42 RMInteractiveSourceOutputTypeFull = 1,
43 } RMInteractiveSourceOutputType; 43 } RMInteractiveSourceOutputType;
44 44
45 -/** Developers can import RMInteractiveSource in order to enable embedded interactivity in their RMMapView, RMMBTilesSource, and RMMapBoxSource objects. Interactivity is based on the UTFGrid specification, which is a space-efficient way to encode many arbitrary values for pixel coordinates at every zoom level, allowing later retrieval based on user events on those coordinates. For example, the user touching a pixel in Spain could trigger retrieval of Spain's flag image for display. 45 +/** Developers can import RMInteractiveSource in order to enable embedded interactivity in their RMMapView, RMMBTilesSource, and RMMapboxSource objects. Interactivity is based on the UTFGrid specification, which is a space-efficient way to encode many arbitrary values for pixel coordinates at every zoom level, allowing later retrieval based on user events on those coordinates. For example, the user touching a pixel in Spain could trigger retrieval of Spain's flag image for display.
46 * 46 *
47 * Interactive map views adopt the RMInteractiveMapView protocol. 47 * Interactive map views adopt the RMInteractiveMapView protocol.
48 * 48 *
@@ -75,7 +75,7 @@ typedef enum : NSUInteger { @@ -75,7 +75,7 @@ typedef enum : NSUInteger {
75 75
76 #pragma mark - 76 #pragma mark -
77 77
78 -/** Developers can import RMInteractiveSource in order to enable embedded interactivity in their RMMapView, RMMBTilesSource, and RMMapBoxSource objects. Interactivity is based on the [UTFGrid specification](https://github.com/mapbox/utfgrid-spec) and is best described by [this web demo](http://mapbox.com/demo/visiblemap/). 78 +/** Developers can import RMInteractiveSource in order to enable embedded interactivity in their RMMapView, RMMBTilesSource, and RMMapboxSource objects. Interactivity is based on the [UTFGrid specification](https://github.com/mapbox/utfgrid-spec) and is best described by [this web demo](http://mapbox.com/demo/visiblemap/).
79 * 79 *
80 * Interactive tile sources adopt the RMInteractiveSource protocol. 80 * Interactive tile sources adopt the RMInteractiveSource protocol.
81 * 81 *
@@ -109,7 +109,7 @@ typedef enum : NSUInteger { @@ -109,7 +109,7 @@ typedef enum : NSUInteger {
109 109
110 #pragma mark - 110 #pragma mark -
111 111
112 -@interface RMMapBoxSource (RMInteractiveSource) <RMInteractiveSource> 112 +@interface RMMapboxSource (RMInteractiveSource) <RMInteractiveSource>
113 113
114 - (BOOL)supportsInteractivity; 114 - (BOOL)supportsInteractivity;
115 - (NSString *)formattedOutputOfType:(RMInteractiveSourceOutputType)outputType forPoint:(CGPoint)point inMapView:(RMMapView *)mapView; 115 - (NSString *)formattedOutputOfType:(RMInteractiveSourceOutputType)outputType forPoint:(CGPoint)point inMapView:(RMMapView *)mapView;
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 // RMInteractiveSource.m 2 // RMInteractiveSource.m
3 // 3 //
4 // Created by Justin R. Miller on 6/22/11. 4 // Created by Justin R. Miller on 6/22/11.
5 -// Copyright 2012 MapBox. 5 +// Copyright 2012-2013 Mapbox.
6 // All rights reserved. 6 // All rights reserved.
7 // 7 //
8 // Redistribution and use in source and binary forms, with or without 8 // Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 // notice, this list of conditions and the following disclaimer in the 15 // notice, this list of conditions and the following disclaimer in the
16 // documentation and/or other materials provided with the distribution. 16 // documentation and/or other materials provided with the distribution.
17 // 17 //
18 -// * Neither the name of MapBox, nor the names of its contributors may be 18 +// * Neither the name of Mapbox, nor the names of its contributors may be
19 // used to endorse or promote products derived from this software 19 // used to endorse or promote products derived from this software
20 // without specific prior written permission. 20 // without specific prior written permission.
21 // 21 //
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 // 77 //
78 for (id <RMTileSource>source in [[self.tileSources reverseObjectEnumerator] allObjects]) 78 for (id <RMTileSource>source in [[self.tileSources reverseObjectEnumerator] allObjects])
79 { 79 {
80 - if (([source isKindOfClass:[RMMBTilesSource class]] || [source isKindOfClass:[RMMapBoxSource class]]) && 80 + if (([source isKindOfClass:[RMMBTilesSource class]] || [source isKindOfClass:[RMMapboxSource class]]) &&
81 [source conformsToProtocol:@protocol(RMInteractiveSource)] && 81 [source conformsToProtocol:@protocol(RMInteractiveSource)] &&
82 [(id <RMInteractiveSource>)source supportsInteractivity]) 82 [(id <RMInteractiveSource>)source supportsInteractivity])
83 { 83 {
@@ -160,7 +160,7 @@ RMTilePoint RMInteractiveSourceNormalizedTilePointForMapView(CGPoint point, RMMa @@ -160,7 +160,7 @@ RMTilePoint RMInteractiveSourceNormalizedTilePointForMapView(CGPoint point, RMMa
160 // 160 //
161 id <RMTileSource>interactiveSource = [mapView interactiveTileSource]; 161 id <RMTileSource>interactiveSource = [mapView interactiveTileSource];
162 162
163 - if (([interactiveSource isKindOfClass:[RMMapBoxSource class]] && [((RMMapBoxSource *)interactiveSource).infoDictionary objectForKey:@"scheme"] && [[((RMMapBoxSource *)interactiveSource).infoDictionary objectForKey:@"scheme"] isEqual:@"tms"]) || [interactiveSource isKindOfClass:[RMMBTilesSource class]]) 163 + if (([interactiveSource isKindOfClass:[RMMapboxSource class]] && [((RMMapboxSource *)interactiveSource).infoDictionary objectForKey:@"scheme"] && [[((RMMapboxSource *)interactiveSource).infoDictionary objectForKey:@"scheme"] isEqual:@"tms"]) || [interactiveSource isKindOfClass:[RMMBTilesSource class]])
164 { 164 {
165 tileY = pow(2.0, tileZoom) - tileY - 1.0; 165 tileY = pow(2.0, tileZoom) - tileY - 1.0;
166 } 166 }
@@ -487,16 +487,16 @@ RMTilePoint RMInteractiveSourceNormalizedTilePointForMapView(CGPoint point, RMMa @@ -487,16 +487,16 @@ RMTilePoint RMInteractiveSourceNormalizedTilePointForMapView(CGPoint point, RMMa
487 487
488 @end 488 @end
489 489
490 -#pragma mark - MapBox 490 +#pragma mark - Mapbox
491 491
492 -@interface RMMapBoxSource (RMInteractiveSourcePrivate) <RMInteractiveSourcePrivate> 492 +@interface RMMapboxSource (RMInteractiveSourcePrivate) <RMInteractiveSourcePrivate>
493 493
494 - (NSDictionary *)interactivityDictionaryForPoint:(CGPoint)point inMapView:(RMMapView *)mapView; 494 - (NSDictionary *)interactivityDictionaryForPoint:(CGPoint)point inMapView:(RMMapView *)mapView;
495 - (NSString *)interactivityFormatterTemplate; 495 - (NSString *)interactivityFormatterTemplate;
496 496
497 @end 497 @end
498 498
499 -@implementation RMMapBoxSource (RMInteractiveSource) 499 +@implementation RMMapboxSource (RMInteractiveSource)
500 500
501 - (NSString *)description 501 - (NSString *)description
502 { 502 {
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 // RMMBTilesSource.h 2 // RMMBTilesSource.h
3 // 3 //
4 // Created by Justin R. Miller on 6/18/10. 4 // Created by Justin R. Miller on 6/18/10.
5 -// Copyright 2012 MapBox. 5 +// Copyright 2012-2013 Mapbox.
6 // All rights reserved. 6 // All rights reserved.
7 // 7 //
8 // Redistribution and use in source and binary forms, with or without 8 // Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 // notice, this list of conditions and the following disclaimer in the 15 // notice, this list of conditions and the following disclaimer in the
16 // documentation and/or other materials provided with the distribution. 16 // documentation and/or other materials provided with the distribution.
17 // 17 //
18 -// * Neither the name of MapBox, nor the names of its contributors may be 18 +// * Neither the name of Mapbox, nor the names of its contributors may be
19 // used to endorse or promote products derived from this software 19 // used to endorse or promote products derived from this software
20 // without specific prior written permission. 20 // without specific prior written permission.
21 // 21 //
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 // RMMBTilesSource.m 2 // RMMBTilesSource.m
3 // 3 //
4 // Created by Justin R. Miller on 6/18/10. 4 // Created by Justin R. Miller on 6/18/10.
5 -// Copyright 2012 MapBox. 5 +// Copyright 2012-2013 Mapbox.
6 // All rights reserved. 6 // All rights reserved.
7 // 7 //
8 // Redistribution and use in source and binary forms, with or without 8 // Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 // notice, this list of conditions and the following disclaimer in the 15 // notice, this list of conditions and the following disclaimer in the
16 // documentation and/or other materials provided with the distribution. 16 // documentation and/or other materials provided with the distribution.
17 // 17 //
18 -// * Neither the name of MapBox, nor the names of its contributors may be 18 +// * Neither the name of Mapbox, nor the names of its contributors may be
19 // used to endorse or promote products derived from this software 19 // used to endorse or promote products derived from this software
20 // without specific prior written permission. 20 // without specific prior written permission.
21 // 21 //
1 // 1 //
2 -// RMMapBoxSource.h 2 +// RMMapboxSource.h
3 // 3 //
4 // Created by Justin R. Miller on 5/17/11. 4 // Created by Justin R. Miller on 5/17/11.
5 -// Copyright 2012 MapBox. 5 +// Copyright 2012-2013 Mapbox.
6 // All rights reserved. 6 // All rights reserved.
7 // 7 //
8 // Redistribution and use in source and binary forms, with or without 8 // Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 // notice, this list of conditions and the following disclaimer in the 15 // notice, this list of conditions and the following disclaimer in the
16 // documentation and/or other materials provided with the distribution. 16 // documentation and/or other materials provided with the distribution.
17 // 17 //
18 -// * Neither the name of MapBox, nor the names of its contributors may be 18 +// * Neither the name of Mapbox, nor the names of its contributors may be
19 // used to endorse or promote products derived from this software 19 // used to endorse or promote products derived from this software
20 // without specific prior written permission. 20 // without specific prior written permission.
21 // 21 //
@@ -33,48 +33,48 @@ @@ -33,48 +33,48 @@
33 33
34 #import "RMAbstractWebMapSource.h" 34 #import "RMAbstractWebMapSource.h"
35 35
36 -#define kMapBoxDefaultTileSize 256  
37 -#define kMapBoxDefaultMinTileZoom 0  
38 -#define kMapBoxDefaultMaxTileZoom 18  
39 -#define kMapBoxDefaultLatLonBoundingBox ((RMSphericalTrapezium){ .northEast = { .latitude = 90, .longitude = 180 }, \ 36 +#define kMapboxDefaultTileSize 256
  37 +#define kMapboxDefaultMinTileZoom 0
  38 +#define kMapboxDefaultMaxTileZoom 18
  39 +#define kMapboxDefaultLatLonBoundingBox ((RMSphericalTrapezium){ .northEast = { .latitude = 90, .longitude = 180 }, \
40 .southWest = { .latitude = -90, .longitude = -180 } }) 40 .southWest = { .latitude = -90, .longitude = -180 } })
41 41
42 -#define kMapBoxPlaceholderMapID @"examples.map-z2effxa8" 42 +#define kMapboxPlaceholderMapID @"examples.map-z2effxa8"
43 43
44 // constants for the image quality API (see http://mapbox.com/developers/api/#image_quality) 44 // constants for the image quality API (see http://mapbox.com/developers/api/#image_quality)
45 typedef enum : NSUInteger { 45 typedef enum : NSUInteger {
46 - RMMapBoxSourceQualityFull = 0, // default  
47 - RMMapBoxSourceQualityPNG32 = 1, // 32 color indexed PNG  
48 - RMMapBoxSourceQualityPNG64 = 2, // 64 color indexed PNG  
49 - RMMapBoxSourceQualityPNG128 = 3, // 128 color indexed PNG  
50 - RMMapBoxSourceQualityPNG256 = 4, // 256 color indexed PNG  
51 - RMMapBoxSourceQualityJPEG70 = 5, // 70% quality JPEG  
52 - RMMapBoxSourceQualityJPEG80 = 6, // 80% quality JPEG  
53 - RMMapBoxSourceQualityJPEG90 = 7 // 90% quality JPEG  
54 -} RMMapBoxSourceQuality; 46 + RMMapboxSourceQualityFull = 0, // default
  47 + RMMapboxSourceQualityPNG32 = 1, // 32 color indexed PNG
  48 + RMMapboxSourceQualityPNG64 = 2, // 64 color indexed PNG
  49 + RMMapboxSourceQualityPNG128 = 3, // 128 color indexed PNG
  50 + RMMapboxSourceQualityPNG256 = 4, // 256 color indexed PNG
  51 + RMMapboxSourceQualityJPEG70 = 5, // 70% quality JPEG
  52 + RMMapboxSourceQualityJPEG80 = 6, // 80% quality JPEG
  53 + RMMapboxSourceQualityJPEG90 = 7 // 90% quality JPEG
  54 +} RMMapboxSourceQuality;
55 55
56 @class RMMapView; 56 @class RMMapView;
57 57
58 -/** An RMMapBoxSource is used to display map tiles from a network-based map hosted on [MapBox](http://mapbox.com/plans) or the open source [TileStream](https://github.com/mapbox/tilestream) software. Maps are referenced by their MapBox map ID or by a file or URL containing [TileJSON](http://mapbox.com/developers/tilejson/). */  
59 -@interface RMMapBoxSource : RMAbstractWebMapSource 58 +/** An RMMapboxSource is used to display map tiles from a network-based map hosted on [Mapbox](http://mapbox.com/plans) or the open source [TileStream](https://github.com/mapbox/tilestream) software. Maps are referenced by their Mapbox map ID or by a file or URL containing [TileJSON](http://mapbox.com/developers/tilejson/). */
  59 +@interface RMMapboxSource : RMAbstractWebMapSource
60 60
61 /** @name Creating Tile Sources */ 61 /** @name Creating Tile Sources */
62 62
63 -/** Initialize a tile source using the MapBox map ID. 63 +/** Initialize a tile source using the Mapbox map ID.
64 * 64 *
65 * This method requires a network connection in order to download the TileJSON used to define the tile source. 65 * This method requires a network connection in order to download the TileJSON used to define the tile source.
66 * 66 *
67 -* @param mapID The MapBox map ID string, typically in the format `<username>.map-<random characters>`.  
68 -* @return An initialized MapBox tile source. */ 67 +* @param mapID The Mapbox map ID string, typically in the format `<username>.map-<random characters>`.
  68 +* @return An initialized Mapbox tile source. */
69 - (id)initWithMapID:(NSString *)mapID; 69 - (id)initWithMapID:(NSString *)mapID;
70 70
71 -/** Initialize a tile source using the MapBox map ID, optionally enabling SSL. 71 +/** Initialize a tile source using the Mapbox map ID, optionally enabling SSL.
72 * 72 *
73 * This method requires a network connection in order to download the TileJSON used to define the tile source. 73 * This method requires a network connection in order to download the TileJSON used to define the tile source.
74 * 74 *
75 -* @param mapID The MapBox map ID string, typically in the format `<username>.map-<random characters>`. 75 +* @param mapID The Mapbox map ID string, typically in the format `<username>.map-<random characters>`.
76 * @param enableSSL Whether to use SSL-enabled HTTPS connections for map tiles and other related data. Defaults to `NO`. At some point in the future, this will default to `YES`. 76 * @param enableSSL Whether to use SSL-enabled HTTPS connections for map tiles and other related data. Defaults to `NO`. At some point in the future, this will default to `YES`.
77 -* @return An initialized MapBox tile source. */ 77 +* @return An initialized Mapbox tile source. */
78 - (id)initWithMapID:(NSString *)mapID enablingSSL:(BOOL)enableSSL; 78 - (id)initWithMapID:(NSString *)mapID enablingSSL:(BOOL)enableSSL;
79 79
80 /** Initialize a tile source with either a remote or local TileJSON structure. 80 /** Initialize a tile source with either a remote or local TileJSON structure.
@@ -84,37 +84,37 @@ typedef enum : NSUInteger { @@ -84,37 +84,37 @@ typedef enum : NSUInteger {
84 * @see tileJSON 84 * @see tileJSON
85 * 85 *
86 * @param referenceURL A remote or file path URL pointing to a TileJSON structure. 86 * @param referenceURL A remote or file path URL pointing to a TileJSON structure.
87 -* @return An initialized MapBox tile source. */ 87 +* @return An initialized Mapbox tile source. */
88 - (id)initWithReferenceURL:(NSURL *)referenceURL; 88 - (id)initWithReferenceURL:(NSURL *)referenceURL;
89 89
90 /** Initialize a tile source with TileJSON. 90 /** Initialize a tile source with TileJSON.
91 * @param tileJSON A string containing TileJSON. 91 * @param tileJSON A string containing TileJSON.
92 -* @return An initialized MapBox tile source. */ 92 +* @return An initialized Mapbox tile source. */
93 - (id)initWithTileJSON:(NSString *)tileJSON; 93 - (id)initWithTileJSON:(NSString *)tileJSON;
94 94
95 /** For TileJSON 2.1.0+ layers, initialize a tile source and automatically find and add annotations from [simplestyle](http://mapbox.com/developers/simplestyle/) data. 95 /** For TileJSON 2.1.0+ layers, initialize a tile source and automatically find and add annotations from [simplestyle](http://mapbox.com/developers/simplestyle/) data.
96 * 96 *
97 * This method requires a network connection in order to download the TileJSON used to define the tile source. 97 * This method requires a network connection in order to download the TileJSON used to define the tile source.
98 * 98 *
99 -* @param mapID The MapBox map ID string, typically in the format `<username>.map-<random characters>`. 99 +* @param mapID The Mapbox map ID string, typically in the format `<username>.map-<random characters>`.
100 * @param mapView A map view on which to display the annotations. 100 * @param mapView A map view on which to display the annotations.
101 -* @return An initialized MapBox tile source. */ 101 +* @return An initialized Mapbox tile source. */
102 - (id)initWithMapID:(NSString *)mapID enablingDataOnMapView:(RMMapView *)mapView; 102 - (id)initWithMapID:(NSString *)mapID enablingDataOnMapView:(RMMapView *)mapView;
103 103
104 /** For TileJSON 2.1.0+ layers, initialize a tile source and automatically find and add annotations from [simplestyle](http://mapbox.com/developers/simplestyle/) data, optionally enabling SSL. 104 /** For TileJSON 2.1.0+ layers, initialize a tile source and automatically find and add annotations from [simplestyle](http://mapbox.com/developers/simplestyle/) data, optionally enabling SSL.
105 * 105 *
106 * This method requires a network connection in order to download the TileJSON used to define the tile source. 106 * This method requires a network connection in order to download the TileJSON used to define the tile source.
107 * 107 *
108 -* @param mapID The MapBox map ID string, typically in the format `<username>.map-<random characters>`. 108 +* @param mapID The Mapbox map ID string, typically in the format `<username>.map-<random characters>`.
109 * @param mapView A map view on which to display the annotations. 109 * @param mapView A map view on which to display the annotations.
110 * @param enableSSL Whether to use SSL-enabled HTTPS connections for map tiles and other related data. Defaults to `NO`. At some point in the future, this will default to `YES`. 110 * @param enableSSL Whether to use SSL-enabled HTTPS connections for map tiles and other related data. Defaults to `NO`. At some point in the future, this will default to `YES`.
111 -* @return An initialized MapBox tile source. */ 111 +* @return An initialized Mapbox tile source. */
112 - (id)initWithMapID:(NSString *)mapID enablingDataOnMapView:(RMMapView *)mapView enablingSSL:(BOOL)enableSSL; 112 - (id)initWithMapID:(NSString *)mapID enablingDataOnMapView:(RMMapView *)mapView enablingSSL:(BOOL)enableSSL;
113 113
114 /** For TileJSON 2.1.0+ layers, initialize a tile source and automatically find and add annotations from [simplestyle](http://mapbox.com/developers/simplestyle/) data. 114 /** For TileJSON 2.1.0+ layers, initialize a tile source and automatically find and add annotations from [simplestyle](http://mapbox.com/developers/simplestyle/) data.
115 * @param tileJSON A string containing TileJSON. 115 * @param tileJSON A string containing TileJSON.
116 * @param mapView A map view on which to display the annotations. 116 * @param mapView A map view on which to display the annotations.
117 -* @return An initialized MapBox tile source. */ 117 +* @return An initialized Mapbox tile source. */
118 - (id)initWithTileJSON:(NSString *)tileJSON enablingDataOnMapView:(RMMapView *)mapView; 118 - (id)initWithTileJSON:(NSString *)tileJSON enablingDataOnMapView:(RMMapView *)mapView;
119 119
120 /** For TileJSON 2.1.0+ layers, initialize a tile source and automatically find and add annotations from [simplestyle](http://mapbox.com/developers/simplestyle/) data. 120 /** For TileJSON 2.1.0+ layers, initialize a tile source and automatically find and add annotations from [simplestyle](http://mapbox.com/developers/simplestyle/) data.
@@ -125,7 +125,7 @@ typedef enum : NSUInteger { @@ -125,7 +125,7 @@ typedef enum : NSUInteger {
125 * 125 *
126 * @param referenceURL A remote or file path URL pointing to a TileJSON structure. 126 * @param referenceURL A remote or file path URL pointing to a TileJSON structure.
127 * @param mapView A map view on which to display the annotations. 127 * @param mapView A map view on which to display the annotations.
128 -* @return An initialized MapBox tile source. */ 128 +* @return An initialized Mapbox tile source. */
129 - (id)initWithReferenceURL:(NSURL *)referenceURL enablingDataOnMapView:(RMMapView *)mapView; 129 - (id)initWithReferenceURL:(NSURL *)referenceURL enablingDataOnMapView:(RMMapView *)mapView;
130 130
131 /** @name Querying Tile Source Information */ 131 /** @name Querying Tile Source Information */
@@ -156,7 +156,7 @@ typedef enum : NSUInteger { @@ -156,7 +156,7 @@ typedef enum : NSUInteger {
156 /** Image quality that is retrieved from the network. Useful for lower-bandwidth environments. The default is to provide full-quality imagery. 156 /** Image quality that is retrieved from the network. Useful for lower-bandwidth environments. The default is to provide full-quality imagery.
157 * 157 *
158 * Note that you may want to clear the tile cache after changing this value in order to provide a consistent experience. */ 158 * Note that you may want to clear the tile cache after changing this value in order to provide a consistent experience. */
159 -@property (nonatomic, assign) RMMapBoxSourceQuality imageQuality; 159 +@property (nonatomic, assign) RMMapboxSourceQuality imageQuality;
160 160
161 @property (nonatomic, readonly, assign) dispatch_queue_t dataQueue; 161 @property (nonatomic, readonly, assign) dispatch_queue_t dataQueue;
162 162
1 // 1 //
2 -// RMMapBoxSource.m 2 +// RMMapboxSource.m
3 // 3 //
4 // Created by Justin R. Miller on 5/17/11. 4 // Created by Justin R. Miller on 5/17/11.
5 -// Copyright 2012 MapBox. 5 +// Copyright 2012-2013 Mapbox.
6 // All rights reserved. 6 // All rights reserved.
7 // 7 //
8 // Redistribution and use in source and binary forms, with or without 8 // Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 // notice, this list of conditions and the following disclaimer in the 15 // notice, this list of conditions and the following disclaimer in the
16 // documentation and/or other materials provided with the distribution. 16 // documentation and/or other materials provided with the distribution.
17 // 17 //
18 -// * Neither the name of MapBox, nor the names of its contributors may be 18 +// * Neither the name of Mapbox, nor the names of its contributors may be
19 // used to endorse or promote products derived from this software 19 // used to endorse or promote products derived from this software
20 // without specific prior written permission. 20 // without specific prior written permission.
21 // 21 //
@@ -31,13 +31,13 @@ @@ -31,13 +31,13 @@
31 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 31 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32 // 32 //
33 33
34 -#import "RMMapBoxSource.h" 34 +#import "RMMapboxSource.h"
35 35
36 #import "RMMapView.h" 36 #import "RMMapView.h"
37 #import "RMPointAnnotation.h" 37 #import "RMPointAnnotation.h"
38 #import "RMConfiguration.h" 38 #import "RMConfiguration.h"
39 39
40 -@interface RMMapBoxSource () 40 +@interface RMMapboxSource ()
41 41
42 @property (nonatomic, strong) NSDictionary *infoDictionary; 42 @property (nonatomic, strong) NSDictionary *infoDictionary;
43 @property (nonatomic, strong) NSString *tileJSON; 43 @property (nonatomic, strong) NSString *tileJSON;
@@ -46,13 +46,13 @@ @@ -46,13 +46,13 @@
46 46
47 #pragma mark - 47 #pragma mark -
48 48
49 -@implementation RMMapBoxSource 49 +@implementation RMMapboxSource
50 50
51 @synthesize infoDictionary=_infoDictionary, tileJSON=_tileJSON, imageQuality=_imageQuality, dataQueue=_dataQueue; 51 @synthesize infoDictionary=_infoDictionary, tileJSON=_tileJSON, imageQuality=_imageQuality, dataQueue=_dataQueue;
52 52
53 - (id)init 53 - (id)init
54 { 54 {
55 - return [self initWithReferenceURL:[NSURL fileURLWithPath:[RMMapView pathForBundleResourceNamed:kMapBoxPlaceholderMapID ofType:@"json"]]]; 55 + return [self initWithReferenceURL:[NSURL fileURLWithPath:[RMMapView pathForBundleResourceNamed:kMapboxPlaceholderMapID ofType:@"json"]]];
56 } 56 }
57 57
58 - (id)initWithMapID:(NSString *)mapID 58 - (id)initWithMapID:(NSString *)mapID
@@ -213,48 +213,48 @@ @@ -213,48 +213,48 @@
213 if ([[UIScreen mainScreen] scale] > 1.0) 213 if ([[UIScreen mainScreen] scale] > 1.0)
214 tileURLString = [tileURLString stringByReplacingOccurrencesOfString:@".png" withString:@"@2x.png"]; 214 tileURLString = [tileURLString stringByReplacingOccurrencesOfString:@".png" withString:@"@2x.png"];
215 215
216 - if (_imageQuality != RMMapBoxSourceQualityFull) 216 + if (_imageQuality != RMMapboxSourceQualityFull)
217 { 217 {
218 NSString *qualityExtension = nil; 218 NSString *qualityExtension = nil;
219 219
220 switch (_imageQuality) 220 switch (_imageQuality)
221 { 221 {
222 - case RMMapBoxSourceQualityPNG32: 222 + case RMMapboxSourceQualityPNG32:
223 { 223 {
224 qualityExtension = @".png32"; 224 qualityExtension = @".png32";
225 break; 225 break;
226 } 226 }
227 - case RMMapBoxSourceQualityPNG64: 227 + case RMMapboxSourceQualityPNG64:
228 { 228 {
229 qualityExtension = @".png64"; 229 qualityExtension = @".png64";
230 break; 230 break;
231 } 231 }
232 - case RMMapBoxSourceQualityPNG128: 232 + case RMMapboxSourceQualityPNG128:
233 { 233 {
234 qualityExtension = @".png128"; 234 qualityExtension = @".png128";
235 break; 235 break;
236 } 236 }
237 - case RMMapBoxSourceQualityPNG256: 237 + case RMMapboxSourceQualityPNG256:
238 { 238 {
239 qualityExtension = @".png256"; 239 qualityExtension = @".png256";
240 break; 240 break;
241 } 241 }
242 - case RMMapBoxSourceQualityJPEG70: 242 + case RMMapboxSourceQualityJPEG70:
243 { 243 {
244 qualityExtension = @".jpg70"; 244 qualityExtension = @".jpg70";
245 break; 245 break;
246 } 246 }
247 - case RMMapBoxSourceQualityJPEG80: 247 + case RMMapboxSourceQualityJPEG80:
248 { 248 {
249 qualityExtension = @".jpg80"; 249 qualityExtension = @".jpg80";
250 break; 250 break;
251 } 251 }
252 - case RMMapBoxSourceQualityJPEG90: 252 + case RMMapboxSourceQualityJPEG90:
253 { 253 {
254 qualityExtension = @".jpg90"; 254 qualityExtension = @".jpg90";
255 break; 255 break;
256 } 256 }
257 - case RMMapBoxSourceQualityFull: 257 + case RMMapboxSourceQualityFull:
258 default: 258 default:
259 { 259 {
260 qualityExtension = @".png"; 260 qualityExtension = @".png";
@@ -309,13 +309,13 @@ @@ -309,13 +309,13 @@
309 return bounds; 309 return bounds;
310 } 310 }
311 311
312 - return kMapBoxDefaultLatLonBoundingBox; 312 + return kMapboxDefaultLatLonBoundingBox;
313 } 313 }
314 314
315 - (BOOL)coversFullWorld 315 - (BOOL)coversFullWorld
316 { 316 {
317 RMSphericalTrapezium ownBounds = [self latitudeLongitudeBoundingBox]; 317 RMSphericalTrapezium ownBounds = [self latitudeLongitudeBoundingBox];
318 - RMSphericalTrapezium defaultBounds = kMapBoxDefaultLatLonBoundingBox; 318 + RMSphericalTrapezium defaultBounds = kMapboxDefaultLatLonBoundingBox;
319 319
320 if (ownBounds.southWest.longitude <= defaultBounds.southWest.longitude + 10 && 320 if (ownBounds.southWest.longitude <= defaultBounds.southWest.longitude + 10 &&
321 ownBounds.northEast.longitude >= defaultBounds.northEast.longitude - 10) 321 ownBounds.northEast.longitude >= defaultBounds.northEast.longitude - 10)
@@ -352,7 +352,7 @@ @@ -352,7 +352,7 @@
352 352
353 - (NSString *)uniqueTilecacheKey 353 - (NSString *)uniqueTilecacheKey
354 { 354 {
355 - return [NSString stringWithFormat:@"MapBox-%@-%@", [self.infoDictionary objectForKey:@"id"], [self.infoDictionary objectForKey:@"version"]]; 355 + return [NSString stringWithFormat:@"Mapbox-%@-%@", [self.infoDictionary objectForKey:@"id"], [self.infoDictionary objectForKey:@"version"]];
356 } 356 }
357 357
358 - (NSString *)shortName 358 - (NSString *)shortName
@@ -138,7 +138,7 @@ typedef enum : NSUInteger { @@ -138,7 +138,7 @@ typedef enum : NSUInteger {
138 138
139 /** @name Initializing a Map View */ 139 /** @name Initializing a Map View */
140 140
141 -/** Initialize a map view with a given frame. A default watermarked MapBox map tile source will be used. */ 141 +/** Initialize a map view with a given frame. A default watermarked Mapbox map tile source will be used. */
142 - (id)initWithFrame:(CGRect)frame; 142 - (id)initWithFrame:(CGRect)frame;
143 143
144 /** Initialize a map view with a given frame and tile source. 144 /** Initialize a map view with a given frame and tile source.
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 42
43 #import "RMTileCache.h" 43 #import "RMTileCache.h"
44 #import "RMTileSource.h" 44 #import "RMTileSource.h"
45 -#import "RMMapBoxSource.h" 45 +#import "RMMapboxSource.h"
46 46
47 #import "RMMapTiledLayerView.h" 47 #import "RMMapTiledLayerView.h"
48 #import "RMMapOverlayView.h" 48 #import "RMMapOverlayView.h"
@@ -355,7 +355,7 @@ @@ -355,7 +355,7 @@
355 355
356 - (id)initWithFrame:(CGRect)frame 356 - (id)initWithFrame:(CGRect)frame
357 { 357 {
358 - return [self initWithFrame:frame andTilesource:[RMMapBoxSource new]]; 358 + return [self initWithFrame:frame andTilesource:[RMMapboxSource new]];
359 } 359 }
360 360
361 - (id)initWithFrame:(CGRect)frame andTilesource:(id <RMTileSource>)newTilesource 361 - (id)initWithFrame:(CGRect)frame andTilesource:(id <RMTileSource>)newTilesource
@@ -426,9 +426,9 @@ @@ -426,9 +426,9 @@
426 426
427 + (NSString *)pathForBundleResourceNamed:(NSString *)name ofType:(NSString *)extension 427 + (NSString *)pathForBundleResourceNamed:(NSString *)name ofType:(NSString *)extension
428 { 428 {
429 - NSAssert([[NSBundle mainBundle] pathForResource:@"MapBox" ofType:@"bundle"], @"Resource bundle not found in application."); 429 + NSAssert([[NSBundle mainBundle] pathForResource:@"Mapbox" ofType:@"bundle"], @"Resource bundle not found in application.");
430 430
431 - NSString *bundlePath = [[NSBundle mainBundle] pathForResource:@"MapBox" ofType:@"bundle"]; 431 + NSString *bundlePath = [[NSBundle mainBundle] pathForResource:@"Mapbox" ofType:@"bundle"];
432 NSBundle *resourcesBundle = [NSBundle bundleWithPath:bundlePath]; 432 NSBundle *resourcesBundle = [NSBundle bundleWithPath:bundlePath];
433 433
434 return [resourcesBundle pathForResource:name ofType:extension]; 434 return [resourcesBundle pathForResource:name ofType:extension];
@@ -615,7 +615,7 @@ @@ -615,7 +615,7 @@
615 // needs a scroll view frame in order to calculate _metersPerPixel. 615 // needs a scroll view frame in order to calculate _metersPerPixel.
616 // See https://github.com/mapbox/mapbox-ios-sdk/issues/270 616 // See https://github.com/mapbox/mapbox-ios-sdk/issues/270
617 // 617 //
618 - [self performInitializationWithTilesource:[RMMapBoxSource new] 618 + [self performInitializationWithTilesource:[RMMapboxSource new]
619 centerCoordinate:CLLocationCoordinate2DMake(kDefaultInitialLatitude, kDefaultInitialLongitude) 619 centerCoordinate:CLLocationCoordinate2DMake(kDefaultInitialLatitude, kDefaultInitialLongitude)
620 zoomLevel:kDefaultInitialZoomLevel 620 zoomLevel:kDefaultInitialZoomLevel
621 maxZoomLevel:kDefaultMaximumZoomLevel 621 maxZoomLevel:kDefaultMaximumZoomLevel
@@ -30,10 +30,10 @@ @@ -30,10 +30,10 @@
30 #import "RMFoundation.h" 30 #import "RMFoundation.h"
31 31
32 typedef enum : NSUInteger { 32 typedef enum : NSUInteger {
33 - RMMarkerMapBoxImageSizeSmall,  
34 - RMMarkerMapBoxImageSizeMedium,  
35 - RMMarkerMapBoxImageSizeLarge  
36 -} RMMarkerMapBoxImageSize; 33 + RMMarkerMapboxImageSizeSmall,
  34 + RMMarkerMapboxImageSizeMedium,
  35 + RMMarkerMapboxImageSizeLarge
  36 +} RMMarkerMapboxImageSize;
37 37
38 /** An RMMarker object is used for simple point annotations on a map view, represented as a single image. RMMarker objects do not change in size when the map view zooms in or out, but instead stay the same size to consistently represent a point on the map view. */ 38 /** An RMMarker object is used for simple point annotations on a map view, represented as a single image. RMMarker objects do not change in size when the map view zooms in or out, but instead stay the same size to consistently represent a point on the map view. */
39 @interface RMMarker : RMMapLayer 39 @interface RMMarker : RMMapLayer
@@ -70,44 +70,44 @@ typedef enum : NSUInteger { @@ -70,44 +70,44 @@ typedef enum : NSUInteger {
70 * @return An initialized marker object. */ 70 * @return An initialized marker object. */
71 - (id)initWithUIImage:(UIImage *)image anchorPoint:(CGPoint)anchorPoint; 71 - (id)initWithUIImage:(UIImage *)image anchorPoint:(CGPoint)anchorPoint;
72 72
73 -/** @name Creating Markers Using MapBox Images */ 73 +/** @name Creating Markers Using Mapbox Images */
74 74
75 /** Initializes and returns a newly allocated marker object using a red, medium-sized star pin image. */ 75 /** Initializes and returns a newly allocated marker object using a red, medium-sized star pin image. */
76 -- (id)initWithMapBoxMarkerImage; 76 +- (id)initWithMapboxMarkerImage;
77 77
78 /** Initializes and returns a newly allocated marker object using a red, medium-sized pin image and a given symbol name, e.g., `bus`. 78 /** Initializes and returns a newly allocated marker object using a red, medium-sized pin image and a given symbol name, e.g., `bus`.
79 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set. 79 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set.
80 * @return An initialized RMMarker layer. */ 80 * @return An initialized RMMarker layer. */
81 -- (id)initWithMapBoxMarkerImage:(NSString *)symbolName; 81 +- (id)initWithMapboxMarkerImage:(NSString *)symbolName;
82 82
83 /** Initializes and returns a newly allocated marker object using a medium-sized pin image, a given symbol name, e.g., `bus`, and a given color. 83 /** Initializes and returns a newly allocated marker object using a medium-sized pin image, a given symbol name, e.g., `bus`, and a given color.
84 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set. 84 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set.
85 * @param color A color for the marker. 85 * @param color A color for the marker.
86 * @return An initialized RMMarker layer. */ 86 * @return An initialized RMMarker layer. */
87 -- (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color; 87 +- (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color;
88 88
89 /** Initializes and returns a newly allocated marker object using a pin image, a given symbol name, e.g., `bus`, a given color, and a given size. 89 /** Initializes and returns a newly allocated marker object using a pin image, a given symbol name, e.g., `bus`, a given color, and a given size.
90 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set. 90 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set.
91 * @param color A color for the marker. 91 * @param color A color for the marker.
92 * @param size A size for the marker. 92 * @param size A size for the marker.
93 * @return An initialized RMMarker layer. */ 93 * @return An initialized RMMarker layer. */
94 -- (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color size:(RMMarkerMapBoxImageSize)size; 94 +- (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color size:(RMMarkerMapboxImageSize)size;
95 95
96 /** Initializes and returns a newly allocated marker object using a medium-sized pin image, a given symbol name, e.g., `bus`, and a given HTML hex color, e.g., `ff0000`. 96 /** Initializes and returns a newly allocated marker object using a medium-sized pin image, a given symbol name, e.g., `bus`, and a given HTML hex color, e.g., `ff0000`.
97 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set. 97 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set.
98 * @param colorHex A color for the marker specified as an HTML hex code. 98 * @param colorHex A color for the marker specified as an HTML hex code.
99 * @return An initialized RMMarker layer. */ 99 * @return An initialized RMMarker layer. */
100 -- (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex; 100 +- (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex;
101 101
102 /** Initializes and returns a newly allocated marker object using a pin image, a given symbol name, e.g., `bus`, a given HTML hex color, e.g., `ff0000`, and a given size, e.g., `large`. 102 /** Initializes and returns a newly allocated marker object using a pin image, a given symbol name, e.g., `bus`, a given HTML hex color, e.g., `ff0000`, and a given size, e.g., `large`.
103 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set. 103 * @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set.
104 * @param colorHex A color for the marker specified as an HTML hex code. 104 * @param colorHex A color for the marker specified as an HTML hex code.
105 * @param sizeString A size such as `small`, `medium`, or `large`. 105 * @param sizeString A size such as `small`, `medium`, or `large`.
106 * @return An initialized RMMarker layer. */ 106 * @return An initialized RMMarker layer. */
107 -- (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex sizeString:(NSString *)sizeString; 107 +- (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex sizeString:(NSString *)sizeString;
108 108
109 /** Clears the local cache of Mapbox Marker images. Images are cached locally upon first use so that if the application goes offline, markers can still be used. */ 109 /** Clears the local cache of Mapbox Marker images. Images are cached locally upon first use so that if the application goes offline, markers can still be used. */
110 -+ (void)clearCachedMapBoxMarkers; 110 ++ (void)clearCachedMapboxMarkers;
111 111
112 /** @name Altering Labels */ 112 /** @name Altering Labels */
113 113
@@ -79,37 +79,37 @@ @@ -79,37 +79,37 @@
79 return self; 79 return self;
80 } 80 }
81 81
82 -- (id)initWithMapBoxMarkerImage 82 +- (id)initWithMapboxMarkerImage
83 { 83 {
84 - return [self initWithMapBoxMarkerImage:nil tintColor:nil size:RMMarkerMapBoxImageSizeMedium]; 84 + return [self initWithMapboxMarkerImage:nil tintColor:nil size:RMMarkerMapboxImageSizeMedium];
85 } 85 }
86 86
87 -- (id)initWithMapBoxMarkerImage:(NSString *)symbolName 87 +- (id)initWithMapboxMarkerImage:(NSString *)symbolName
88 { 88 {
89 - return [self initWithMapBoxMarkerImage:symbolName tintColor:nil size:RMMarkerMapBoxImageSizeMedium]; 89 + return [self initWithMapboxMarkerImage:symbolName tintColor:nil size:RMMarkerMapboxImageSizeMedium];
90 } 90 }
91 91
92 -- (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color 92 +- (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color
93 { 93 {
94 - return [self initWithMapBoxMarkerImage:symbolName tintColor:color size:RMMarkerMapBoxImageSizeMedium]; 94 + return [self initWithMapboxMarkerImage:symbolName tintColor:color size:RMMarkerMapboxImageSizeMedium];
95 } 95 }
96 96
97 -- (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color size:(RMMarkerMapBoxImageSize)size 97 +- (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color size:(RMMarkerMapboxImageSize)size
98 { 98 {
99 NSString *sizeString = nil; 99 NSString *sizeString = nil;
100 100
101 switch (size) 101 switch (size)
102 { 102 {
103 - case RMMarkerMapBoxImageSizeSmall: 103 + case RMMarkerMapboxImageSizeSmall:
104 sizeString = @"small"; 104 sizeString = @"small";
105 break; 105 break;
106 106
107 - case RMMarkerMapBoxImageSizeMedium: 107 + case RMMarkerMapboxImageSizeMedium:
108 default: 108 default:
109 sizeString = @"medium"; 109 sizeString = @"medium";
110 break; 110 break;
111 111
112 - case RMMarkerMapBoxImageSizeLarge: 112 + case RMMarkerMapboxImageSizeLarge:
113 sizeString = @"large"; 113 sizeString = @"large";
114 break; 114 break;
115 } 115 }
@@ -130,15 +130,15 @@ @@ -130,15 +130,15 @@
130 } 130 }
131 } 131 }
132 132
133 - return [self initWithMapBoxMarkerImage:symbolName tintColorHex:colorHex sizeString:sizeString]; 133 + return [self initWithMapboxMarkerImage:symbolName tintColorHex:colorHex sizeString:sizeString];
134 } 134 }
135 135
136 -- (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex 136 +- (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex
137 { 137 {
138 - return [self initWithMapBoxMarkerImage:symbolName tintColorHex:colorHex sizeString:@"medium"]; 138 + return [self initWithMapboxMarkerImage:symbolName tintColorHex:colorHex sizeString:@"medium"];
139 } 139 }
140 140
141 -- (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex sizeString:(NSString *)sizeString 141 +- (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex sizeString:(NSString *)sizeString
142 { 142 {
143 BOOL useRetina = ([[UIScreen mainScreen] scale] > 1.0); 143 BOOL useRetina = ([[UIScreen mainScreen] scale] > 1.0);
144 144
@@ -160,7 +160,7 @@ @@ -160,7 +160,7 @@
160 return [self initWithUIImage:[UIImage imageWithData:[NSData dataWithContentsOfFile:cachePath] scale:(useRetina ? 2.0 : 1.0)]]; 160 return [self initWithUIImage:[UIImage imageWithData:[NSData dataWithContentsOfFile:cachePath] scale:(useRetina ? 2.0 : 1.0)]];
161 } 161 }
162 162
163 -+ (void)clearCachedMapBoxMarkers 163 ++ (void)clearCachedMapboxMarkers
164 { 164 {
165 for (NSString *filePath in [[NSFileManager defaultManager] contentsOfDirectoryAtPath:kCachesPath error:nil]) 165 for (NSString *filePath in [[NSFileManager defaultManager] contentsOfDirectoryAtPath:kCachesPath error:nil])
166 if ([[filePath lastPathComponent] hasPrefix:@"pin-"] && [[filePath lastPathComponent] hasSuffix:@".png"]) 166 if ([[filePath lastPathComponent] hasPrefix:@"pin-"] && [[filePath lastPathComponent] hasSuffix:@".png"])
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 { 45 {
46 if ( ! [super layer]) 46 if ( ! [super layer])
47 { 47 {
48 - RMMarker *marker = [[RMMarker alloc] initWithMapBoxMarkerImage:nil tintColor:(RMPostVersion7 ? self.mapView.tintColor : nil)]; 48 + RMMarker *marker = [[RMMarker alloc] initWithMapboxMarkerImage:nil tintColor:(RMPostVersion7 ? self.mapView.tintColor : nil)];
49 49
50 marker.canShowCallout = YES; 50 marker.canShowCallout = YES;
51 51
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 * 40 *
41 * The map ID is expected to provide initial center coordinate and zoom level information, and may optionally also include simplestyle marker data, which will automatically be added to the map view. 41 * The map ID is expected to provide initial center coordinate and zoom level information, and may optionally also include simplestyle marker data, which will automatically be added to the map view.
42 * @param frame The frame with which to initialize the map view. 42 * @param frame The frame with which to initialize the map view.
43 -* @param mapID The MapBox map ID string, typically in the format `<username>.map-<mapname>`. 43 +* @param mapID The Mapbox map ID string, typically in the format `<username>.map-<mapname>`.
44 * @return An initialized map view, or `nil` if the map view was unable to be initialized. */ 44 * @return An initialized map view, or `nil` if the map view was unable to be initialized. */
45 - (id)initWithFrame:(CGRect)frame mapID:(NSString *)mapID; 45 - (id)initWithFrame:(CGRect)frame mapID:(NSString *)mapID;
46 46
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 * 48 *
49 * The map ID is expected to provide initial center coordinate and zoom level information, and may optionally also include simplestyle marker data, which will automatically be added to the map view. The block will be performed upon completion of the load of both the map and of any simplestyle markers included with the map ID. 49 * The map ID is expected to provide initial center coordinate and zoom level information, and may optionally also include simplestyle marker data, which will automatically be added to the map view. The block will be performed upon completion of the load of both the map and of any simplestyle markers included with the map ID.
50 * @param frame The frame with which to initialize the map view. 50 * @param frame The frame with which to initialize the map view.
51 -* @param mapID The MapBox map ID string, typically in the format `<username>.map-<mapname>`. 51 +* @param mapID The Mapbox map ID string, typically in the format `<username>.map-<mapname>`.
52 * @param handler A block to be performed upon map and marker load completion. An image of the map, including markers, is passed as an argument to the block in the event that you wish to use it elsewhere. The handler will be called on the main dispatch queue. 52 * @param handler A block to be performed upon map and marker load completion. An image of the map, including markers, is passed as an argument to the block in the event that you wish to use it elsewhere. The handler will be called on the main dispatch queue.
53 * @return An initialized map view, or `nil` if the map view was unable to be initialized. */ 53 * @return An initialized map view, or `nil` if the map view was unable to be initialized. */
54 - (id)initWithFrame:(CGRect)frame mapID:(NSString *)mapID completionHandler:(void (^)(UIImage *))handler; 54 - (id)initWithFrame:(CGRect)frame mapID:(NSString *)mapID completionHandler:(void (^)(UIImage *))handler;
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 * 57 *
58 * The map ID may optionally also include simplestyle marker data, which will automatically be added to the map view. 58 * The map ID may optionally also include simplestyle marker data, which will automatically be added to the map view.
59 * @param frame The frame with which to initialize the map view. 59 * @param frame The frame with which to initialize the map view.
60 -* @param mapID The MapBox map ID string, typically in the format `<username>.map-<mapname>`. 60 +* @param mapID The Mapbox map ID string, typically in the format `<username>.map-<mapname>`.
61 * @param centerCoordinate The map center coordinate. 61 * @param centerCoordinate The map center coordinate.
62 * @param zoomLevel The map zoom level. 62 * @param zoomLevel The map zoom level.
63 * @return An initialized map view, or `nil` if the map view was unable to be initialized. */ 63 * @return An initialized map view, or `nil` if the map view was unable to be initialized. */
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
67 * 67 *
68 * The map ID may optionally also include simplestyle marker data, which will automatically be added to the map view. The block will be performed upon completion of the load of both the map and of any simplestyle markers included with the map ID. 68 * The map ID may optionally also include simplestyle marker data, which will automatically be added to the map view. The block will be performed upon completion of the load of both the map and of any simplestyle markers included with the map ID.
69 * @param frame The frame with which to initialize the map view. 69 * @param frame The frame with which to initialize the map view.
70 -* @param mapID The MapBox map ID string, typically in the format `<username>.map-<mapname>`. 70 +* @param mapID The Mapbox map ID string, typically in the format `<username>.map-<mapname>`.
71 * @param centerCoordinate The map center coordinate. 71 * @param centerCoordinate The map center coordinate.
72 * @param zoomLevel The map zoom level. 72 * @param zoomLevel The map zoom level.
73 * @param handler A block to be performed upon map load completion. An image of the map, including markers, is passed as an argument to the block in the event that you wish to use it elsewhere. The handler will be called on the main dispatch queue. 73 * @param handler A block to be performed upon map load completion. An image of the map, including markers, is passed as an argument to the block in the event that you wish to use it elsewhere. The handler will be called on the main dispatch queue.
@@ -28,11 +28,11 @@ @@ -28,11 +28,11 @@
28 #import "RMStaticMapView.h" 28 #import "RMStaticMapView.h"
29 29
30 #import "RMAnnotation.h" 30 #import "RMAnnotation.h"
31 -#import "RMMapBoxSource.h" 31 +#import "RMMapboxSource.h"
32 #import "RMMarker.h" 32 #import "RMMarker.h"
33 33
34 -#define kMapBoxDefaultCenter CLLocationCoordinate2DMake(MAXFLOAT, MAXFLOAT)  
35 -#define kMapBoxDefaultZoom -1.0f 34 +#define kMapboxDefaultCenter CLLocationCoordinate2DMake(MAXFLOAT, MAXFLOAT)
  35 +#define kMapboxDefaultZoom -1.0f
36 36
37 @interface RMStaticMapView () 37 @interface RMStaticMapView ()
38 38
@@ -54,12 +54,12 @@ @@ -54,12 +54,12 @@
54 54
55 - (id)initWithFrame:(CGRect)frame mapID:(NSString *)mapID 55 - (id)initWithFrame:(CGRect)frame mapID:(NSString *)mapID
56 { 56 {
57 - return [self initWithFrame:frame mapID:mapID centerCoordinate:kMapBoxDefaultCenter zoomLevel:kMapBoxDefaultZoom completionHandler:nil]; 57 + return [self initWithFrame:frame mapID:mapID centerCoordinate:kMapboxDefaultCenter zoomLevel:kMapboxDefaultZoom completionHandler:nil];
58 } 58 }
59 59
60 - (id)initWithFrame:(CGRect)frame mapID:(NSString *)mapID completionHandler:(void (^)(UIImage *))handler 60 - (id)initWithFrame:(CGRect)frame mapID:(NSString *)mapID completionHandler:(void (^)(UIImage *))handler
61 { 61 {
62 - return [self initWithFrame:frame mapID:mapID centerCoordinate:kMapBoxDefaultCenter zoomLevel:kMapBoxDefaultZoom completionHandler:handler]; 62 + return [self initWithFrame:frame mapID:mapID centerCoordinate:kMapboxDefaultCenter zoomLevel:kMapboxDefaultZoom completionHandler:handler];
63 } 63 }
64 64
65 - (id)initWithFrame:(CGRect)frame mapID:(NSString *)mapID centerCoordinate:(CLLocationCoordinate2D)centerCoordinate zoomLevel:(CGFloat)zoomLevel 65 - (id)initWithFrame:(CGRect)frame mapID:(NSString *)mapID centerCoordinate:(CLLocationCoordinate2D)centerCoordinate zoomLevel:(CGFloat)zoomLevel
@@ -82,14 +82,14 @@ @@ -82,14 +82,14 @@
82 if (!(self = [super initWithCoder:aDecoder])) 82 if (!(self = [super initWithCoder:aDecoder]))
83 return nil; 83 return nil;
84 84
85 - [self performInitializationWithMapID:nil centerCoordinate:kMapBoxDefaultCenter zoomLevel:kMapBoxDefaultZoom completionHandler:nil]; 85 + [self performInitializationWithMapID:nil centerCoordinate:kMapboxDefaultCenter zoomLevel:kMapboxDefaultZoom completionHandler:nil];
86 86
87 return self; 87 return self;
88 } 88 }
89 89
90 - (void)performInitializationWithMapID:(NSString *)mapID centerCoordinate:(CLLocationCoordinate2D)centerCoordinate zoomLevel:(CGFloat)zoomLevel completionHandler:(void (^)(UIImage *))handler 90 - (void)performInitializationWithMapID:(NSString *)mapID centerCoordinate:(CLLocationCoordinate2D)centerCoordinate zoomLevel:(CGFloat)zoomLevel completionHandler:(void (^)(UIImage *))handler
91 { 91 {
92 - RMMapBoxSource *tileSource = [[RMMapBoxSource alloc] initWithMapID:kMapBoxPlaceholderMapID enablingDataOnMapView:self]; 92 + RMMapboxSource *tileSource = [[RMMapboxSource alloc] initWithMapID:kMapboxPlaceholderMapID enablingDataOnMapView:self];
93 93
94 self.tileSource = tileSource; 94 self.tileSource = tileSource;
95 95
@@ -129,7 +129,7 @@ @@ -129,7 +129,7 @@
129 129
130 - (void)addAnnotation:(RMAnnotation *)annotation 130 - (void)addAnnotation:(RMAnnotation *)annotation
131 { 131 {
132 - annotation.layer = [[RMMarker alloc] initWithMapBoxMarkerImage:[annotation.userInfo objectForKey:@"marker-symbol"] 132 + annotation.layer = [[RMMarker alloc] initWithMapboxMarkerImage:[annotation.userInfo objectForKey:@"marker-symbol"]
133 tintColorHex:[annotation.userInfo objectForKey:@"marker-color"] 133 tintColorHex:[annotation.userInfo objectForKey:@"marker-color"]
134 sizeString:[annotation.userInfo objectForKey:@"marker-size"]]; 134 sizeString:[annotation.userInfo objectForKey:@"marker-size"]];
135 135
1 -{"attribution":"<a href='http://mapbox.com/about/maps' target='_blank'>Terms & Feedback</a>","bounds":[-180,-85.0511,180,85.0511],"center":[0,0,3],"description":"","geocoder":"http://a.tiles.mapbox.com/v3/examples.map-z2effxa8/geocode/{query}.jsonp","id":"examples.map-z2effxa8","maxzoom":19,"minzoom":0,"name":"MapBox iOS Example","private":true,"scheme":"xyz","tilejson":"2.0.0","tiles":["http://a.tiles.mapbox.com/v3/examples.map-z2effxa8/{z}/{x}/{y}.png","http://b.tiles.mapbox.com/v3/examples.map-z2effxa8/{z}/{x}/{y}.png","http://c.tiles.mapbox.com/v3/examples.map-z2effxa8/{z}/{x}/{y}.png","http://d.tiles.mapbox.com/v3/examples.map-z2effxa8/{z}/{x}/{y}.png"],"webpage":"http://tiles.mapbox.com/examples/map/map-z2effxa8"}  
  1 +{"attribution":"<a href='http://mapbox.com/about/maps' target='_blank'>Terms & Feedback</a>","bounds":[-180,-85.0511,180,85.0511],"center":[0,0,3],"description":"","geocoder":"http://a.tiles.mapbox.com/v3/examples.map-z2effxa8/geocode/{query}.jsonp","id":"examples.map-z2effxa8","maxzoom":19,"minzoom":0,"name":"Mapbox iOS Example","private":true,"scheme":"xyz","tilejson":"2.0.0","tiles":["http://a.tiles.mapbox.com/v3/examples.map-z2effxa8/{z}/{x}/{y}.png","http://b.tiles.mapbox.com/v3/examples.map-z2effxa8/{z}/{x}/{y}.png","http://c.tiles.mapbox.com/v3/examples.map-z2effxa8/{z}/{x}/{y}.png","http://d.tiles.mapbox.com/v3/examples.map-z2effxa8/{z}/{x}/{y}.png"],"webpage":"http://tiles.mapbox.com/examples/map/map-z2effxa8"}
@@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
113 DD4195CA162356900049E6BA /* RMBingSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DD4195C8162356900049E6BA /* RMBingSource.m */; }; 113 DD4195CA162356900049E6BA /* RMBingSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DD4195C8162356900049E6BA /* RMBingSource.m */; };
114 DD41960116250ED40049E6BA /* RMTileCacheDownloadOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DD4195FF16250ED40049E6BA /* RMTileCacheDownloadOperation.h */; settings = {ATTRIBUTES = (Private, ); }; }; 114 DD41960116250ED40049E6BA /* RMTileCacheDownloadOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DD4195FF16250ED40049E6BA /* RMTileCacheDownloadOperation.h */; settings = {ATTRIBUTES = (Private, ); }; };
115 DD41960216250ED40049E6BA /* RMTileCacheDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DD41960016250ED40049E6BA /* RMTileCacheDownloadOperation.m */; }; 115 DD41960216250ED40049E6BA /* RMTileCacheDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DD41960016250ED40049E6BA /* RMTileCacheDownloadOperation.m */; };
116 - DD4BE198161CE296003EF677 /* MapBox.h in Headers */ = {isa = PBXBuildFile; fileRef = DD4BE197161CE296003EF677 /* MapBox.h */; settings = {ATTRIBUTES = (Public, ); }; }; 116 + DD4BE198161CE296003EF677 /* Mapbox.h in Headers */ = {isa = PBXBuildFile; fileRef = DD4BE197161CE296003EF677 /* Mapbox.h */; settings = {ATTRIBUTES = (Public, ); }; };
117 DD5FA1EB15E2B020004EB6C5 /* RMLoadingTileView.h in Headers */ = {isa = PBXBuildFile; fileRef = DD5FA1E915E2B020004EB6C5 /* RMLoadingTileView.h */; settings = {ATTRIBUTES = (Private, ); }; }; 117 DD5FA1EB15E2B020004EB6C5 /* RMLoadingTileView.h in Headers */ = {isa = PBXBuildFile; fileRef = DD5FA1E915E2B020004EB6C5 /* RMLoadingTileView.h */; settings = {ATTRIBUTES = (Private, ); }; };
118 DD5FA1EC15E2B020004EB6C5 /* RMLoadingTileView.m in Sources */ = {isa = PBXBuildFile; fileRef = DD5FA1EA15E2B020004EB6C5 /* RMLoadingTileView.m */; }; 118 DD5FA1EC15E2B020004EB6C5 /* RMLoadingTileView.m in Sources */ = {isa = PBXBuildFile; fileRef = DD5FA1EA15E2B020004EB6C5 /* RMLoadingTileView.m */; };
119 DD63176317D15EB5008CA79B /* RMCircleAnnotation.h in Headers */ = {isa = PBXBuildFile; fileRef = DD63176117D15EB5008CA79B /* RMCircleAnnotation.h */; settings = {ATTRIBUTES = (Public, ); }; }; 119 DD63176317D15EB5008CA79B /* RMCircleAnnotation.h in Headers */ = {isa = PBXBuildFile; fileRef = DD63176117D15EB5008CA79B /* RMCircleAnnotation.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -143,8 +143,8 @@ @@ -143,8 +143,8 @@
143 DD94D46C16C2E064003D5739 /* HeadingAngleMedium.png in Resources */ = {isa = PBXBuildFile; fileRef = DD94D46816C2E064003D5739 /* HeadingAngleMedium.png */; }; 143 DD94D46C16C2E064003D5739 /* HeadingAngleMedium.png in Resources */ = {isa = PBXBuildFile; fileRef = DD94D46816C2E064003D5739 /* HeadingAngleMedium.png */; };
144 DD94D46D16C2E064003D5739 /* HeadingAngleMedium@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DD94D46916C2E064003D5739 /* HeadingAngleMedium@2x.png */; }; 144 DD94D46D16C2E064003D5739 /* HeadingAngleMedium@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DD94D46916C2E064003D5739 /* HeadingAngleMedium@2x.png */; };
145 DD97C11616489678007C4652 /* libProj4.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD97C11516489678007C4652 /* libProj4.a */; }; 145 DD97C11616489678007C4652 /* libProj4.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD97C11516489678007C4652 /* libProj4.a */; };
146 - DD98B6FA14D76B930092882F /* RMMapBoxSource.h in Headers */ = {isa = PBXBuildFile; fileRef = DD98B6F814D76B930092882F /* RMMapBoxSource.h */; settings = {ATTRIBUTES = (Public, ); }; };  
147 - DD98B6FB14D76B930092882F /* RMMapBoxSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DD98B6F914D76B930092882F /* RMMapBoxSource.m */; }; 146 + DD98B6FA14D76B930092882F /* RMMapboxSource.h in Headers */ = {isa = PBXBuildFile; fileRef = DD98B6F814D76B930092882F /* RMMapboxSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
  147 + DD98B6FB14D76B930092882F /* RMMapboxSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DD98B6F914D76B930092882F /* RMMapboxSource.m */; };
148 DDA257011798A95600BBB325 /* TrackingLocationOffMaskLandscape@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256F61798A95600BBB325 /* TrackingLocationOffMaskLandscape@2x.png */; }; 148 DDA257011798A95600BBB325 /* TrackingLocationOffMaskLandscape@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256F61798A95600BBB325 /* TrackingLocationOffMaskLandscape@2x.png */; };
149 DDA257021798A95600BBB325 /* TrackingLocationOffMask@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256F71798A95600BBB325 /* TrackingLocationOffMask@2x.png */; }; 149 DDA257021798A95600BBB325 /* TrackingLocationOffMask@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256F71798A95600BBB325 /* TrackingLocationOffMask@2x.png */; };
150 DDA257031798A95600BBB325 /* TrackingLocationMaskLandscape@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256F81798A95600BBB325 /* TrackingLocationMaskLandscape@2x.png */; }; 150 DDA257031798A95600BBB325 /* TrackingLocationMaskLandscape@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256F81798A95600BBB325 /* TrackingLocationMaskLandscape@2x.png */; };
@@ -220,7 +220,7 @@ @@ -220,7 +220,7 @@
220 16FBF07515936BF1004ECAD1 /* RMTileSourcesContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMTileSourcesContainer.m; sourceTree = "<group>"; }; 220 16FBF07515936BF1004ECAD1 /* RMTileSourcesContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMTileSourcesContainer.m; sourceTree = "<group>"; };
221 16FFF2C914E3DBF700A170EC /* RMMapQuestOpenAerialSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMapQuestOpenAerialSource.h; sourceTree = "<group>"; }; 221 16FFF2C914E3DBF700A170EC /* RMMapQuestOpenAerialSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMapQuestOpenAerialSource.h; sourceTree = "<group>"; };
222 16FFF2CA14E3DBF700A170EC /* RMMapQuestOpenAerialSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMapQuestOpenAerialSource.m; sourceTree = "<group>"; }; 222 16FFF2CA14E3DBF700A170EC /* RMMapQuestOpenAerialSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMapQuestOpenAerialSource.m; sourceTree = "<group>"; };
223 - 17F31EFA1331050A00122B16 /* libMapBox.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libMapBox.a; sourceTree = BUILT_PRODUCTS_DIR; }; 223 + 17F31EFA1331050A00122B16 /* libMapbox.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libMapbox.a; sourceTree = BUILT_PRODUCTS_DIR; };
224 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 224 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
225 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 225 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
226 23A0AAE80EB90A99003A4521 /* RMFoundation.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = RMFoundation.c; sourceTree = "<group>"; }; 226 23A0AAE80EB90A99003A4521 /* RMFoundation.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = RMFoundation.c; sourceTree = "<group>"; };
@@ -292,13 +292,13 @@ @@ -292,13 +292,13 @@
292 DD4195C8162356900049E6BA /* RMBingSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMBingSource.m; sourceTree = "<group>"; }; 292 DD4195C8162356900049E6BA /* RMBingSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMBingSource.m; sourceTree = "<group>"; };
293 DD4195FF16250ED40049E6BA /* RMTileCacheDownloadOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMTileCacheDownloadOperation.h; sourceTree = "<group>"; }; 293 DD4195FF16250ED40049E6BA /* RMTileCacheDownloadOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMTileCacheDownloadOperation.h; sourceTree = "<group>"; };
294 DD41960016250ED40049E6BA /* RMTileCacheDownloadOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMTileCacheDownloadOperation.m; sourceTree = "<group>"; }; 294 DD41960016250ED40049E6BA /* RMTileCacheDownloadOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMTileCacheDownloadOperation.m; sourceTree = "<group>"; };
295 - DD4BE197161CE296003EF677 /* MapBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapBox.h; sourceTree = "<group>"; }; 295 + DD4BE197161CE296003EF677 /* Mapbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Mapbox.h; sourceTree = "<group>"; };
296 DD5FA1E915E2B020004EB6C5 /* RMLoadingTileView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMLoadingTileView.h; sourceTree = "<group>"; }; 296 DD5FA1E915E2B020004EB6C5 /* RMLoadingTileView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMLoadingTileView.h; sourceTree = "<group>"; };
297 DD5FA1EA15E2B020004EB6C5 /* RMLoadingTileView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMLoadingTileView.m; sourceTree = "<group>"; }; 297 DD5FA1EA15E2B020004EB6C5 /* RMLoadingTileView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMLoadingTileView.m; sourceTree = "<group>"; };
298 DD63176117D15EB5008CA79B /* RMCircleAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMCircleAnnotation.h; sourceTree = "<group>"; }; 298 DD63176117D15EB5008CA79B /* RMCircleAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMCircleAnnotation.h; sourceTree = "<group>"; };
299 DD63176217D15EB5008CA79B /* RMCircleAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMCircleAnnotation.m; sourceTree = "<group>"; }; 299 DD63176217D15EB5008CA79B /* RMCircleAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMCircleAnnotation.m; sourceTree = "<group>"; };
300 DD63DD521811AD0B00726E03 /* libGRMustache6-iOS.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libGRMustache6-iOS.a"; path = "GRMustache/lib/libGRMustache6-iOS.a"; sourceTree = "<group>"; }; 300 DD63DD521811AD0B00726E03 /* libGRMustache6-iOS.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libGRMustache6-iOS.a"; path = "GRMustache/lib/libGRMustache6-iOS.a"; sourceTree = "<group>"; };
301 - DD6A83751644A20C0097F31F /* MapBox.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MapBox.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 301 + DD6A83751644A20C0097F31F /* Mapbox.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Mapbox.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
302 DD7C7E36164C894F0021CCA5 /* RMStaticMapView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMStaticMapView.h; sourceTree = "<group>"; }; 302 DD7C7E36164C894F0021CCA5 /* RMStaticMapView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMStaticMapView.h; sourceTree = "<group>"; };
303 DD7C7E37164C894F0021CCA5 /* RMStaticMapView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMStaticMapView.m; sourceTree = "<group>"; }; 303 DD7C7E37164C894F0021CCA5 /* RMStaticMapView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMStaticMapView.m; sourceTree = "<group>"; };
304 DD8CDB4814E0507100B73EB9 /* RMMapQuestOSMSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMapQuestOSMSource.h; sourceTree = "<group>"; }; 304 DD8CDB4814E0507100B73EB9 /* RMMapQuestOSMSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMapQuestOSMSource.h; sourceTree = "<group>"; };
@@ -323,8 +323,8 @@ @@ -323,8 +323,8 @@
323 DD94D46816C2E064003D5739 /* HeadingAngleMedium.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HeadingAngleMedium.png; path = Map/Resources/HeadingAngleMedium.png; sourceTree = "<group>"; }; 323 DD94D46816C2E064003D5739 /* HeadingAngleMedium.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HeadingAngleMedium.png; path = Map/Resources/HeadingAngleMedium.png; sourceTree = "<group>"; };
324 DD94D46916C2E064003D5739 /* HeadingAngleMedium@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "HeadingAngleMedium@2x.png"; path = "Map/Resources/HeadingAngleMedium@2x.png"; sourceTree = "<group>"; }; 324 DD94D46916C2E064003D5739 /* HeadingAngleMedium@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "HeadingAngleMedium@2x.png"; path = "Map/Resources/HeadingAngleMedium@2x.png"; sourceTree = "<group>"; };
325 DD97C11516489678007C4652 /* libProj4.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libProj4.a; path = ../Proj4/libProj4.a; sourceTree = "<group>"; }; 325 DD97C11516489678007C4652 /* libProj4.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libProj4.a; path = ../Proj4/libProj4.a; sourceTree = "<group>"; };
326 - DD98B6F814D76B930092882F /* RMMapBoxSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMapBoxSource.h; sourceTree = "<group>"; };  
327 - DD98B6F914D76B930092882F /* RMMapBoxSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMapBoxSource.m; sourceTree = "<group>"; }; 326 + DD98B6F814D76B930092882F /* RMMapboxSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMapboxSource.h; sourceTree = "<group>"; };
  327 + DD98B6F914D76B930092882F /* RMMapboxSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMapboxSource.m; sourceTree = "<group>"; };
328 DDA256F61798A95600BBB325 /* TrackingLocationOffMaskLandscape@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingLocationOffMaskLandscape@2x.png"; path = "Map/Resources/TrackingLocationOffMaskLandscape@2x.png"; sourceTree = "<group>"; }; 328 DDA256F61798A95600BBB325 /* TrackingLocationOffMaskLandscape@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingLocationOffMaskLandscape@2x.png"; path = "Map/Resources/TrackingLocationOffMaskLandscape@2x.png"; sourceTree = "<group>"; };
329 DDA256F71798A95600BBB325 /* TrackingLocationOffMask@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingLocationOffMask@2x.png"; path = "Map/Resources/TrackingLocationOffMask@2x.png"; sourceTree = "<group>"; }; 329 DDA256F71798A95600BBB325 /* TrackingLocationOffMask@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingLocationOffMask@2x.png"; path = "Map/Resources/TrackingLocationOffMask@2x.png"; sourceTree = "<group>"; };
330 DDA256F81798A95600BBB325 /* TrackingLocationMaskLandscape@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingLocationMaskLandscape@2x.png"; path = "Map/Resources/TrackingLocationMaskLandscape@2x.png"; sourceTree = "<group>"; }; 330 DDA256F81798A95600BBB325 /* TrackingLocationMaskLandscape@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingLocationMaskLandscape@2x.png"; path = "Map/Resources/TrackingLocationMaskLandscape@2x.png"; sourceTree = "<group>"; };
@@ -391,8 +391,8 @@ @@ -391,8 +391,8 @@
391 D1437B32122869E400888DAE /* RMDBMapSource.m */, 391 D1437B32122869E400888DAE /* RMDBMapSource.m */,
392 1607499314E120A100D535F5 /* RMGenericMapSource.h */, 392 1607499314E120A100D535F5 /* RMGenericMapSource.h */,
393 1607499414E120A100D535F5 /* RMGenericMapSource.m */, 393 1607499414E120A100D535F5 /* RMGenericMapSource.m */,
394 - DD98B6F814D76B930092882F /* RMMapBoxSource.h */,  
395 - DD98B6F914D76B930092882F /* RMMapBoxSource.m */, 394 + DD98B6F814D76B930092882F /* RMMapboxSource.h */,
  395 + DD98B6F914D76B930092882F /* RMMapboxSource.m */,
396 16FFF2C914E3DBF700A170EC /* RMMapQuestOpenAerialSource.h */, 396 16FFF2C914E3DBF700A170EC /* RMMapQuestOpenAerialSource.h */,
397 16FFF2CA14E3DBF700A170EC /* RMMapQuestOpenAerialSource.m */, 397 16FFF2CA14E3DBF700A170EC /* RMMapQuestOpenAerialSource.m */,
398 DD8CDB4814E0507100B73EB9 /* RMMapQuestOSMSource.h */, 398 DD8CDB4814E0507100B73EB9 /* RMMapQuestOSMSource.h */,
@@ -418,8 +418,8 @@ @@ -418,8 +418,8 @@
418 19C28FACFE9D520D11CA2CBB /* Products */ = { 418 19C28FACFE9D520D11CA2CBB /* Products */ = {
419 isa = PBXGroup; 419 isa = PBXGroup;
420 children = ( 420 children = (
421 - 17F31EFA1331050A00122B16 /* libMapBox.a */,  
422 - DD6A83751644A20C0097F31F /* MapBox.bundle */, 421 + 17F31EFA1331050A00122B16 /* libMapbox.a */,
  422 + DD6A83751644A20C0097F31F /* Mapbox.bundle */,
423 ); 423 );
424 name = Products; 424 name = Products;
425 sourceTree = "<group>"; 425 sourceTree = "<group>";
@@ -560,7 +560,7 @@ @@ -560,7 +560,7 @@
560 B8C9740D0E8A196E007D16AD /* Map */ = { 560 B8C9740D0E8A196E007D16AD /* Map */ = {
561 isa = PBXGroup; 561 isa = PBXGroup;
562 children = ( 562 children = (
563 - DD4BE197161CE296003EF677 /* MapBox.h */, 563 + DD4BE197161CE296003EF677 /* Mapbox.h */,
564 B8C974690E8A1A50007D16AD /* RMMapView.h */, 564 B8C974690E8A1A50007D16AD /* RMMapView.h */,
565 B8C9746A0E8A1A50007D16AD /* RMMapView.m */, 565 B8C9746A0E8A1A50007D16AD /* RMMapView.m */,
566 12F2031E0EBB65E9003D7B6B /* RMMapViewDelegate.h */, 566 12F2031E0EBB65E9003D7B6B /* RMMapViewDelegate.h */,
@@ -740,13 +740,13 @@ @@ -740,13 +740,13 @@
740 16EC85D6133CA6C300219947 /* RMCacheObject.h in Headers */, 740 16EC85D6133CA6C300219947 /* RMCacheObject.h in Headers */,
741 160EEDAF13D41DEC007C5501 /* RMAnnotation.h in Headers */, 741 160EEDAF13D41DEC007C5501 /* RMAnnotation.h in Headers */,
742 DD2B375514CF8197008DE8CB /* RMMBTilesSource.h in Headers */, 742 DD2B375514CF8197008DE8CB /* RMMBTilesSource.h in Headers */,
743 - DD98B6FA14D76B930092882F /* RMMapBoxSource.h in Headers */, 743 + DD98B6FA14D76B930092882F /* RMMapboxSource.h in Headers */,
744 1607499514E120A100D535F5 /* RMGenericMapSource.h in Headers */, 744 1607499514E120A100D535F5 /* RMGenericMapSource.h in Headers */,
745 DDC4BED5152E3BD700089409 /* RMInteractiveSource.h in Headers */, 745 DDC4BED5152E3BD700089409 /* RMInteractiveSource.h in Headers */,
746 DD8FD7541559E4A40044D96F /* RMUserLocation.h in Headers */, 746 DD8FD7541559E4A40044D96F /* RMUserLocation.h in Headers */,
747 DDA6B8BD155CAB67003DB5D8 /* RMUserTrackingBarButtonItem.h in Headers */, 747 DDA6B8BD155CAB67003DB5D8 /* RMUserTrackingBarButtonItem.h in Headers */,
748 16F98C961590CFF000FF90CE /* RMShape.h in Headers */, 748 16F98C961590CFF000FF90CE /* RMShape.h in Headers */,
749 - DD4BE198161CE296003EF677 /* MapBox.h in Headers */, 749 + DD4BE198161CE296003EF677 /* Mapbox.h in Headers */,
750 16E5A63A15E531F200C92A5A /* RMCompositeSource.h in Headers */, 750 16E5A63A15E531F200C92A5A /* RMCompositeSource.h in Headers */,
751 DD7C7E38164C894F0021CCA5 /* RMStaticMapView.h in Headers */, 751 DD7C7E38164C894F0021CCA5 /* RMStaticMapView.h in Headers */,
752 DDE357E71651F570001DB842 /* RMPointAnnotation.h in Headers */, 752 DDE357E71651F570001DB842 /* RMPointAnnotation.h in Headers */,
@@ -806,7 +806,7 @@ @@ -806,7 +806,7 @@
806 ); 806 );
807 name = MapView; 807 name = MapView;
808 productName = MapView; 808 productName = MapView;
809 - productReference = 17F31EFA1331050A00122B16 /* libMapBox.a */; 809 + productReference = 17F31EFA1331050A00122B16 /* libMapbox.a */;
810 productType = "com.apple.product-type.library.static"; 810 productType = "com.apple.product-type.library.static";
811 }; 811 };
812 DD6A83741644A20C0097F31F /* Resources */ = { 812 DD6A83741644A20C0097F31F /* Resources */ = {
@@ -822,7 +822,7 @@ @@ -822,7 +822,7 @@
822 ); 822 );
823 name = Resources; 823 name = Resources;
824 productName = Resources; 824 productName = Resources;
825 - productReference = DD6A83751644A20C0097F31F /* MapBox.bundle */; 825 + productReference = DD6A83751644A20C0097F31F /* Mapbox.bundle */;
826 productType = "com.apple.product-type.bundle"; 826 productType = "com.apple.product-type.bundle";
827 }; 827 };
828 /* End PBXNativeTarget section */ 828 /* End PBXNativeTarget section */
@@ -939,7 +939,7 @@ @@ -939,7 +939,7 @@
939 DD2B375014CF814F008DE8CB /* FMDatabasePool.m in Sources */, 939 DD2B375014CF814F008DE8CB /* FMDatabasePool.m in Sources */,
940 DD2B375214CF814F008DE8CB /* FMDatabaseQueue.m in Sources */, 940 DD2B375214CF814F008DE8CB /* FMDatabaseQueue.m in Sources */,
941 DD2B375614CF8197008DE8CB /* RMMBTilesSource.m in Sources */, 941 DD2B375614CF8197008DE8CB /* RMMBTilesSource.m in Sources */,
942 - DD98B6FB14D76B930092882F /* RMMapBoxSource.m in Sources */, 942 + DD98B6FB14D76B930092882F /* RMMapboxSource.m in Sources */,
943 DD8CDB4B14E0507100B73EB9 /* RMMapQuestOSMSource.m in Sources */, 943 DD8CDB4B14E0507100B73EB9 /* RMMapQuestOSMSource.m in Sources */,
944 1607499614E120A100D535F5 /* RMGenericMapSource.m in Sources */, 944 1607499614E120A100D535F5 /* RMGenericMapSource.m in Sources */,
945 16FFF2CC14E3DBF700A170EC /* RMMapQuestOpenAerialSource.m in Sources */, 945 16FFF2CC14E3DBF700A170EC /* RMMapQuestOpenAerialSource.m in Sources */,
@@ -1005,7 +1005,7 @@ @@ -1005,7 +1005,7 @@
1005 "\"$(SRCROOT)/../Proj4\"", 1005 "\"$(SRCROOT)/../Proj4\"",
1006 ); 1006 );
1007 OTHER_LDFLAGS = "-ObjC"; 1007 OTHER_LDFLAGS = "-ObjC";
1008 - PRODUCT_NAME = MapBox; 1008 + PRODUCT_NAME = Mapbox;
1009 RUN_CLANG_STATIC_ANALYZER = NO; 1009 RUN_CLANG_STATIC_ANALYZER = NO;
1010 }; 1010 };
1011 name = Debug; 1011 name = Debug;
@@ -1030,7 +1030,7 @@ @@ -1030,7 +1030,7 @@
1030 "\"$(SRCROOT)/../Proj4\"", 1030 "\"$(SRCROOT)/../Proj4\"",
1031 ); 1031 );
1032 OTHER_LDFLAGS = "-ObjC"; 1032 OTHER_LDFLAGS = "-ObjC";
1033 - PRODUCT_NAME = MapBox; 1033 + PRODUCT_NAME = Mapbox;
1034 ZERO_LINK = NO; 1034 ZERO_LINK = NO;
1035 }; 1035 };
1036 name = Release; 1036 name = Release;
@@ -1135,7 +1135,7 @@ @@ -1135,7 +1135,7 @@
1135 GCC_WARN_UNINITIALIZED_AUTOS = YES; 1135 GCC_WARN_UNINITIALIZED_AUTOS = YES;
1136 INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; 1136 INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
1137 ONLY_ACTIVE_ARCH = YES; 1137 ONLY_ACTIVE_ARCH = YES;
1138 - PRODUCT_NAME = MapBox; 1138 + PRODUCT_NAME = Mapbox;
1139 WRAPPER_EXTENSION = bundle; 1139 WRAPPER_EXTENSION = bundle;
1140 }; 1140 };
1141 name = Debug; 1141 name = Debug;
@@ -1157,7 +1157,7 @@ @@ -1157,7 +1157,7 @@
1157 GCC_WARN_64_TO_32_BIT_CONVERSION = YES; 1157 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
1158 GCC_WARN_UNINITIALIZED_AUTOS = YES; 1158 GCC_WARN_UNINITIALIZED_AUTOS = YES;
1159 INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; 1159 INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
1160 - PRODUCT_NAME = MapBox; 1160 + PRODUCT_NAME = Mapbox;
1161 WRAPPER_EXTENSION = bundle; 1161 WRAPPER_EXTENSION = bundle;
1162 }; 1162 };
1163 name = Release; 1163 name = Release;
1 -MapBox iOS SDK 1 +Mapbox iOS SDK
2 -------------- 2 --------------
3 3
4 -Based on the Route-Me iOS map library (Alpstein fork) with [MapBox][mapbox] customizations. 4 +Based on the Route-Me iOS map library (Alpstein fork) with [Mapbox][mapbox] customizations.
5 5
6 Requires iOS 5, Xcode 5.0 or greater, and ARC. 6 Requires iOS 5, Xcode 5.0 or greater, and ARC.
7 7
@@ -11,8 +11,8 @@ Major differences from [Alpstein fork of Route-Me](https://github.com/Alpstein/r @@ -11,8 +11,8 @@ Major differences from [Alpstein fork of Route-Me](https://github.com/Alpstein/r
11 11
12 * Requires iOS 5.0 and above. 12 * Requires iOS 5.0 and above.
13 * Supports Automatic Reference Counting (ARC). 13 * Supports Automatic Reference Counting (ARC).
14 - * [MapBox](http://mapbox.com) & [MBTiles](http://mbtiles.org) tile source integration code.  
15 - * [MapBox Markers](http://mapbox.com/blog/markers/) support. 14 + * [Mapbox](http://mapbox.com) & [MBTiles](http://mbtiles.org) tile source integration code.
  15 + * [Mapbox Markers](http://mapbox.com/blog/markers/) support.
16 * [UTFGrid interactivity](http://mapbox.com/mbtiles-spec/utfgrid/). 16 * [UTFGrid interactivity](http://mapbox.com/mbtiles-spec/utfgrid/).
17 * Improved network tile loading performance. 17 * Improved network tile loading performance.
18 * A bulk, background map tile downloader for cache pre-population. 18 * A bulk, background map tile downloader for cache pre-population.
@@ -35,7 +35,7 @@ Route-Me @@ -35,7 +35,7 @@ Route-Me
35 35
36 Route-Me is an open source map library that runs natively on iOS. It's designed to look and feel much like the built-in iOS map library, but it's entirely open, and works with any map source using a pluggable backend system. 36 Route-Me is an open source map library that runs natively on iOS. It's designed to look and feel much like the built-in iOS map library, but it's entirely open, and works with any map source using a pluggable backend system.
37 37
38 -Supported map tile sources include [MapBox][1]/[TileStream][2], the offline-capable, database-backed format [MBTiles][3], [OpenStreetMap][4], and several others. 38 +Supported map tile sources include [Mapbox][1]/[TileStream][2], the offline-capable, database-backed format [MBTiles][3], [OpenStreetMap][4], and several others.
39 39
40 Please note that you are responsible for getting permission to use the map data, and for ensuring your use adheres to the relevant terms of use. 40 Please note that you are responsible for getting permission to use the map data, and for ensuring your use adheres to the relevant terms of use.
41 41
@@ -50,7 +50,7 @@ Installation @@ -50,7 +50,7 @@ Installation
50 There are three ways that you can install the SDK, depending upon your needs: 50 There are three ways that you can install the SDK, depending upon your needs:
51 51
52 1. Clone from GitHub and integrate as a dependent Xcode project. 52 1. Clone from GitHub and integrate as a dependent Xcode project.
53 - 1. Use the [binary framework](http://mapbox-ios-sdk.s3.amazonaws.com/index.html). Use like regular frameworks, linking it in your project, adding `#import <MapBox/MapBox.h>`, and additionally, including the `-ObjC` linker flag. 53 + 1. Use the [binary framework](http://mapbox-ios-sdk.s3.amazonaws.com/index.html). Use like regular frameworks, linking it in your project, adding `#import <Mapbox/Mapbox.h>`, and additionally, including the `-ObjC` linker flag.
54 1. Install via [CocoaPods](http://cocoapods.org). 54 1. Install via [CocoaPods](http://cocoapods.org).
55 55
56 More detailed information on the installation options is available in the [SDK guide](http://mapbox.com/mapbox-ios-sdk/). 56 More detailed information on the installation options is available in the [SDK guide](http://mapbox.com/mapbox-ios-sdk/).
@@ -63,8 +63,8 @@ Then, update the submodules: @@ -63,8 +63,8 @@ Then, update the submodules:
63 63
64 Some example apps showing usage of the SDK (with screenshots): 64 Some example apps showing usage of the SDK (with screenshots):
65 65
66 - * [MapBox iOS Example](https://github.com/mapbox/mapbox-ios-example) - online, offline, and interactive tile sources  
67 - * [MapBox Me](https://github.com/mapbox/mapbox-me) - user location services and terrain toggling 66 + * [Mapbox iOS Example](https://github.com/mapbox/mapbox-ios-example) - online, offline, and interactive tile sources
  67 + * [Mapbox Me](https://github.com/mapbox/mapbox-me) - user location services and terrain toggling
68 * [Weekend Picks](https://github.com/mapbox/weekend-picks-template-ios) - markers and data 68 * [Weekend Picks](https://github.com/mapbox/weekend-picks-template-ios) - markers and data
69 69
70 More documentation is available: 70 More documentation is available:
@@ -73,25 +73,25 @@ More documentation is available: @@ -73,25 +73,25 @@ More documentation is available:
73 73
74 There are two subdirectories - MapView and Proj4. Proj4 is a support library used to do map projections. The MapView project contains only the Route-Me map library. 74 There are two subdirectories - MapView and Proj4. Proj4 is a support library used to do map projections. The MapView project contains only the Route-Me map library.
75 75
76 -See License.txt for license details. In any app that uses this SDK, include the following text on your "preferences" or "about" screen: "Uses MapBox iOS SDK, (c) 2008-2013 MapBox and Route-Me Contributors". Your data provider will have additional attribution requirements. 76 +See License.txt for license details. In any app that uses this SDK, include the following text on your "preferences" or "about" screen: "Uses Mapbox iOS SDK, (c) 2008-2013 Mapbox and Route-Me Contributors". Your data provider will have additional attribution requirements.
77 77
78 News, Support and Contributing 78 News, Support and Contributing
79 ------------------------------ 79 ------------------------------
80 80
81 Complete API documentation is available [online](http://mapbox.com/mapbox-ios-sdk/api/) or as an [Xcode docset Atom feed](http://mapbox.com/mapbox-ios-sdk/Docs/publish/docset.atom). 81 Complete API documentation is available [online](http://mapbox.com/mapbox-ios-sdk/api/) or as an [Xcode docset Atom feed](http://mapbox.com/mapbox-ios-sdk/Docs/publish/docset.atom).
82 82
83 -The MapBox iOS SDK has a [support resource](http://support.mapbox.com/discussions/mapbox-ios-sdk) where you can open cases and browse other developers' discussions about use of the SDK. 83 +The Mapbox iOS SDK has a [support resource](http://support.mapbox.com/discussions/mapbox-ios-sdk) where you can open cases and browse other developers' discussions about use of the SDK.
84 84
85 We have a [basic technical overview](http://mapbox.com/mapbox-ios-sdk/) along with the installation instructions. 85 We have a [basic technical overview](http://mapbox.com/mapbox-ios-sdk/) along with the installation instructions.
86 86
87 -MapBox has an IRC channel on `irc.freenode.net` in `#mapbox`. 87 +Mapbox has an IRC channel on `irc.freenode.net` in `#mapbox`.
88 88
89 To report bugs and help fix them, please use the [issue tracker](https://github.com/mapbox/mapbox-ios-sdk/issues). 89 To report bugs and help fix them, please use the [issue tracker](https://github.com/mapbox/mapbox-ios-sdk/issues).
90 90
91 Dependent Libraries 91 Dependent Libraries
92 ------------------- 92 -------------------
93 93
94 -The MapBox iOS SDK makes use of several sub-libraries, listed below. See License.txt for more detailed information about Route-Me and Proj4 and see the individual license files in the sub-libraries for more information on each. 94 +The Mapbox iOS SDK makes use of several sub-libraries, listed below. See License.txt for more detailed information about Route-Me and Proj4 and see the individual license files in the sub-libraries for more information on each.
95 95
96 * [FMDB](https://github.com/ccgus/fmdb) by Gus Mueller (SQLite for caching and MBTiles) 96 * [FMDB](https://github.com/ccgus/fmdb) by Gus Mueller (SQLite for caching and MBTiles)
97 * [GRMustache](https://github.com/groue/GRMustache) by Gwendal Roué (Mustache templates) 97 * [GRMustache](https://github.com/groue/GRMustache) by Gwendal Roué (Mustache templates)