From f89afa0b277beb733d330f2d40a0b9ca84dfba40 Mon Sep 17 00:00:00 2001 From: Jordan Kiley Date: Mon, 4 Dec 2017 16:40:14 -0800 Subject: [PATCH] [ios, macos] Rename the iOS and macOS SDKs (#10610) --- CHANGELOG.md | 4 +-- CONTRIBUTING.md | 4 +-- INSTALL.md | 6 ++-- README.md | 6 ++-- platform/darwin/src/MGLAccountManager.m | 2 +- platform/darwin/src/NSBundle+MGLAdditions.m | 2 +- platform/ios/CHANGELOG.md | 6 +++- platform/ios/DEVELOPING.md | 28 +++++++-------- platform/ios/INSTALL.md | 12 +++---- platform/ios/README.md | 6 ++-- platform/ios/docs/doc-README.md | 8 ++--- .../ios/docs/guides/Gesture Recognizers.md | 2 +- platform/ios/docs/guides/Info.plist Keys.md | 2 +- platform/ios/docs/pod-README.md | 12 +++---- .../resources/Base.lproj/Localizable.strings | Bin 298 -> 7378 bytes .../resources/bg.lproj/Localizable.strings | 6 ++-- .../resources/ca.lproj/Localizable.strings | 6 ++-- .../resources/de.lproj/Localizable.strings | 6 ++-- .../resources/es.lproj/Localizable.strings | 4 +-- .../resources/fr.lproj/Localizable.strings | 4 +-- .../resources/hu.lproj/Localizable.strings | 6 ++-- .../resources/ja.lproj/Localizable.strings | 6 ++-- .../resources/lt.lproj/Localizable.strings | 6 ++-- .../resources/pt-BR.lproj/Localizable.strings | 4 +-- .../resources/ru.lproj/Localizable.strings | 6 ++-- .../resources/sv.lproj/Localizable.strings | 6 ++-- .../resources/uk.lproj/Localizable.strings | 6 ++-- .../resources/vi.lproj/Localizable.strings | 4 +-- .../zh-Hans.lproj/Localizable.strings | 6 ++-- .../zh-Hant.lproj/Localizable.strings | 6 ++-- platform/ios/src/MGLMapView.mm | 2 +- platform/ios/src/MGLSDKUpdateChecker.mm | 2 +- platform/macos/CHANGELOG.md | 3 ++ platform/macos/DEVELOPING.md | 32 +++++++++--------- platform/macos/INSTALL.md | 8 ++--- platform/macos/docs/guides/Info.plist Keys.md | 2 +- 36 files changed, 119 insertions(+), 112 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5034146ca..4ce6fe25b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,6 @@ Each Mapbox GL Native SDK has a separate changelog that highlights changes relevant to their respective platforms: * [Mapbox Android SDK](platform/android/CHANGELOG.md) -* [Mapbox iOS SDK](platform/ios/CHANGELOG.md) -* [Mapbox macOS SDK](platform/macos/CHANGELOG.md) +* [Mapbox Maps SDK for iOS](platform/ios/CHANGELOG.md) +* [Mapbox Maps SDK for macOS](platform/macos/CHANGELOG.md) * [node-mapbox-gl-native](platform/node/CHANGELOG.md) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 964ac01a8..f996a1773 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,8 +10,8 @@ If you want to contribute code: 1. Pull requests are gladly accepted. If there are any changes that developers using one of the GL SDKs should be aware of, please update the **master** section of the relevant changelog(s): * [Mapbox Android SDK](platform/android/CHANGELOG.md) - * [Mapbox iOS SDK](platform/ios/CHANGELOG.md) - * [Mapbox macOS SDK](platform/macos/CHANGELOG.md) + * [Mapbox Maps SDK for iOS](platform/ios/CHANGELOG.md) + * [Mapbox Maps SDK for macOS](platform/macos/CHANGELOG.md) * [node-mapbox-gl-native](platform/node/CHANGELOG.md) 1. Prefix your commit messages with the platform(s) your changes affect: `[core]`, `[android]`, `[ios]`, `[macos]`, `[node]`, or `[qt]`. diff --git a/INSTALL.md b/INSTALL.md index 61d2271de..78c5a0693 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -56,9 +56,9 @@ dependencies: See the relevant SDK documentation for next steps: -* [Mapbox Android SDK](platform/android/) -* [Mapbox iOS SDK](platform/ios/) -* [Mapbox macOS SDK](platform/macos/) +* [Maps SDK for Android](platform/android/) +* [Maps SDK for iOS](platform/ios/) +* [Maps SDK for iOS](platform/macos/) * [Mapbox Qt SDK](platform/qt/) * [Mapbox GL Native on Linux](platform/linux/) * [node-mapbox-gl-native](platform/node/) diff --git a/README.md b/README.md index 8f6ea9970..c66d2216a 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ This repository hosts the cross-platform Mapbox GL Native library, plus convenie | SDK | Languages | Build status | | --------------------------------------- | ---------------------------------- | ---------------------------------------- | | [Mapbox GL Native](INSTALL.md) | C++14 | [![Circle CI build status](https://circleci.com/gh/mapbox/mapbox-gl-native.svg?style=shield)](https://circleci.com/gh/mapbox/workflows/mapbox-gl-native/tree/master) [![Coverage Status](https://coveralls.io/repos/github/mapbox/mapbox-gl-native/badge.svg?branch=master)](https://coveralls.io/github/mapbox/mapbox-gl-native?branch=master) | -| [Mapbox Android SDK](platform/android/) | Java | [![Circle CI build status](https://circleci.com/gh/mapbox/mapbox-gl-native.svg?style=shield)](https://circleci.com/gh/mapbox/workflows/mapbox-gl-native/tree/master) | -| [Mapbox iOS SDK](platform/ios/) | Objective-C or Swift | [![Bitrise](https://www.bitrise.io/app/7514e4cf3da2cc57.svg?token=OwqZE5rSBR9MVWNr_lf4sA&branch=master)](https://www.bitrise.io/app/7514e4cf3da2cc57) | -| [Mapbox macOS SDK](platform/macos/) | Objective-C, Swift, or AppleScript | [![Bitrise](https://www.bitrise.io/app/155ef7da24b38dcd.svg?token=4KSOw_gd6WxTnvGE2rMttg&branch=master)](https://www.bitrise.io/app/155ef7da24b38dcd) | +| [Mapbox Maps SDK for Android](platform/android/) | Java | [![Circle CI build status](https://circleci.com/gh/mapbox/mapbox-gl-native.svg?style=shield)](https://circleci.com/gh/mapbox/workflows/mapbox-gl-native/tree/master) | +| [Mapbox Maps SDK for iOS](platform/ios/) | Objective-C or Swift | [![Bitrise](https://www.bitrise.io/app/7514e4cf3da2cc57.svg?token=OwqZE5rSBR9MVWNr_lf4sA&branch=master)](https://www.bitrise.io/app/7514e4cf3da2cc57) | +| [Mapbox Maps SDK for macOS](platform/macos/) | Objective-C, Swift, or AppleScript | [![Bitrise](https://www.bitrise.io/app/155ef7da24b38dcd.svg?token=4KSOw_gd6WxTnvGE2rMttg&branch=master)](https://www.bitrise.io/app/155ef7da24b38dcd) | | [node-mapbox-gl-native](platform/node/) | Node.js | [![Circle CI build status](https://circleci.com/gh/mapbox/mapbox-gl-native.svg?style=shield)](https://circleci.com/gh/mapbox/workflows/mapbox-gl-native/tree/master) | | [Mapbox Qt SDK](platform/qt) | C++03 | [![Circle CI build status](https://circleci.com/gh/mapbox/mapbox-gl-native.svg?style=shield)](https://circleci.com/gh/mapbox/workflows/mapbox-gl-native/tree/master) | diff --git a/platform/darwin/src/MGLAccountManager.m b/platform/darwin/src/MGLAccountManager.m index 0f5d03303..7e55779d0 100644 --- a/platform/darwin/src/MGLAccountManager.m +++ b/platform/darwin/src/MGLAccountManager.m @@ -55,7 +55,7 @@ } + (BOOL)mapboxMetricsEnabledSettingShownInApp { - NSLog(@"mapboxMetricsEnabledSettingShownInApp is no longer necessary; the Mapbox iOS SDK has changed to always provide a telemetry setting in-app."); + NSLog(@"mapboxMetricsEnabledSettingShownInApp is no longer necessary; the Mapbox Maps SDK for iOS has changed to always provide a telemetry setting in-app."); return YES; } diff --git a/platform/darwin/src/NSBundle+MGLAdditions.m b/platform/darwin/src/NSBundle+MGLAdditions.m index f383a5030..f55059324 100644 --- a/platform/darwin/src/NSBundle+MGLAdditions.m +++ b/platform/darwin/src/NSBundle+MGLAdditions.m @@ -15,7 +15,7 @@ bundle = [self bundleWithPath:bundlePath]; } else { [NSException raise:@"MGLBundleNotFoundException" format: - @"The Mapbox framework bundle could not be found. If using the Mapbox iOS SDK as a static framework, make sure that Mapbox.bundle is copied into the root of the app bundle."]; + @"The Mapbox framework bundle could not be found. If using the Mapbox Maps SDK for iOS as a static framework, make sure that Mapbox.bundle is copied into the root of the app bundle."]; } } diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index 347329506..5a556ec9a 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changelog for Mapbox iOS SDK +# Changelog for Mapbox Maps SDK for iOS Mapbox welcomes participation and contributions from everyone. Please read [CONTRIBUTING.md](../../CONTRIBUTING.md) to get started. @@ -7,6 +7,10 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT ### Annotations * Fixed an issue that could cause triggering `-[MGLMapViewDelegate mapView:didSelectAnnotation:]` when taping next to a `MGLAnnotationImage` annotation. ([#10538](https://github.com/mapbox/mapbox-gl-native/pull/10538)) +### Packaging + +* Renamed this SDK from Mapbox iOS SDK to Mapbox Maps SDK for iOS. ([#10610](https://github.com/mapbox/mapbox-gl-native/pull/10610)) + ## 3.7.0 - Novemeber 13, 2017 ### Networking and storage diff --git a/platform/ios/DEVELOPING.md b/platform/ios/DEVELOPING.md index 43d7ef3c7..40d45e2e5 100644 --- a/platform/ios/DEVELOPING.md +++ b/platform/ios/DEVELOPING.md @@ -1,12 +1,12 @@ -# Contributing to the Mapbox iOS SDK +# Contributing to the Mapbox Maps SDK for iOS -This document explains how to build the Mapbox iOS SDK from source. It is intended for advanced developers who wish to contribute to Mapbox GL and the Mapbox iOS SDK. +This document explains how to build the Mapbox Maps SDK for iOS from source. It is intended for advanced developers who wish to contribute to Mapbox GL and the Mapbox Maps SDK for iOS. ## Requirements -The Mapbox iOS SDK and iosapp demo application require iOS 8.0 or above. +The Mapbox Maps SDK for iOS and iosapp demo application require iOS 8.0 or above. -The Mapbox iOS SDK requires Xcode 8.0 or above. +The Mapbox Maps SDK for iOS requires Xcode 8.0 or above. ## Building the SDK @@ -70,44 +70,44 @@ To add any Objective-C type, constant, or member to the iOS SDK’s public inter 1. Ensure that the symbol is pure Objective-C and does not rely on any language features specific to Objective-C++ or the C11 dialect of C – so no namespaced types or classes named with emoji! 🙃 Most projects that depend on this SDK are either written in pure Objective-C (GNU99 dialect) or Swift, which cannot yet bridge C++ types. 1. Name the symbol according to [Cocoa naming conventions](https://developer.apple.com/library/prerelease/content/documentation/Cocoa/Conceptual/CodingGuidelines/CodingGuidelines.html#//apple_ref/doc/uid/10000146i). Use the `MGL` class prefix to avoid conflicts with client code. If the symbol has an analogue in MapKit, name the symbol according to MapKit. -1. Provide full documentation comments. We use [jazzy](https://github.com/realm/jazzy/) to produce the documentation found in the SDK distribution and [on the Mapbox iOS SDK website](https://www.mapbox.com/ios-sdk/api/). We also recognize that many developers rely on Xcode’s Quick Help feature. jazzy supports Markdown formatting; however, Quick Help supports only [HeaderDoc](https://developer.apple.com/legacy/library/documentation/DeveloperTools/Conceptual/HeaderDoc/intro/intro.html) syntax and a subset of Doxygen syntax. For hyperlinks, use HTML syntax, which is recognized by both tools. +1. Provide full documentation comments. We use [jazzy](https://github.com/realm/jazzy/) to produce the documentation found in the SDK distribution and [on the website for this SDK](https://www.mapbox.com/ios-sdk/api/). We also recognize that many developers rely on Xcode’s Quick Help feature. jazzy supports Markdown formatting; however, Quick Help supports only [HeaderDoc](https://developer.apple.com/legacy/library/documentation/DeveloperTools/Conceptual/HeaderDoc/intro/intro.html) syntax and a subset of Doxygen syntax. For hyperlinks, use HTML syntax, which is recognized by both tools. ### Making a type or constant public -To add an Objective-C class, protocol, category, typedef, enumeration, or global constant to the iOS SDK’s public interface: +To add an Objective-C class, protocol, category, typedef, enumeration, or global constant to the iOS maps SDK’s public interface: 1. _(Optional.)_ Add the macro `MGL_EXPORT` prior to the declaration for classes and global constants when adding them in shared headers located in `platform/darwin`. To use this macro, include `MGLFoundation.h`. You can check whether all public symbols are exported correctly by running `make check-public-symbols`. 1. _(Optional.)_ Add the type or constant’s name to the relevant category in the `custom_categories` section of [the jazzy configuration file](./jazzy.yml). This is required for classes and protocols and also recommended for any other type that is strongly associated with a particular class or protocol. If you leave out this step, the symbol will appear in an “Other” section in the generated HTML documentation’s table of contents. -1. _(Optional.)_ If the symbol would also be publicly exposed in the macOS SDK, consult [the companion macOS document](../macos/DEVELOPING.md#making-a-type-or-constant-public) for further instructions. +1. _(Optional.)_ If the symbol would also be publicly exposed in the macOS maps SDK, consult [the companion macOS document](../macos/DEVELOPING.md#making-a-type-or-constant-public) for further instructions. ### Adding a source code file -To add an Objective-C header or implementation file to the iOS SDK: +To add an Objective-C header or implementation file to the iOS maps SDK: 1. Add the file to the Headers or Compile Sources build phase, as appropriate, of both the “dynamic” and “static” targets. You can either use the Build Phases tab of the project editor or the Target Membership section of the File inspector. 1. Audit new headers for nullability. Typically, you will wrap a header with `NS_ASSUME_NONNULL_BEGIN` and `NS_ASSUME_NONNULL_END`. 1. _(Optional.)_ If it’s a public header, change its visibility from Project to Public and import it in [the iOS SDK’s umbrella header](./src/Mapbox.h). -1. _(Optional.)_ If the file would also be used by the macOS SDK, make sure it’s in [platform/darwin/src/](../darwin/src/), then consult [the companion macOS document](../macos/DEVELOPING.md#adding-a-source-code-file) for further instructions. +1. _(Optional.)_ If the file would also be used by the macOS maps SDK, make sure it’s in [platform/darwin/src/](../darwin/src/), then consult [the companion macOS document](../macos/DEVELOPING.md#adding-a-source-code-file) for further instructions. ### Adding a resource -To add a resource (such as an image, SSL certificate, property list, or strings table) to the iOS SDK: +To add a resource (such as an image, SSL certificate, property list, or strings table) to the iOS maps SDK: 1. Add the header to the Copy Bundle Resources build phase of both the “dynamic” and “bundle” targets. You can either use the Build Phases tab of the project editor or the Target Membership section of the File inspector. -1. _(Optional.)_ If the resource would also be used by the macOS SDK, make sure it’s in [platform/darwin/resources/](../darwin/resources/), then consult [the companion macOS document](../macos/DEVELOPING.md#adding-a-resource) for further instructions. +1. _(Optional.)_ If the resource would also be used by the macOS maps SDK, make sure it’s in [platform/darwin/resources/](../darwin/resources/), then consult [the companion macOS document](../macos/DEVELOPING.md#adding-a-resource) for further instructions. ### Adding user-facing text -To add or update text that the user may see in the iOS SDK: +To add or update text that the user may see in the iOS maps SDK: 1. Make sure the implementation file imports [NSBundle+MGLAdditions.h](../darwin/src/NSBundle+MGLAdditions.h). 1. Use the `NSLocalizedStringWithDefaultValue()` macro: * `key` is a unique identifier that won’t change if the user-facing text ever needs to change. - * `tbl` is `Foundation` in code shared between the iOS and macOS SDKs, or `nil` otherwise. + * `tbl` is `Foundation` in code shared between the iOS and macOS maps SDKs, or `nil` otherwise. * `bundle` is `nil`; the redefined macro looks for the SDK bundle at runtime and ignores this argument. * `val` is the English string. 1. _(Optional.)_ When dealing with a number followed by a pluralized word, do not split the string. Instead, use a format string and make `val` ambiguous, like `%d file(s)`. Then pluralize for English in the appropriate [.stringsdict file](https://developer.apple.com/library/ios/documentation/MacOSX/Conceptual/BPInternational/StringsdictFileFormat/StringsdictFileFormat.html). See [platform/darwin/resources/en.lproj/Foundation.stringsdict](../darwin/resources/en.lproj/Foundation.stringsdict) for an example. Localizers should do likewise for their languages. -1. Run `make genstrings` and commit any changes it makes to .strings files. The make rule also updates the macOS SDK’s strings tables. +1. Run `make genstrings` and commit any changes it makes to .strings files. The make rule also updates the macOS maps SDK’s strings tables. ### Adding a localization diff --git a/platform/ios/INSTALL.md b/platform/ios/INSTALL.md index b64d9c650..9a85dfe6f 100644 --- a/platform/ios/INSTALL.md +++ b/platform/ios/INSTALL.md @@ -1,16 +1,16 @@ -# Integrating custom builds of the Mapbox iOS SDK into your application +# Integrating custom builds of the Mapbox Maps SDK for iOS into your application -This document explains how to build a development version of Mapbox iOS SDK for use in your own Cocoa Touch application. To use a production-ready version of the SDK, see the [Mapbox iOS SDK homepage](https://mapbox.com/ios-sdk). +This document explains how to build a development version of Mapbox Maps SDK for iOS for use in your own Cocoa Touch application. To use a production-ready version of the SDK, see the [Mapbox Maps SDK for iOS installation page](https://www.mapbox.com/install/ios/). ### Requirements -The Mapbox iOS SDK is intended to run on iOS 8.0 and above on the following devices and their simulators: +The Mapbox Maps SDK for iOS is intended to run on iOS 8.0 and above on the following devices and their simulators: * iPhone 4S and above (5, 5c, 5s, 6, 6 Plus) * iPad 2 and above (3, 4, Mini, Air, Mini 2, Air 2) * iPod touch 5th generation and above -The Mapbox iOS SDK requires Xcode 8.0 or higher. To use this SDK with Xcode 7.3.1, download and use a symbols build from the [releases](https://github.com/mapbox/mapbox-gl-native/releases) page. +The Mapbox Maps SDK for iOS requires Xcode 8.0 or higher. To use this SDK with Xcode 7.3.1, download and use a symbols build from the [releases](https://github.com/mapbox/mapbox-gl-native/releases) page. ### Building the SDK @@ -32,7 +32,7 @@ See the [packaging documentation](DEVELOPING.md#packaging-builds) for other buil ### Installation -There are several ways to install custom builds of the Mapbox iOS SDK: +There are several ways to install custom builds of the Mapbox Maps SDK for iOS: #### Dynamic framework @@ -113,7 +113,7 @@ If using the static framework, add `$(inherited)` to your target’s Other Linke #### Carthage -For instructions on installing stable release versions of the Mapbox iOS SDK with Carthage, see [our website](https://www.mapbox.com/ios-sdk/). If you require a build without symbols pre-stripped, use [this feed URL](https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK-symbols.json) with Carthage. +For instructions on installing stable release versions of the Mapbox Maps SDK for iOS with Carthage, see [our website](https://www.mapbox.com/install/ios/carthage/). If you require a build without symbols pre-stripped, use [this feed URL](https://www.mapbox.com/ios-sdk/Mapbox-iOS-SDK-symbols.json) with Carthage. ##### Testing pre-releases with Carthage diff --git a/platform/ios/README.md b/platform/ios/README.md index af01aed18..40e27c2d3 100644 --- a/platform/ios/README.md +++ b/platform/ios/README.md @@ -1,4 +1,4 @@ -# [Mapbox iOS SDK](https://www.mapbox.com/ios-sdk/) +# [Mapbox Maps SDK for iOS](https://www.mapbox.com/ios-sdk/) [![Bitrise](https://www.bitrise.io/app/7514e4cf3da2cc57.svg?token=OwqZE5rSBR9MVWNr_lf4sA&branch=master)](https://www.bitrise.io/app/7514e4cf3da2cc57) @@ -6,7 +6,7 @@ A library based on [Mapbox GL Native](../../README.md) for embedding interactive This repository is for day-to-day development of the SDK. Building the SDK yourself requires [a number of dependencies and steps](../../INSTALL.md) that are unnecessary for developing production applications. For production applications, please consider installing an official, prebuilt release instead; see the [Mapbox iOS SDK website](https://www.mapbox.com/ios-sdk/) for installation instructions. -* [Integrating the Mapbox iOS SDK into your application](INSTALL.md) -* [Contributing to the Mapbox iOS SDK](DEVELOPING.md) +* [Integrate the Mapbox Maps SDK for iOS into your application](https://www.mapbox.com/install/ios/). +* [Contribute to the Mapbox Maps SDK for iOS](DEVELOPING.md) ![](docs/img/screenshot.png) diff --git a/platform/ios/docs/doc-README.md b/platform/ios/docs/doc-README.md index ebad32e04..7cd0376d0 100644 --- a/platform/ios/docs/doc-README.md +++ b/platform/ios/docs/doc-README.md @@ -1,9 +1,9 @@ -# [Mapbox iOS SDK](https://www.mapbox.com/ios-sdk/) +# [Mapbox Maps SDK for iOS](https://www.mapbox.com/ios-sdk/) -The Mapbox iOS SDK is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa Touch applications on iOS 8.0 and above using Objective-C, Swift, or Interface Builder. It takes stylesheets that conform to the [Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://www.mapbox.com/developers/vector-tiles/), and renders them using OpenGL. +The Mapbox Maps SDK for iOS is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa Touch applications on iOS 8.0 and above using Objective-C, Swift, or Interface Builder. It takes stylesheets that conform to the [Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://www.mapbox.com/developers/vector-tiles/), and renders them using OpenGL. -![Mapbox iOS SDK screenshots](img/screenshot.png) +![Mapbox Maps SDK for iOS screenshots](img/screenshot.png) -For setup information, check out the [Mapbox iOS SDK homepage](https://www.mapbox.com/ios-sdk/). For detailed usage instructions, read “[First steps with the Mapbox iOS SDK](https://www.mapbox.com/help/first-steps-ios-sdk/)” and consult the [online examples](https://www.mapbox.com/ios-sdk/examples/). A [full changelog](https://github.com/mapbox/mapbox-gl-native/blob/master/platform/ios/CHANGELOG.md) is also available. +For setup information, check out the [Mapbox Maps SDK for iOS homepage](https://www.mapbox.com/ios-sdk/). For detailed usage instructions, read “[First steps with the Mapbox Maps SDK for iOS](https://www.mapbox.com/help/first-steps-ios-sdk/)” and consult the [online examples](https://www.mapbox.com/ios-sdk/examples/). A [full changelog](https://github.com/mapbox/mapbox-gl-native/blob/master/platform/ios/CHANGELOG.md) is also available. If you have any questions, please see [our help page](https://www.mapbox.com/help/). We welcome your [bug reports, feature requests, and contributions](https://github.com/mapbox/mapbox-gl-native/issues/). diff --git a/platform/ios/docs/guides/Gesture Recognizers.md b/platform/ios/docs/guides/Gesture Recognizers.md index 08e4c150e..26237e3cf 100644 --- a/platform/ios/docs/guides/Gesture Recognizers.md +++ b/platform/ios/docs/guides/Gesture Recognizers.md @@ -1,6 +1,6 @@ # User Interactions -The Mapbox iOS SDK provides a set of built-in gesture recognizers. You can customize or supplement these gestures according to your use case. You see what gesture recognizers are on your `MGLMapView` by accessing the `gestureRecognizers` property on your map. +The Mapbox Maps SDK for iOS provides a set of built-in gesture recognizers. You can customize or supplement these gestures according to your use case. You see what gesture recognizers are on your `MGLMapView` by accessing the `gestureRecognizers` property on your map. ## Configuring user interaction diff --git a/platform/ios/docs/guides/Info.plist Keys.md b/platform/ios/docs/guides/Info.plist Keys.md index c5c7cf1d8..e74e28b76 100644 --- a/platform/ios/docs/guides/Info.plist Keys.md +++ b/platform/ios/docs/guides/Info.plist Keys.md @@ -1,6 +1,6 @@ # Info.plist Keys -The Mapbox iOS SDK supports custom `Info.plist` keys in your application in order to configure various settings. +The Mapbox Maps SDK for iOS supports custom `Info.plist` keys in your application in order to configure various settings. ## MGLMapboxAccessToken diff --git a/platform/ios/docs/pod-README.md b/platform/ios/docs/pod-README.md index 2e5a78841..f94073bd9 100644 --- a/platform/ios/docs/pod-README.md +++ b/platform/ios/docs/pod-README.md @@ -1,16 +1,16 @@ -# [Mapbox iOS SDK](https://www.mapbox.com/ios-sdk/) +# [Mapbox Maps SDK for iOS](https://www.mapbox.com/ios-sdk/) -The Mapbox iOS SDK is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa Touch applications on iOS 8.0 and above using Objective-C, Swift, or Interface Builder. It takes stylesheets that conform to the [Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://www.mapbox.com/developers/vector-tiles/), and renders them using OpenGL. +The Mapbox Maps SDK for iOS is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa Touch applications on iOS 8.0 and above using Objective-C, Swift, or Interface Builder. It takes stylesheets that conform to the [Mapbox Style Specification](https://www.mapbox.com/mapbox-gl-style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://www.mapbox.com/developers/vector-tiles/), and renders them using OpenGL. -For more information, check out the [Mapbox iOS SDK homepage](https://www.mapbox.com/ios-sdk/) and the [full changelog](https://github.com/mapbox/mapbox-gl-native/blob/master/platform/ios/CHANGELOG.md) online. +For more information, check out the [Mapbox Maps SDK for iOS homepage](https://www.mapbox.com/ios-sdk/) and the [full changelog](https://github.com/mapbox/mapbox-gl-native/blob/master/platform/ios/CHANGELOG.md) online. [![](https://raw.githubusercontent.com/mapbox/mapbox-gl-native/master/platform/ios/docs/img/screenshot.png)]() ## Installation -The Mapbox iOS SDK may be installed as either a dynamic framework or a static framework. (To reduce the download size, the static framework is omitted from some distributions; you may need to download the full package from the [release page](https://github.com/mapbox/mapbox-gl-native/releases/).) +The Mapbox Maps SDK for iOS may be installed as either a dynamic framework or a static framework. (To reduce the download size, the static framework is omitted from some distributions; you may need to download the full package from the [release page](https://github.com/mapbox/mapbox-gl-native/releases/).) -Integrating the Mapbox iOS SDK requires Xcode 8.0 or higher. To use this SDK with Xcode 7.3.1, download and use a symbols build from the [releases](https://github.com/mapbox/mapbox-gl-native/releases) page. +Integrating the Mapbox Maps SDK for iOS requires Xcode 8.0 or higher. To use this SDK with Xcode 7.3.1, download and use a symbols build from the [releases](https://github.com/mapbox/mapbox-gl-native/releases) page. {{DYNAMIC}} @@ -94,6 +94,6 @@ class ViewController: UIViewController { } ``` -Full API documentation is included in this package, within the `documentation` folder. For more details, read “[First steps with the Mapbox iOS SDK](https://www.mapbox.com/help/first-steps-ios-sdk/)” and consult the [online examples](https://www.mapbox.com/ios-sdk/examples/). +Full API documentation is included in this package, within the `documentation` folder. For more details, read “[First steps with the Mapbox Maps SDK for iOS](https://www.mapbox.com/help/first-steps-ios-sdk/)” and consult the [online examples](https://www.mapbox.com/ios-sdk/examples/). If you have any questions, please see [our help page](https://www.mapbox.com/help/). We welcome your [bug reports, feature requests, and contributions](https://github.com/mapbox/mapbox-gl-native/issues/). diff --git a/platform/ios/resources/Base.lproj/Localizable.strings b/platform/ios/resources/Base.lproj/Localizable.strings index cb085add6a0e15eeb5fe4ed062941ceaee09f9ae..245b122fb6471d64d3237bfe7cab0a779801d7cb 100644 GIT binary patch literal 7378 zcmc(kYfl?j5QfiZ{z1O2tfHn>fwt}qd`;dk8aH3B)T8OQ{W*LTS&7Oq|osG3tX7iru zsuo^q-X+bBEG^y1B+XDGFEq~A9_gK7_@sAEb?;Ooj!inApW94b-5-ZlJxOxzNRq>_ z5gPj4GMNs;FX2ah4#TGIbo4AqxhE-+>r&sYiJ@lCwAzvOf21?MFT?_ zo@K5PEXzDsdYTy;yRvI$GJ;8PjsC`ZC#?jY<9ZhwJJNN;DA;VvB3p*jbzO12FYmeA zqjqyEA=^Y!l~*ZRYCe4>x!R!_b_^|@du55*!f(n_MA`5dI0k>hD>Bpa*fcZ0q}nI2Olr4ydf>7XV~>vAFK-V;2Vwy{NHf}QhX1y<$)`AWzn}e zT;qRv*4vggE;avHx&e#64%!4qnfMDHgyE7NUu!HJgqMPGenI%T#v(bmeyRI^i?O<5 z%P-*vyBg_9&sJj}&SF^O$oTe)#zf6JM{b8V@=P?@kS>#N?iuDzZ7$|KGDe0cn>rs! zf?@a^R*d`EoBLPv0Q?WlA`^^@M=dLYd?R*@n7PpmcoUXL5z3#kCp6>wSq?wjo4@NG zN8Rk=I>D18SNr%XO-DJp;YG5gg_xONQ0x&z?gbbj*C_%%XVOcN^>x^~4)}T828Tm=H zDHdIqjmfRxjbu|aQk;F?W*y63XPU3470^ciHZvOQp0DG~fPQNcWyy)G>TmZkjF_tFVLMPwq4w)@FirTB%{av0|g==z(Hzi-J!gW(pMBXmy z`=KjF9HpvY_IkyYT!td!mur$wlCv*##P~MQ`Gx5XuNul5JUjDh#u>CKue(%COkOZ8 z^Lu$gL)=PsR#o+Ma^C6Lv17ZOKRy@kznhY2wdBqJXXh!BSMS>6ve$O=?{!DJUbkF4 zzr!8r91iv@kBlhkH`Xg2~WT+53%5`JOGx&bK&A{UwQs!gx0MBsuK- z7Wp9A$;fMZ|CNqf`0#bUW$EFws?eezJyvY+Xyg^j({iLoS#lYo0{NKdl;xe@#Z`$p zJQF0_fP0CFsWRl+vyX@iMib-7NO&jTiAZCf>)DmY^fiiEk(0XNT-K)kzcChwQ9t65 z__`h5>mbe&Zxd@K21=ISoUwk<{)^TEb#YgjhwqEpH%9yE{n2mO3cqPz^oQ==UEAjM zuER|U(;e9bjk=}01|tK(TCpO7p=R~6^45>zliXyQ%th7_BMVQ-^SoY7Q6}%X$&U0_ z>V+NF<+J%t*lupV={^uPOW7H90hI!~l>Y^!gh~ zS3PkGY?!Y^H?^X((@-8pPPQVM2U?qMV4MN(^S+pCh7LeaHb~yYJ6?SfHP9gW4sn?| zi5!d|r}YZ1XifOckG!Vij`x+LZfe)mKi~;3AzPiUQ6Hv>vUJ|7i@xufDjWcgs3>EV zU9K1(i+l5Y>m65eQ~E2cfb4J8_f4FU^90-ZL>;4flr!&b#hc0z9u-3#zA`PA# zJ2=i#OSfI;`(^UCsobbtBFBM1x+3`Bo~kwY4L0w5#Ugy(meuMx|J<}$T&FvdklG*5 zp*nM4Df;B1rEBG6dmMSHEm$*;E$fTUeDqweK|88eYSOZ2ItPX~EQ!7OM*{qeq^%gS z>3tFh=&aC-hqtN`LKOgRi@d0~aJl5Vx&)x}p3fY=M3K2UY&HW7iXi6@= z;kT|vnC(qP f31*Kgb~t07`95Z@$vQ4wN1b!;pjXSss3^;S>|2Q%mA#(}