尹诚 / 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
MapBox iOS SDK copyright (c) 2012, MapBox.
Mapbox iOS SDK copyright (c) 2012-2013, Mapbox.
The Route-Me library is copyright (c) 2008-2012, Route-Me Contributors
All rights reserved.
... ...
Pod::Spec.new do |m|
m.name = 'MapBox'
m.name = 'Mapbox'
m.version = '1.0.0'
m.summary = 'Open source alternative to MapKit.'
m.description = 'Open source alternative to MapKit supporting custom tile sources, offline use, and complete cache control.'
m.homepage = 'http://mapbox.com/mobile'
m.license = 'BSD'
m.author = { 'MapBox' => 'ios@mapbox.com' }
m.author = { 'Mapbox' => 'ios@mapbox.com' }
m.screenshot = 'https://raw.github.com/mapbox/mapbox-ios-sdk/packaging/screenshot.png'
m.source = { :git => 'https://github.com/mapbox/mapbox-ios-sdk.git', :branch => 'develop' }
... ... @@ -25,18 +25,18 @@ Pod::Spec.new do |m|
Dir.chdir(pod.root) do
command = "xcodebuild -project MapView/MapView.xcodeproj -target Resources CONFIGURATION_BUILD_DIR=../Resources 2>&1 > /dev/null"
unless system(command)
raise ::Pod::Informative, "Failed to generate MapBox resources bundle"
raise ::Pod::Informative, "Failed to generate Mapbox resources bundle"
end
end
end
m.resource = 'Resources/MapBox.bundle'
m.resource = 'Resources/Mapbox.bundle'
m.documentation = {
:html => 'http://mapbox.com/mapbox-ios-sdk/api/',
:appledoc => [
'--project-company', 'MapBox',
'--docset-copyright', 'MapBox',
'--project-company', 'Mapbox',
'--docset-copyright', 'Mapbox',
'--no-keep-undocumented-objects',
'--no-keep-undocumented-members',
'--ignore', '.c',
... ... @@ -74,7 +74,7 @@ Pod::Spec.new do |m|
m.libraries = 'Proj4', 'sqlite3', 'z'
m.xcconfig = { 'OTHER_LDFLAGS' => '-ObjC', 'LIBRARY_SEARCH_PATHS' => '"${PODS_ROOT}/MapBox/Proj4"' }
m.xcconfig = { 'OTHER_LDFLAGS' => '-ObjC', 'LIBRARY_SEARCH_PATHS' => '"${PODS_ROOT}/Mapbox/Proj4"' }
m.preserve_paths = 'Proj4/libProj4.a', 'MapView/MapView.xcodeproj', 'MapView/Map/Resources'
... ...
//
// MapBox.h
// Mapbox.h
//
// Copyright (c) 2008-2013, Route-Me Contributors
// Copyright (c) 2008-2013, Mapbox & Route-Me Contributors
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
... ... @@ -38,7 +38,7 @@
#import "RMDatabaseCache.h"
#import "RMInteractiveSource.h"
#import "RMMBTilesSource.h"
#import "RMMapBoxSource.h"
#import "RMMapboxSource.h"
#import "RMMapView.h"
#import "RMMapViewDelegate.h"
#import "RMMarker.h"
... ...
... ... @@ -3,7 +3,7 @@
// MapView
//
// Created by Justin Miller on 6/19/12.
// Copyright (c) 2012 MapBox / Development Seed. All rights reserved.
// Copyright (c) 2012-2013 Mapbox. All rights reserved.
//
#import <UIKit/UIKit.h>
... ...
... ... @@ -3,7 +3,7 @@
// MapView
//
// Created by Justin Miller on 6/19/12.
// Copyright (c) 2012 MapBox / Development Seed. All rights reserved.
// Copyright (c) 2012-2013 Mapbox. All rights reserved.
//
#import "RMAttributionViewController.h"
... ... @@ -133,7 +133,7 @@
{
// add SDK info
//
[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];
[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];
// add tinted logo
//
... ...
... ... @@ -46,7 +46,7 @@
/** Access and change the global user agent for HTTP requests using the library.
*
* If unset, defaults to `MapBox iOS SDK` followed by generic hardware model and software version information.
* If unset, defaults to `Mapbox iOS SDK` followed by generic hardware model and software version information.
*
* Example: `MyMapApp/1.2` */
@property (nonatomic, retain) NSString *userAgent;
... ...
... ... @@ -101,7 +101,7 @@ static RMConfiguration *RMConfigurationSharedInstance = nil;
if (!(self = [super init]))
return nil;
_userAgent = [NSString stringWithFormat:@"MapBox iOS SDK (%@/%@)", [[UIDevice currentDevice] model], [[UIDevice currentDevice] systemVersion]];
_userAgent = [NSString stringWithFormat:@"Mapbox iOS SDK (%@/%@)", [[UIDevice currentDevice] model], [[UIDevice currentDevice] systemVersion]];
if (path == nil)
{
... ...
... ... @@ -2,7 +2,7 @@
// RMInteractiveSource.h
//
// Created by Justin R. Miller on 6/22/11.
// Copyright 2012 MapBox.
// Copyright 2012-2013 Mapbox.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
... ... @@ -15,7 +15,7 @@
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// * Neither the name of MapBox, nor the names of its contributors may be
// * Neither the name of Mapbox, nor the names of its contributors may be
// used to endorse or promote products derived from this software
// without specific prior written permission.
//
... ... @@ -35,14 +35,14 @@
#import "RMMapView.h"
#import "RMMBTilesSource.h"
#import "RMMapBoxSource.h"
#import "RMMapboxSource.h"
typedef enum : NSUInteger {
RMInteractiveSourceOutputTypeTeaser = 0,
RMInteractiveSourceOutputTypeFull = 1,
} RMInteractiveSourceOutputType;
/** 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.
/** 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.
*
* Interactive map views adopt the RMInteractiveMapView protocol.
*
... ... @@ -75,7 +75,7 @@ typedef enum : NSUInteger {
#pragma mark -
/** 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/).
/** 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/).
*
* Interactive tile sources adopt the RMInteractiveSource protocol.
*
... ... @@ -109,7 +109,7 @@ typedef enum : NSUInteger {
#pragma mark -
@interface RMMapBoxSource (RMInteractiveSource) <RMInteractiveSource>
@interface RMMapboxSource (RMInteractiveSource) <RMInteractiveSource>
- (BOOL)supportsInteractivity;
- (NSString *)formattedOutputOfType:(RMInteractiveSourceOutputType)outputType forPoint:(CGPoint)point inMapView:(RMMapView *)mapView;
... ...
... ... @@ -2,7 +2,7 @@
// RMInteractiveSource.m
//
// Created by Justin R. Miller on 6/22/11.
// Copyright 2012 MapBox.
// Copyright 2012-2013 Mapbox.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
... ... @@ -15,7 +15,7 @@
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// * Neither the name of MapBox, nor the names of its contributors may be
// * Neither the name of Mapbox, nor the names of its contributors may be
// used to endorse or promote products derived from this software
// without specific prior written permission.
//
... ... @@ -77,7 +77,7 @@
//
for (id <RMTileSource>source in [[self.tileSources reverseObjectEnumerator] allObjects])
{
if (([source isKindOfClass:[RMMBTilesSource class]] || [source isKindOfClass:[RMMapBoxSource class]]) &&
if (([source isKindOfClass:[RMMBTilesSource class]] || [source isKindOfClass:[RMMapboxSource class]]) &&
[source conformsToProtocol:@protocol(RMInteractiveSource)] &&
[(id <RMInteractiveSource>)source supportsInteractivity])
{
... ... @@ -160,7 +160,7 @@ RMTilePoint RMInteractiveSourceNormalizedTilePointForMapView(CGPoint point, RMMa
//
id <RMTileSource>interactiveSource = [mapView interactiveTileSource];
if (([interactiveSource isKindOfClass:[RMMapBoxSource class]] && [((RMMapBoxSource *)interactiveSource).infoDictionary objectForKey:@"scheme"] && [[((RMMapBoxSource *)interactiveSource).infoDictionary objectForKey:@"scheme"] isEqual:@"tms"]) || [interactiveSource isKindOfClass:[RMMBTilesSource class]])
if (([interactiveSource isKindOfClass:[RMMapboxSource class]] && [((RMMapboxSource *)interactiveSource).infoDictionary objectForKey:@"scheme"] && [[((RMMapboxSource *)interactiveSource).infoDictionary objectForKey:@"scheme"] isEqual:@"tms"]) || [interactiveSource isKindOfClass:[RMMBTilesSource class]])
{
tileY = pow(2.0, tileZoom) - tileY - 1.0;
}
... ... @@ -487,16 +487,16 @@ RMTilePoint RMInteractiveSourceNormalizedTilePointForMapView(CGPoint point, RMMa
@end
#pragma mark - MapBox
#pragma mark - Mapbox
@interface RMMapBoxSource (RMInteractiveSourcePrivate) <RMInteractiveSourcePrivate>
@interface RMMapboxSource (RMInteractiveSourcePrivate) <RMInteractiveSourcePrivate>
- (NSDictionary *)interactivityDictionaryForPoint:(CGPoint)point inMapView:(RMMapView *)mapView;
- (NSString *)interactivityFormatterTemplate;
@end
@implementation RMMapBoxSource (RMInteractiveSource)
@implementation RMMapboxSource (RMInteractiveSource)
- (NSString *)description
{
... ...
... ... @@ -2,7 +2,7 @@
// RMMBTilesSource.h
//
// Created by Justin R. Miller on 6/18/10.
// Copyright 2012 MapBox.
// Copyright 2012-2013 Mapbox.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
... ... @@ -15,7 +15,7 @@
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// * Neither the name of MapBox, nor the names of its contributors may be
// * Neither the name of Mapbox, nor the names of its contributors may be
// used to endorse or promote products derived from this software
// without specific prior written permission.
//
... ...
... ... @@ -2,7 +2,7 @@
// RMMBTilesSource.m
//
// Created by Justin R. Miller on 6/18/10.
// Copyright 2012 MapBox.
// Copyright 2012-2013 Mapbox.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
... ... @@ -15,7 +15,7 @@
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// * Neither the name of MapBox, nor the names of its contributors may be
// * Neither the name of Mapbox, nor the names of its contributors may be
// used to endorse or promote products derived from this software
// without specific prior written permission.
//
... ...
//
// RMMapBoxSource.h
// RMMapboxSource.h
//
// Created by Justin R. Miller on 5/17/11.
// Copyright 2012 MapBox.
// Copyright 2012-2013 Mapbox.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
... ... @@ -15,7 +15,7 @@
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// * Neither the name of MapBox, nor the names of its contributors may be
// * Neither the name of Mapbox, nor the names of its contributors may be
// used to endorse or promote products derived from this software
// without specific prior written permission.
//
... ... @@ -33,48 +33,48 @@
#import "RMAbstractWebMapSource.h"
#define kMapBoxDefaultTileSize 256
#define kMapBoxDefaultMinTileZoom 0
#define kMapBoxDefaultMaxTileZoom 18
#define kMapBoxDefaultLatLonBoundingBox ((RMSphericalTrapezium){ .northEast = { .latitude = 90, .longitude = 180 }, \
#define kMapboxDefaultTileSize 256
#define kMapboxDefaultMinTileZoom 0
#define kMapboxDefaultMaxTileZoom 18
#define kMapboxDefaultLatLonBoundingBox ((RMSphericalTrapezium){ .northEast = { .latitude = 90, .longitude = 180 }, \
.southWest = { .latitude = -90, .longitude = -180 } })
#define kMapBoxPlaceholderMapID @"examples.map-z2effxa8"
#define kMapboxPlaceholderMapID @"examples.map-z2effxa8"
// constants for the image quality API (see http://mapbox.com/developers/api/#image_quality)
typedef enum : NSUInteger {
RMMapBoxSourceQualityFull = 0, // default
RMMapBoxSourceQualityPNG32 = 1, // 32 color indexed PNG
RMMapBoxSourceQualityPNG64 = 2, // 64 color indexed PNG
RMMapBoxSourceQualityPNG128 = 3, // 128 color indexed PNG
RMMapBoxSourceQualityPNG256 = 4, // 256 color indexed PNG
RMMapBoxSourceQualityJPEG70 = 5, // 70% quality JPEG
RMMapBoxSourceQualityJPEG80 = 6, // 80% quality JPEG
RMMapBoxSourceQualityJPEG90 = 7 // 90% quality JPEG
} RMMapBoxSourceQuality;
RMMapboxSourceQualityFull = 0, // default
RMMapboxSourceQualityPNG32 = 1, // 32 color indexed PNG
RMMapboxSourceQualityPNG64 = 2, // 64 color indexed PNG
RMMapboxSourceQualityPNG128 = 3, // 128 color indexed PNG
RMMapboxSourceQualityPNG256 = 4, // 256 color indexed PNG
RMMapboxSourceQualityJPEG70 = 5, // 70% quality JPEG
RMMapboxSourceQualityJPEG80 = 6, // 80% quality JPEG
RMMapboxSourceQualityJPEG90 = 7 // 90% quality JPEG
} RMMapboxSourceQuality;
@class RMMapView;
/** 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/). */
@interface RMMapBoxSource : RMAbstractWebMapSource
/** 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/). */
@interface RMMapboxSource : RMAbstractWebMapSource
/** @name Creating Tile Sources */
/** Initialize a tile source using the MapBox map ID.
/** Initialize a tile source using the Mapbox map ID.
*
* This method requires a network connection in order to download the TileJSON used to define the tile source.
*
* @param mapID The MapBox map ID string, typically in the format `<username>.map-<random characters>`.
* @return An initialized MapBox tile source. */
* @param mapID The Mapbox map ID string, typically in the format `<username>.map-<random characters>`.
* @return An initialized Mapbox tile source. */
- (id)initWithMapID:(NSString *)mapID;
/** Initialize a tile source using the MapBox map ID, optionally enabling SSL.
/** Initialize a tile source using the Mapbox map ID, optionally enabling SSL.
*
* This method requires a network connection in order to download the TileJSON used to define the tile source.
*
* @param mapID The MapBox map ID string, typically in the format `<username>.map-<random characters>`.
* @param mapID The Mapbox map ID string, typically in the format `<username>.map-<random characters>`.
* @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`.
* @return An initialized MapBox tile source. */
* @return An initialized Mapbox tile source. */
- (id)initWithMapID:(NSString *)mapID enablingSSL:(BOOL)enableSSL;
/** Initialize a tile source with either a remote or local TileJSON structure.
... ... @@ -84,37 +84,37 @@ typedef enum : NSUInteger {
* @see tileJSON
*
* @param referenceURL A remote or file path URL pointing to a TileJSON structure.
* @return An initialized MapBox tile source. */
* @return An initialized Mapbox tile source. */
- (id)initWithReferenceURL:(NSURL *)referenceURL;
/** Initialize a tile source with TileJSON.
* @param tileJSON A string containing TileJSON.
* @return An initialized MapBox tile source. */
* @return An initialized Mapbox tile source. */
- (id)initWithTileJSON:(NSString *)tileJSON;
/** For TileJSON 2.1.0+ layers, initialize a tile source and automatically find and add annotations from [simplestyle](http://mapbox.com/developers/simplestyle/) data.
*
* This method requires a network connection in order to download the TileJSON used to define the tile source.
*
* @param mapID The MapBox map ID string, typically in the format `<username>.map-<random characters>`.
* @param mapID The Mapbox map ID string, typically in the format `<username>.map-<random characters>`.
* @param mapView A map view on which to display the annotations.
* @return An initialized MapBox tile source. */
* @return An initialized Mapbox tile source. */
- (id)initWithMapID:(NSString *)mapID enablingDataOnMapView:(RMMapView *)mapView;
/** 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.
*
* This method requires a network connection in order to download the TileJSON used to define the tile source.
*
* @param mapID The MapBox map ID string, typically in the format `<username>.map-<random characters>`.
* @param mapID The Mapbox map ID string, typically in the format `<username>.map-<random characters>`.
* @param mapView A map view on which to display the annotations.
* @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`.
* @return An initialized MapBox tile source. */
* @return An initialized Mapbox tile source. */
- (id)initWithMapID:(NSString *)mapID enablingDataOnMapView:(RMMapView *)mapView enablingSSL:(BOOL)enableSSL;
/** For TileJSON 2.1.0+ layers, initialize a tile source and automatically find and add annotations from [simplestyle](http://mapbox.com/developers/simplestyle/) data.
* @param tileJSON A string containing TileJSON.
* @param mapView A map view on which to display the annotations.
* @return An initialized MapBox tile source. */
* @return An initialized Mapbox tile source. */
- (id)initWithTileJSON:(NSString *)tileJSON enablingDataOnMapView:(RMMapView *)mapView;
/** 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 {
*
* @param referenceURL A remote or file path URL pointing to a TileJSON structure.
* @param mapView A map view on which to display the annotations.
* @return An initialized MapBox tile source. */
* @return An initialized Mapbox tile source. */
- (id)initWithReferenceURL:(NSURL *)referenceURL enablingDataOnMapView:(RMMapView *)mapView;
/** @name Querying Tile Source Information */
... ... @@ -156,7 +156,7 @@ typedef enum : NSUInteger {
/** Image quality that is retrieved from the network. Useful for lower-bandwidth environments. The default is to provide full-quality imagery.
*
* Note that you may want to clear the tile cache after changing this value in order to provide a consistent experience. */
@property (nonatomic, assign) RMMapBoxSourceQuality imageQuality;
@property (nonatomic, assign) RMMapboxSourceQuality imageQuality;
@property (nonatomic, readonly, assign) dispatch_queue_t dataQueue;
... ...
//
// RMMapBoxSource.m
// RMMapboxSource.m
//
// Created by Justin R. Miller on 5/17/11.
// Copyright 2012 MapBox.
// Copyright 2012-2013 Mapbox.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
... ... @@ -15,7 +15,7 @@
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// * Neither the name of MapBox, nor the names of its contributors may be
// * Neither the name of Mapbox, nor the names of its contributors may be
// used to endorse or promote products derived from this software
// without specific prior written permission.
//
... ... @@ -31,13 +31,13 @@
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
#import "RMMapBoxSource.h"
#import "RMMapboxSource.h"
#import "RMMapView.h"
#import "RMPointAnnotation.h"
#import "RMConfiguration.h"
@interface RMMapBoxSource ()
@interface RMMapboxSource ()
@property (nonatomic, strong) NSDictionary *infoDictionary;
@property (nonatomic, strong) NSString *tileJSON;
... ... @@ -46,13 +46,13 @@
#pragma mark -
@implementation RMMapBoxSource
@implementation RMMapboxSource
@synthesize infoDictionary=_infoDictionary, tileJSON=_tileJSON, imageQuality=_imageQuality, dataQueue=_dataQueue;
- (id)init
{
return [self initWithReferenceURL:[NSURL fileURLWithPath:[RMMapView pathForBundleResourceNamed:kMapBoxPlaceholderMapID ofType:@"json"]]];
return [self initWithReferenceURL:[NSURL fileURLWithPath:[RMMapView pathForBundleResourceNamed:kMapboxPlaceholderMapID ofType:@"json"]]];
}
- (id)initWithMapID:(NSString *)mapID
... ... @@ -213,48 +213,48 @@
if ([[UIScreen mainScreen] scale] > 1.0)
tileURLString = [tileURLString stringByReplacingOccurrencesOfString:@".png" withString:@"@2x.png"];
if (_imageQuality != RMMapBoxSourceQualityFull)
if (_imageQuality != RMMapboxSourceQualityFull)
{
NSString *qualityExtension = nil;
switch (_imageQuality)
{
case RMMapBoxSourceQualityPNG32:
case RMMapboxSourceQualityPNG32:
{
qualityExtension = @".png32";
break;
}
case RMMapBoxSourceQualityPNG64:
case RMMapboxSourceQualityPNG64:
{
qualityExtension = @".png64";
break;
}
case RMMapBoxSourceQualityPNG128:
case RMMapboxSourceQualityPNG128:
{
qualityExtension = @".png128";
break;
}
case RMMapBoxSourceQualityPNG256:
case RMMapboxSourceQualityPNG256:
{
qualityExtension = @".png256";
break;
}
case RMMapBoxSourceQualityJPEG70:
case RMMapboxSourceQualityJPEG70:
{
qualityExtension = @".jpg70";
break;
}
case RMMapBoxSourceQualityJPEG80:
case RMMapboxSourceQualityJPEG80:
{
qualityExtension = @".jpg80";
break;
}
case RMMapBoxSourceQualityJPEG90:
case RMMapboxSourceQualityJPEG90:
{
qualityExtension = @".jpg90";
break;
}
case RMMapBoxSourceQualityFull:
case RMMapboxSourceQualityFull:
default:
{
qualityExtension = @".png";
... ... @@ -309,13 +309,13 @@
return bounds;
}
return kMapBoxDefaultLatLonBoundingBox;
return kMapboxDefaultLatLonBoundingBox;
}
- (BOOL)coversFullWorld
{
RMSphericalTrapezium ownBounds = [self latitudeLongitudeBoundingBox];
RMSphericalTrapezium defaultBounds = kMapBoxDefaultLatLonBoundingBox;
RMSphericalTrapezium defaultBounds = kMapboxDefaultLatLonBoundingBox;
if (ownBounds.southWest.longitude <= defaultBounds.southWest.longitude + 10 &&
ownBounds.northEast.longitude >= defaultBounds.northEast.longitude - 10)
... ... @@ -352,7 +352,7 @@
- (NSString *)uniqueTilecacheKey
{
return [NSString stringWithFormat:@"MapBox-%@-%@", [self.infoDictionary objectForKey:@"id"], [self.infoDictionary objectForKey:@"version"]];
return [NSString stringWithFormat:@"Mapbox-%@-%@", [self.infoDictionary objectForKey:@"id"], [self.infoDictionary objectForKey:@"version"]];
}
- (NSString *)shortName
... ...
... ... @@ -138,7 +138,7 @@ typedef enum : NSUInteger {
/** @name Initializing a Map View */
/** Initialize a map view with a given frame. A default watermarked MapBox map tile source will be used. */
/** Initialize a map view with a given frame. A default watermarked Mapbox map tile source will be used. */
- (id)initWithFrame:(CGRect)frame;
/** Initialize a map view with a given frame and tile source.
... ...
... ... @@ -42,7 +42,7 @@
#import "RMTileCache.h"
#import "RMTileSource.h"
#import "RMMapBoxSource.h"
#import "RMMapboxSource.h"
#import "RMMapTiledLayerView.h"
#import "RMMapOverlayView.h"
... ... @@ -355,7 +355,7 @@
- (id)initWithFrame:(CGRect)frame
{
return [self initWithFrame:frame andTilesource:[RMMapBoxSource new]];
return [self initWithFrame:frame andTilesource:[RMMapboxSource new]];
}
- (id)initWithFrame:(CGRect)frame andTilesource:(id <RMTileSource>)newTilesource
... ... @@ -426,9 +426,9 @@
+ (NSString *)pathForBundleResourceNamed:(NSString *)name ofType:(NSString *)extension
{
NSAssert([[NSBundle mainBundle] pathForResource:@"MapBox" ofType:@"bundle"], @"Resource bundle not found in application.");
NSAssert([[NSBundle mainBundle] pathForResource:@"Mapbox" ofType:@"bundle"], @"Resource bundle not found in application.");
NSString *bundlePath = [[NSBundle mainBundle] pathForResource:@"MapBox" ofType:@"bundle"];
NSString *bundlePath = [[NSBundle mainBundle] pathForResource:@"Mapbox" ofType:@"bundle"];
NSBundle *resourcesBundle = [NSBundle bundleWithPath:bundlePath];
return [resourcesBundle pathForResource:name ofType:extension];
... ... @@ -615,7 +615,7 @@
// needs a scroll view frame in order to calculate _metersPerPixel.
// See https://github.com/mapbox/mapbox-ios-sdk/issues/270
//
[self performInitializationWithTilesource:[RMMapBoxSource new]
[self performInitializationWithTilesource:[RMMapboxSource new]
centerCoordinate:CLLocationCoordinate2DMake(kDefaultInitialLatitude, kDefaultInitialLongitude)
zoomLevel:kDefaultInitialZoomLevel
maxZoomLevel:kDefaultMaximumZoomLevel
... ...
... ... @@ -30,10 +30,10 @@
#import "RMFoundation.h"
typedef enum : NSUInteger {
RMMarkerMapBoxImageSizeSmall,
RMMarkerMapBoxImageSizeMedium,
RMMarkerMapBoxImageSizeLarge
} RMMarkerMapBoxImageSize;
RMMarkerMapboxImageSizeSmall,
RMMarkerMapboxImageSizeMedium,
RMMarkerMapboxImageSizeLarge
} RMMarkerMapboxImageSize;
/** 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. */
@interface RMMarker : RMMapLayer
... ... @@ -70,44 +70,44 @@ typedef enum : NSUInteger {
* @return An initialized marker object. */
- (id)initWithUIImage:(UIImage *)image anchorPoint:(CGPoint)anchorPoint;
/** @name Creating Markers Using MapBox Images */
/** @name Creating Markers Using Mapbox Images */
/** Initializes and returns a newly allocated marker object using a red, medium-sized star pin image. */
- (id)initWithMapBoxMarkerImage;
- (id)initWithMapboxMarkerImage;
/** Initializes and returns a newly allocated marker object using a red, medium-sized pin image and a given symbol name, e.g., `bus`.
* @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set.
* @return An initialized RMMarker layer. */
- (id)initWithMapBoxMarkerImage:(NSString *)symbolName;
- (id)initWithMapboxMarkerImage:(NSString *)symbolName;
/** 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.
* @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set.
* @param color A color for the marker.
* @return An initialized RMMarker layer. */
- (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color;
- (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color;
/** 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.
* @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set.
* @param color A color for the marker.
* @param size A size for the marker.
* @return An initialized RMMarker layer. */
- (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color size:(RMMarkerMapBoxImageSize)size;
- (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color size:(RMMarkerMapboxImageSize)size;
/** 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`.
* @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set.
* @param colorHex A color for the marker specified as an HTML hex code.
* @return An initialized RMMarker layer. */
- (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex;
- (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex;
/** 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`.
* @param symbolName A symbol name from the [Maki](http://mapbox.com/maki/) icon set.
* @param colorHex A color for the marker specified as an HTML hex code.
* @param sizeString A size such as `small`, `medium`, or `large`.
* @return An initialized RMMarker layer. */
- (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex sizeString:(NSString *)sizeString;
- (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex sizeString:(NSString *)sizeString;
/** 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. */
+ (void)clearCachedMapBoxMarkers;
+ (void)clearCachedMapboxMarkers;
/** @name Altering Labels */
... ...
... ... @@ -79,37 +79,37 @@
return self;
}
- (id)initWithMapBoxMarkerImage
- (id)initWithMapboxMarkerImage
{
return [self initWithMapBoxMarkerImage:nil tintColor:nil size:RMMarkerMapBoxImageSizeMedium];
return [self initWithMapboxMarkerImage:nil tintColor:nil size:RMMarkerMapboxImageSizeMedium];
}
- (id)initWithMapBoxMarkerImage:(NSString *)symbolName
- (id)initWithMapboxMarkerImage:(NSString *)symbolName
{
return [self initWithMapBoxMarkerImage:symbolName tintColor:nil size:RMMarkerMapBoxImageSizeMedium];
return [self initWithMapboxMarkerImage:symbolName tintColor:nil size:RMMarkerMapboxImageSizeMedium];
}
- (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color
- (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color
{
return [self initWithMapBoxMarkerImage:symbolName tintColor:color size:RMMarkerMapBoxImageSizeMedium];
return [self initWithMapboxMarkerImage:symbolName tintColor:color size:RMMarkerMapboxImageSizeMedium];
}
- (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color size:(RMMarkerMapBoxImageSize)size
- (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColor:(UIColor *)color size:(RMMarkerMapboxImageSize)size
{
NSString *sizeString = nil;
switch (size)
{
case RMMarkerMapBoxImageSizeSmall:
case RMMarkerMapboxImageSizeSmall:
sizeString = @"small";
break;
case RMMarkerMapBoxImageSizeMedium:
case RMMarkerMapboxImageSizeMedium:
default:
sizeString = @"medium";
break;
case RMMarkerMapBoxImageSizeLarge:
case RMMarkerMapboxImageSizeLarge:
sizeString = @"large";
break;
}
... ... @@ -130,15 +130,15 @@
}
}
return [self initWithMapBoxMarkerImage:symbolName tintColorHex:colorHex sizeString:sizeString];
return [self initWithMapboxMarkerImage:symbolName tintColorHex:colorHex sizeString:sizeString];
}
- (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex
- (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex
{
return [self initWithMapBoxMarkerImage:symbolName tintColorHex:colorHex sizeString:@"medium"];
return [self initWithMapboxMarkerImage:symbolName tintColorHex:colorHex sizeString:@"medium"];
}
- (id)initWithMapBoxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex sizeString:(NSString *)sizeString
- (id)initWithMapboxMarkerImage:(NSString *)symbolName tintColorHex:(NSString *)colorHex sizeString:(NSString *)sizeString
{
BOOL useRetina = ([[UIScreen mainScreen] scale] > 1.0);
... ... @@ -160,7 +160,7 @@
return [self initWithUIImage:[UIImage imageWithData:[NSData dataWithContentsOfFile:cachePath] scale:(useRetina ? 2.0 : 1.0)]];
}
+ (void)clearCachedMapBoxMarkers
+ (void)clearCachedMapboxMarkers
{
for (NSString *filePath in [[NSFileManager defaultManager] contentsOfDirectoryAtPath:kCachesPath error:nil])
if ([[filePath lastPathComponent] hasPrefix:@"pin-"] && [[filePath lastPathComponent] hasSuffix:@".png"])
... ...
... ... @@ -45,7 +45,7 @@
{
if ( ! [super layer])
{
RMMarker *marker = [[RMMarker alloc] initWithMapBoxMarkerImage:nil tintColor:(RMPostVersion7 ? self.mapView.tintColor : nil)];
RMMarker *marker = [[RMMarker alloc] initWithMapboxMarkerImage:nil tintColor:(RMPostVersion7 ? self.mapView.tintColor : nil)];
marker.canShowCallout = YES;
... ...
... ... @@ -40,7 +40,7 @@
*
* 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.
* @param frame The frame with which to initialize the map view.
* @param mapID The MapBox map ID string, typically in the format `<username>.map-<mapname>`.
* @param mapID The Mapbox map ID string, typically in the format `<username>.map-<mapname>`.
* @return An initialized map view, or `nil` if the map view was unable to be initialized. */
- (id)initWithFrame:(CGRect)frame mapID:(NSString *)mapID;
... ... @@ -48,7 +48,7 @@
*
* 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.
* @param frame The frame with which to initialize the map view.
* @param mapID The MapBox map ID string, typically in the format `<username>.map-<mapname>`.
* @param mapID The Mapbox map ID string, typically in the format `<username>.map-<mapname>`.
* @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.
* @return An initialized map view, or `nil` if the map view was unable to be initialized. */
- (id)initWithFrame:(CGRect)frame mapID:(NSString *)mapID completionHandler:(void (^)(UIImage *))handler;
... ... @@ -57,7 +57,7 @@
*
* The map ID may optionally also include simplestyle marker data, which will automatically be added to the map view.
* @param frame The frame with which to initialize the map view.
* @param mapID The MapBox map ID string, typically in the format `<username>.map-<mapname>`.
* @param mapID The Mapbox map ID string, typically in the format `<username>.map-<mapname>`.
* @param centerCoordinate The map center coordinate.
* @param zoomLevel The map zoom level.
* @return An initialized map view, or `nil` if the map view was unable to be initialized. */
... ... @@ -67,7 +67,7 @@
*
* 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.
* @param frame The frame with which to initialize the map view.
* @param mapID The MapBox map ID string, typically in the format `<username>.map-<mapname>`.
* @param mapID The Mapbox map ID string, typically in the format `<username>.map-<mapname>`.
* @param centerCoordinate The map center coordinate.
* @param zoomLevel The map zoom level.
* @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 @@
#import "RMStaticMapView.h"
#import "RMAnnotation.h"
#import "RMMapBoxSource.h"
#import "RMMapboxSource.h"
#import "RMMarker.h"
#define kMapBoxDefaultCenter CLLocationCoordinate2DMake(MAXFLOAT, MAXFLOAT)
#define kMapBoxDefaultZoom -1.0f
#define kMapboxDefaultCenter CLLocationCoordinate2DMake(MAXFLOAT, MAXFLOAT)
#define kMapboxDefaultZoom -1.0f
@interface RMStaticMapView ()
... ... @@ -54,12 +54,12 @@
- (id)initWithFrame:(CGRect)frame mapID:(NSString *)mapID
{
return [self initWithFrame:frame mapID:mapID centerCoordinate:kMapBoxDefaultCenter zoomLevel:kMapBoxDefaultZoom completionHandler:nil];
return [self initWithFrame:frame mapID:mapID centerCoordinate:kMapboxDefaultCenter zoomLevel:kMapboxDefaultZoom completionHandler:nil];
}
- (id)initWithFrame:(CGRect)frame mapID:(NSString *)mapID completionHandler:(void (^)(UIImage *))handler
{
return [self initWithFrame:frame mapID:mapID centerCoordinate:kMapBoxDefaultCenter zoomLevel:kMapBoxDefaultZoom completionHandler:handler];
return [self initWithFrame:frame mapID:mapID centerCoordinate:kMapboxDefaultCenter zoomLevel:kMapboxDefaultZoom completionHandler:handler];
}
- (id)initWithFrame:(CGRect)frame mapID:(NSString *)mapID centerCoordinate:(CLLocationCoordinate2D)centerCoordinate zoomLevel:(CGFloat)zoomLevel
... ... @@ -82,14 +82,14 @@
if (!(self = [super initWithCoder:aDecoder]))
return nil;
[self performInitializationWithMapID:nil centerCoordinate:kMapBoxDefaultCenter zoomLevel:kMapBoxDefaultZoom completionHandler:nil];
[self performInitializationWithMapID:nil centerCoordinate:kMapboxDefaultCenter zoomLevel:kMapboxDefaultZoom completionHandler:nil];
return self;
}
- (void)performInitializationWithMapID:(NSString *)mapID centerCoordinate:(CLLocationCoordinate2D)centerCoordinate zoomLevel:(CGFloat)zoomLevel completionHandler:(void (^)(UIImage *))handler
{
RMMapBoxSource *tileSource = [[RMMapBoxSource alloc] initWithMapID:kMapBoxPlaceholderMapID enablingDataOnMapView:self];
RMMapboxSource *tileSource = [[RMMapboxSource alloc] initWithMapID:kMapboxPlaceholderMapID enablingDataOnMapView:self];
self.tileSource = tileSource;
... ... @@ -129,7 +129,7 @@
- (void)addAnnotation:(RMAnnotation *)annotation
{
annotation.layer = [[RMMarker alloc] initWithMapBoxMarkerImage:[annotation.userInfo objectForKey:@"marker-symbol"]
annotation.layer = [[RMMarker alloc] initWithMapboxMarkerImage:[annotation.userInfo objectForKey:@"marker-symbol"]
tintColorHex:[annotation.userInfo objectForKey:@"marker-color"]
sizeString:[annotation.userInfo objectForKey:@"marker-size"]];
... ...
{"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"}
\ No newline at end of file
{"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"}
\ No newline at end of file
... ...
... ... @@ -113,7 +113,7 @@
DD4195CA162356900049E6BA /* RMBingSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DD4195C8162356900049E6BA /* RMBingSource.m */; };
DD41960116250ED40049E6BA /* RMTileCacheDownloadOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = DD4195FF16250ED40049E6BA /* RMTileCacheDownloadOperation.h */; settings = {ATTRIBUTES = (Private, ); }; };
DD41960216250ED40049E6BA /* RMTileCacheDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = DD41960016250ED40049E6BA /* RMTileCacheDownloadOperation.m */; };
DD4BE198161CE296003EF677 /* MapBox.h in Headers */ = {isa = PBXBuildFile; fileRef = DD4BE197161CE296003EF677 /* MapBox.h */; settings = {ATTRIBUTES = (Public, ); }; };
DD4BE198161CE296003EF677 /* Mapbox.h in Headers */ = {isa = PBXBuildFile; fileRef = DD4BE197161CE296003EF677 /* Mapbox.h */; settings = {ATTRIBUTES = (Public, ); }; };
DD5FA1EB15E2B020004EB6C5 /* RMLoadingTileView.h in Headers */ = {isa = PBXBuildFile; fileRef = DD5FA1E915E2B020004EB6C5 /* RMLoadingTileView.h */; settings = {ATTRIBUTES = (Private, ); }; };
DD5FA1EC15E2B020004EB6C5 /* RMLoadingTileView.m in Sources */ = {isa = PBXBuildFile; fileRef = DD5FA1EA15E2B020004EB6C5 /* RMLoadingTileView.m */; };
DD63176317D15EB5008CA79B /* RMCircleAnnotation.h in Headers */ = {isa = PBXBuildFile; fileRef = DD63176117D15EB5008CA79B /* RMCircleAnnotation.h */; settings = {ATTRIBUTES = (Public, ); }; };
... ... @@ -143,8 +143,8 @@
DD94D46C16C2E064003D5739 /* HeadingAngleMedium.png in Resources */ = {isa = PBXBuildFile; fileRef = DD94D46816C2E064003D5739 /* HeadingAngleMedium.png */; };
DD94D46D16C2E064003D5739 /* HeadingAngleMedium@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DD94D46916C2E064003D5739 /* HeadingAngleMedium@2x.png */; };
DD97C11616489678007C4652 /* libProj4.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DD97C11516489678007C4652 /* libProj4.a */; };
DD98B6FA14D76B930092882F /* RMMapBoxSource.h in Headers */ = {isa = PBXBuildFile; fileRef = DD98B6F814D76B930092882F /* RMMapBoxSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
DD98B6FB14D76B930092882F /* RMMapBoxSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DD98B6F914D76B930092882F /* RMMapBoxSource.m */; };
DD98B6FA14D76B930092882F /* RMMapboxSource.h in Headers */ = {isa = PBXBuildFile; fileRef = DD98B6F814D76B930092882F /* RMMapboxSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
DD98B6FB14D76B930092882F /* RMMapboxSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DD98B6F914D76B930092882F /* RMMapboxSource.m */; };
DDA257011798A95600BBB325 /* TrackingLocationOffMaskLandscape@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256F61798A95600BBB325 /* TrackingLocationOffMaskLandscape@2x.png */; };
DDA257021798A95600BBB325 /* TrackingLocationOffMask@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256F71798A95600BBB325 /* TrackingLocationOffMask@2x.png */; };
DDA257031798A95600BBB325 /* TrackingLocationMaskLandscape@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DDA256F81798A95600BBB325 /* TrackingLocationMaskLandscape@2x.png */; };
... ... @@ -220,7 +220,7 @@
16FBF07515936BF1004ECAD1 /* RMTileSourcesContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMTileSourcesContainer.m; sourceTree = "<group>"; };
16FFF2C914E3DBF700A170EC /* RMMapQuestOpenAerialSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMapQuestOpenAerialSource.h; sourceTree = "<group>"; };
16FFF2CA14E3DBF700A170EC /* RMMapQuestOpenAerialSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMapQuestOpenAerialSource.m; sourceTree = "<group>"; };
17F31EFA1331050A00122B16 /* libMapBox.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libMapBox.a; sourceTree = BUILT_PRODUCTS_DIR; };
17F31EFA1331050A00122B16 /* libMapbox.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libMapbox.a; sourceTree = BUILT_PRODUCTS_DIR; };
1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
23A0AAE80EB90A99003A4521 /* RMFoundation.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = RMFoundation.c; sourceTree = "<group>"; };
... ... @@ -292,13 +292,13 @@
DD4195C8162356900049E6BA /* RMBingSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMBingSource.m; sourceTree = "<group>"; };
DD4195FF16250ED40049E6BA /* RMTileCacheDownloadOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMTileCacheDownloadOperation.h; sourceTree = "<group>"; };
DD41960016250ED40049E6BA /* RMTileCacheDownloadOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMTileCacheDownloadOperation.m; sourceTree = "<group>"; };
DD4BE197161CE296003EF677 /* MapBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapBox.h; sourceTree = "<group>"; };
DD4BE197161CE296003EF677 /* Mapbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Mapbox.h; sourceTree = "<group>"; };
DD5FA1E915E2B020004EB6C5 /* RMLoadingTileView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMLoadingTileView.h; sourceTree = "<group>"; };
DD5FA1EA15E2B020004EB6C5 /* RMLoadingTileView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMLoadingTileView.m; sourceTree = "<group>"; };
DD63176117D15EB5008CA79B /* RMCircleAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMCircleAnnotation.h; sourceTree = "<group>"; };
DD63176217D15EB5008CA79B /* RMCircleAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMCircleAnnotation.m; sourceTree = "<group>"; };
DD63DD521811AD0B00726E03 /* libGRMustache6-iOS.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libGRMustache6-iOS.a"; path = "GRMustache/lib/libGRMustache6-iOS.a"; sourceTree = "<group>"; };
DD6A83751644A20C0097F31F /* MapBox.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MapBox.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
DD6A83751644A20C0097F31F /* Mapbox.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Mapbox.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
DD7C7E36164C894F0021CCA5 /* RMStaticMapView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMStaticMapView.h; sourceTree = "<group>"; };
DD7C7E37164C894F0021CCA5 /* RMStaticMapView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMStaticMapView.m; sourceTree = "<group>"; };
DD8CDB4814E0507100B73EB9 /* RMMapQuestOSMSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMapQuestOSMSource.h; sourceTree = "<group>"; };
... ... @@ -323,8 +323,8 @@
DD94D46816C2E064003D5739 /* HeadingAngleMedium.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = HeadingAngleMedium.png; path = Map/Resources/HeadingAngleMedium.png; sourceTree = "<group>"; };
DD94D46916C2E064003D5739 /* HeadingAngleMedium@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "HeadingAngleMedium@2x.png"; path = "Map/Resources/HeadingAngleMedium@2x.png"; sourceTree = "<group>"; };
DD97C11516489678007C4652 /* libProj4.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libProj4.a; path = ../Proj4/libProj4.a; sourceTree = "<group>"; };
DD98B6F814D76B930092882F /* RMMapBoxSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMapBoxSource.h; sourceTree = "<group>"; };
DD98B6F914D76B930092882F /* RMMapBoxSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMapBoxSource.m; sourceTree = "<group>"; };
DD98B6F814D76B930092882F /* RMMapboxSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMMapboxSource.h; sourceTree = "<group>"; };
DD98B6F914D76B930092882F /* RMMapboxSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMMapboxSource.m; sourceTree = "<group>"; };
DDA256F61798A95600BBB325 /* TrackingLocationOffMaskLandscape@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingLocationOffMaskLandscape@2x.png"; path = "Map/Resources/TrackingLocationOffMaskLandscape@2x.png"; sourceTree = "<group>"; };
DDA256F71798A95600BBB325 /* TrackingLocationOffMask@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "TrackingLocationOffMask@2x.png"; path = "Map/Resources/TrackingLocationOffMask@2x.png"; sourceTree = "<group>"; };
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 @@
D1437B32122869E400888DAE /* RMDBMapSource.m */,
1607499314E120A100D535F5 /* RMGenericMapSource.h */,
1607499414E120A100D535F5 /* RMGenericMapSource.m */,
DD98B6F814D76B930092882F /* RMMapBoxSource.h */,
DD98B6F914D76B930092882F /* RMMapBoxSource.m */,
DD98B6F814D76B930092882F /* RMMapboxSource.h */,
DD98B6F914D76B930092882F /* RMMapboxSource.m */,
16FFF2C914E3DBF700A170EC /* RMMapQuestOpenAerialSource.h */,
16FFF2CA14E3DBF700A170EC /* RMMapQuestOpenAerialSource.m */,
DD8CDB4814E0507100B73EB9 /* RMMapQuestOSMSource.h */,
... ... @@ -418,8 +418,8 @@
19C28FACFE9D520D11CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
17F31EFA1331050A00122B16 /* libMapBox.a */,
DD6A83751644A20C0097F31F /* MapBox.bundle */,
17F31EFA1331050A00122B16 /* libMapbox.a */,
DD6A83751644A20C0097F31F /* Mapbox.bundle */,
);
name = Products;
sourceTree = "<group>";
... ... @@ -560,7 +560,7 @@
B8C9740D0E8A196E007D16AD /* Map */ = {
isa = PBXGroup;
children = (
DD4BE197161CE296003EF677 /* MapBox.h */,
DD4BE197161CE296003EF677 /* Mapbox.h */,
B8C974690E8A1A50007D16AD /* RMMapView.h */,
B8C9746A0E8A1A50007D16AD /* RMMapView.m */,
12F2031E0EBB65E9003D7B6B /* RMMapViewDelegate.h */,
... ... @@ -740,13 +740,13 @@
16EC85D6133CA6C300219947 /* RMCacheObject.h in Headers */,
160EEDAF13D41DEC007C5501 /* RMAnnotation.h in Headers */,
DD2B375514CF8197008DE8CB /* RMMBTilesSource.h in Headers */,
DD98B6FA14D76B930092882F /* RMMapBoxSource.h in Headers */,
DD98B6FA14D76B930092882F /* RMMapboxSource.h in Headers */,
1607499514E120A100D535F5 /* RMGenericMapSource.h in Headers */,
DDC4BED5152E3BD700089409 /* RMInteractiveSource.h in Headers */,
DD8FD7541559E4A40044D96F /* RMUserLocation.h in Headers */,
DDA6B8BD155CAB67003DB5D8 /* RMUserTrackingBarButtonItem.h in Headers */,
16F98C961590CFF000FF90CE /* RMShape.h in Headers */,
DD4BE198161CE296003EF677 /* MapBox.h in Headers */,
DD4BE198161CE296003EF677 /* Mapbox.h in Headers */,
16E5A63A15E531F200C92A5A /* RMCompositeSource.h in Headers */,
DD7C7E38164C894F0021CCA5 /* RMStaticMapView.h in Headers */,
DDE357E71651F570001DB842 /* RMPointAnnotation.h in Headers */,
... ... @@ -806,7 +806,7 @@
);
name = MapView;
productName = MapView;
productReference = 17F31EFA1331050A00122B16 /* libMapBox.a */;
productReference = 17F31EFA1331050A00122B16 /* libMapbox.a */;
productType = "com.apple.product-type.library.static";
};
DD6A83741644A20C0097F31F /* Resources */ = {
... ... @@ -822,7 +822,7 @@
);
name = Resources;
productName = Resources;
productReference = DD6A83751644A20C0097F31F /* MapBox.bundle */;
productReference = DD6A83751644A20C0097F31F /* Mapbox.bundle */;
productType = "com.apple.product-type.bundle";
};
/* End PBXNativeTarget section */
... ... @@ -939,7 +939,7 @@
DD2B375014CF814F008DE8CB /* FMDatabasePool.m in Sources */,
DD2B375214CF814F008DE8CB /* FMDatabaseQueue.m in Sources */,
DD2B375614CF8197008DE8CB /* RMMBTilesSource.m in Sources */,
DD98B6FB14D76B930092882F /* RMMapBoxSource.m in Sources */,
DD98B6FB14D76B930092882F /* RMMapboxSource.m in Sources */,
DD8CDB4B14E0507100B73EB9 /* RMMapQuestOSMSource.m in Sources */,
1607499614E120A100D535F5 /* RMGenericMapSource.m in Sources */,
16FFF2CC14E3DBF700A170EC /* RMMapQuestOpenAerialSource.m in Sources */,
... ... @@ -1005,7 +1005,7 @@
"\"$(SRCROOT)/../Proj4\"",
);
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = MapBox;
PRODUCT_NAME = Mapbox;
RUN_CLANG_STATIC_ANALYZER = NO;
};
name = Debug;
... ... @@ -1030,7 +1030,7 @@
"\"$(SRCROOT)/../Proj4\"",
);
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = MapBox;
PRODUCT_NAME = Mapbox;
ZERO_LINK = NO;
};
name = Release;
... ... @@ -1135,7 +1135,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = MapBox;
PRODUCT_NAME = Mapbox;
WRAPPER_EXTENSION = bundle;
};
name = Debug;
... ... @@ -1157,7 +1157,7 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
PRODUCT_NAME = MapBox;
PRODUCT_NAME = Mapbox;
WRAPPER_EXTENSION = bundle;
};
name = Release;
... ...
MapBox iOS SDK
Mapbox iOS SDK
--------------
Based on the Route-Me iOS map library (Alpstein fork) with [MapBox][mapbox] customizations.
Based on the Route-Me iOS map library (Alpstein fork) with [Mapbox][mapbox] customizations.
Requires iOS 5, Xcode 5.0 or greater, and ARC.
... ... @@ -11,8 +11,8 @@ Major differences from [Alpstein fork of Route-Me](https://github.com/Alpstein/r
* Requires iOS 5.0 and above.
* Supports Automatic Reference Counting (ARC).
* [MapBox](http://mapbox.com) & [MBTiles](http://mbtiles.org) tile source integration code.
* [MapBox Markers](http://mapbox.com/blog/markers/) support.
* [Mapbox](http://mapbox.com) & [MBTiles](http://mbtiles.org) tile source integration code.
* [Mapbox Markers](http://mapbox.com/blog/markers/) support.
* [UTFGrid interactivity](http://mapbox.com/mbtiles-spec/utfgrid/).
* Improved network tile loading performance.
* A bulk, background map tile downloader for cache pre-population.
... ... @@ -35,7 +35,7 @@ Route-Me
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.
Supported map tile sources include [MapBox][1]/[TileStream][2], the offline-capable, database-backed format [MBTiles][3], [OpenStreetMap][4], and several others.
Supported map tile sources include [Mapbox][1]/[TileStream][2], the offline-capable, database-backed format [MBTiles][3], [OpenStreetMap][4], and several others.
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.
... ... @@ -50,7 +50,7 @@ Installation
There are three ways that you can install the SDK, depending upon your needs:
1. Clone from GitHub and integrate as a dependent Xcode project.
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.
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.
1. Install via [CocoaPods](http://cocoapods.org).
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:
Some example apps showing usage of the SDK (with screenshots):
* [MapBox iOS Example](https://github.com/mapbox/mapbox-ios-example) - online, offline, and interactive tile sources
* [MapBox Me](https://github.com/mapbox/mapbox-me) - user location services and terrain toggling
* [Mapbox iOS Example](https://github.com/mapbox/mapbox-ios-example) - online, offline, and interactive tile sources
* [Mapbox Me](https://github.com/mapbox/mapbox-me) - user location services and terrain toggling
* [Weekend Picks](https://github.com/mapbox/weekend-picks-template-ios) - markers and data
More documentation is available:
... ... @@ -73,25 +73,25 @@ More documentation is available:
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.
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.
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.
News, Support and Contributing
------------------------------
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).
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.
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.
We have a [basic technical overview](http://mapbox.com/mapbox-ios-sdk/) along with the installation instructions.
MapBox has an IRC channel on `irc.freenode.net` in `#mapbox`.
Mapbox has an IRC channel on `irc.freenode.net` in `#mapbox`.
To report bugs and help fix them, please use the [issue tracker](https://github.com/mapbox/mapbox-ios-sdk/issues).
Dependent Libraries
-------------------
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.
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.
* [FMDB](https://github.com/ccgus/fmdb) by Gus Mueller (SQLite for caching and MBTiles)
* [GRMustache](https://github.com/groue/GRMustache) by Gwendal Roué (Mustache templates)
... ...