summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmkiley <jordan.kiley@mapbox.com>2017-11-30 17:00:52 -0800
committerjmkiley <jordan.kiley@mapbox.com>2017-12-04 12:50:12 -0800
commit22ed0072d55bc3a2ca7d1314a9ca9801a4450a66 (patch)
treecb4b755273536f2f6f76fe272380c985de2046ec
parent0f59234667efdd0ae72e89d89b2c591c4d2c31ae (diff)
downloadqtlocation-mapboxgl-22ed0072d55bc3a2ca7d1314a9ca9801a4450a66.tar.gz
[ios, macos] A few more changes
-rw-r--r--INSTALL.md4
-rw-r--r--platform/ios/README.md6
-rw-r--r--platform/ios/docs/doc-README.md8
-rw-r--r--platform/ios/src/MGLSDKUpdateChecker.mm2
-rw-r--r--platform/macos/CHANGELOG.md18
-rw-r--r--platform/macos/DEVELOPING.md2
-rw-r--r--platform/macos/INSTALL.md2
7 files changed, 21 insertions, 21 deletions
diff --git a/INSTALL.md b/INSTALL.md
index d39c3ad62e..f54d4289e5 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -57,8 +57,8 @@ dependencies:
See the relevant SDK documentation for next steps:
* [Mapbox Android SDK](platform/android/)
-* [Mapbox iOS SDK](platform/ios/)
-* [Mapbox macOS SDK](platform/macos/)
+* [Mapbox Maps SDK for iOS](platform/ios/)
+* [Mapbox Maps SDK for macOS](platform/macos/)
* [Mapbox Qt SDK](platform/qt/)
* [Mapbox GL Native on Linux](platform/linux/)
* [node-mapbox-gl-native](platform/node/)
diff --git a/platform/ios/README.md b/platform/ios/README.md
index de70c4e891..23171e294e 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,8 +6,8 @@ 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, production-ready version instead.
-* [Integrate the Mapbox iOS SDK into your application](https://www.mapbox.com/install/ios/).
+* [Integrate the Mapbox Maps SDK for iOS into your application](https://www.mapbox.com/install/ios/).
* [Learn about custom builds](INSTALL.md)
-* [Contribute to the Mapbox iOS SDK](DEVELOPING.md)
+* [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 ebad32e04c..7cd0376d07 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/src/MGLSDKUpdateChecker.mm b/platform/ios/src/MGLSDKUpdateChecker.mm
index ab4ef7be86..bb61e2b595 100644
--- a/platform/ios/src/MGLSDKUpdateChecker.mm
+++ b/platform/ios/src/MGLSDKUpdateChecker.mm
@@ -29,7 +29,7 @@
NSString *latestVersion = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
latestVersion = [latestVersion stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
if (![currentVersion isEqualToString:latestVersion]) {
- NSString *updateAvailable = [NSString stringWithFormat:NSLocalizedStringWithDefaultValue(@"SDK_UPDATE_AVAILABLE", nil, nil, @"Mapbox iOS SDK version %@ is now available:", @"Developer-only SDK update notification; {latest version, in format x.x.x}"), latestVersion];
+ NSString *updateAvailable = [NSString stringWithFormat:NSLocalizedStringWithDefaultValue(@"SDK_UPDATE_AVAILABLE", nil, nil, @"Mapbox Maps SDK for iOS version %@ is now available:", @"Developer-only SDK update notification; {latest version, in format x.x.x}"), latestVersion];
NSLog(@"%@ https://github.com/mapbox/mapbox-gl-native/releases/tag/ios-v%@", updateAvailable, latestVersion);
}
}] resume];
diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md
index b3d9bec610..fdf2dd2567 100644
--- a/platform/macos/CHANGELOG.md
+++ b/platform/macos/CHANGELOG.md
@@ -49,7 +49,7 @@
## 0.5.1
-This version of the Mapbox Maps SDK for macOS corresponds to version 3.6.4 of the Mapbox iOS SDK.
+This version of the Mapbox Maps SDK for macOS corresponds to version 3.6.4 of the Mapbox Maps SDK for iOS.
* Added an `MGLStyle.localizesLabels` property, off by default, that localizes any Mapbox Streets–sourced symbol layer into the user’s preferred language. ([#9582](https://github.com/mapbox/mapbox-gl-native/pull/9582))
* Fixed an issue that caused `-[MGLShapeSource featuresMatchingPredicate:]` and `-[MGLVectorSource featuresInSourceLayersWithIdentifiers:predicate:]` to always return an empty array. ([#9784](https://github.com/mapbox/mapbox-gl-native/pull/9784))
@@ -60,7 +60,7 @@ This version of the Mapbox Maps SDK for macOS corresponds to version 3.6.4 of th
## 0.5.0
-This version of the Mapbox Maps SDK for macOS corresponds to version 3.6.0 of the Mapbox iOS SDK.
+This version of the Mapbox Maps SDK for macOS corresponds to version 3.6.0 of the Mapbox Maps SDK for iOS.
### Packaging
@@ -85,7 +85,7 @@ This version of the Mapbox Maps SDK for macOS corresponds to version 3.6.0 of th
### Annotations
-* The default marker image has been made slightly larger and now matches the version in the Mapbox iOS SDK. ([#9370](https://github.com/mapbox/mapbox-gl-native/pull/9370))
+* The default marker image has been made slightly larger and now matches the version in the Mapbox Maps SDK for iOS. ([#9370](https://github.com/mapbox/mapbox-gl-native/pull/9370))
* The `MGLPolyline.coordinate` and `MGLPolygon.coordinate` properties now return the midpoint and centroid, respectively, instead of the first coordinate. ([#8713](https://github.com/mapbox/mapbox-gl-native/pull/8713))
### User interaction
@@ -106,7 +106,7 @@ This version of the Mapbox Maps SDK for macOS corresponds to version 3.6.0 of th
## 0.4.1 - April 8, 2017
-This version of the Mapbox Maps SDK for macOS corresponds to version 3.5.2 of the Mapbox iOS SDK.
+This version of the Mapbox Maps SDK for macOS corresponds to version 3.5.2 of the Mapbox Maps SDK for iOS.
* Fixed an issue causing code signing failures and bloating the framework. ([#8640](https://github.com/mapbox/mapbox-gl-native/pull/8640))
* Fixed an issue that could cause a crash if annotations unknown to the map view were interacted with. ([#8686](https://github.com/mapbox/mapbox-gl-native/pull/8686))
@@ -114,7 +114,7 @@ This version of the Mapbox Maps SDK for macOS corresponds to version 3.5.2 of th
## 0.4.0 - April 2, 2017
-This version of the Mapbox Maps SDK for macOS corresponds to version 3.5.1 of the Mapbox iOS SDK.
+This version of the Mapbox Maps SDK for macOS corresponds to version 3.5.1 of the Mapbox Maps SDK for iOS.
### Internationalization
@@ -173,7 +173,7 @@ This version of the Mapbox Maps SDK for macOS corresponds to version 3.5.1 of th
## 0.3.1 - February 21, 2017
-This version of the Mapbox Maps SDK for macOS corresponds to version 3.4.2 of the Mapbox iOS SDK.
+This version of the Mapbox Maps SDK for macOS corresponds to version 3.4.2 of the Mapbox Maps SDK for iOS.
* Fixed an issue causing MGLMapView’s `camera`’s `heading` to be set to a negative value, indicating an undefined heading, when the map view faces northwest. The heading is now wrapped to between zero and 360 degrees, for consistency with MGLMapView’s `direction` property. ([#7724](https://github.com/mapbox/mapbox-gl-native/pull/7724))
* Fixed a crash that occurred when moving a window containing an MGLMapView from one screen to another. ([#8004](https://github.com/mapbox/mapbox-gl-native/pull/8004))
@@ -184,7 +184,7 @@ This version of the Mapbox Maps SDK for macOS corresponds to version 3.4.2 of th
## 0.3.0 - January 21, 2016
-This version of the Mapbox Maps SDK for macOS corresponds to version 3.4.0 of the Mapbox iOS SDK. The two SDKs have very similar feature sets. The main differences are the lack of user location tracking and annotation views. Some APIs have been adapted to macOS conventions, particularly the use of NSPopover for callout views.
+This version of the Mapbox Maps SDK for macOS corresponds to version 3.4.0 of the Mapbox Maps SDK for iOS. The two SDKs have very similar feature sets. The main differences are the lack of user location tracking and annotation views. Some APIs have been adapted to macOS conventions, particularly the use of NSPopover for callout views.
### Packaging
@@ -269,7 +269,7 @@ This version of the Mapbox Maps SDK for macOS corresponds to version 3.4.0 of th
## 0.2.0 - June 14, 2016
-* This version of the Mapbox Maps SDK for macOS roughly corresponds to version 3.3.0-beta.1 of the Mapbox iOS SDK. The two SDKs have very similar feature sets. The main differences are the lack of user location tracking and annotation views. Some APIs have been adapted to macOS conventions, particularly the use of NSPopover for callout views.
+* This version of the Mapbox Maps SDK for macOS roughly corresponds to version 3.3.0-beta.1 of the Mapbox Maps SDK for iOS. The two SDKs have very similar feature sets. The main differences are the lack of user location tracking and annotation views. Some APIs have been adapted to macOS conventions, particularly the use of NSPopover for callout views.
* Renamed the SDK to the Mapbox Maps SDK for macOS.
* Fixed an issue in which Mapbox.framework was nested inside another folder named Mapbox.framework. ([#4998](https://github.com/mapbox/mapbox-gl-native/pull/4998))
* Added methods to MGLMapView for obtaining the underlying map data rendered by the current style, along with additional classes to represent complex geometry in that data. ([#5110](https://github.com/mapbox/mapbox-gl-native/pull/5110))
@@ -286,4 +286,4 @@ This version of the Mapbox Maps SDK for macOS corresponds to version 3.4.0 of th
## 0.1.0 - May 10, 2016
-* This version of the Mapbox OS X SDK roughly corresponds to version 3.3.0-alpha.2 of the Mapbox iOS SDK. The two SDKs have very similar feature sets. The main difference is the lack of user location tracking. Some APIs have been adapted to OS X conventions, particularly the use of NSPopover for callout views.
+* This version of the Mapbox OS X SDK roughly corresponds to version 3.3.0-alpha.2 of the Mapbox Maps SDK for iOS. The two SDKs have very similar feature sets. The main difference is the lack of user location tracking. Some APIs have been adapted to OS X conventions, particularly the use of NSPopover for callout views.
diff --git a/platform/macos/DEVELOPING.md b/platform/macos/DEVELOPING.md
index 7ead95b4ab..4a251de88f 100644
--- a/platform/macos/DEVELOPING.md
+++ b/platform/macos/DEVELOPING.md
@@ -1,6 +1,6 @@
# Contributing to the Mapbox Maps SDK for macOS
-This document explains how to build the Mapbox Maps SDK for macOS 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 macOS from source. It is intended for advanced developers who wish to contribute to Mapbox GL and the Mapbox Maps SDK for iOS.
## Requirements
diff --git a/platform/macos/INSTALL.md b/platform/macos/INSTALL.md
index 8396203b94..2be901050f 100644
--- a/platform/macos/INSTALL.md
+++ b/platform/macos/INSTALL.md
@@ -71,4 +71,4 @@ script AppDelegate
end script
```
-For further instructions, consult the [macOS SDK documentation](https://mapbox.github.io/mapbox-gl-native/macos/) or run `make xdocument` to generate the documentation. The [Mapbox iOS SDK](https://www.mapbox.com/ios-sdk/)’s [API documentation](https://www.mapbox.com/ios-sdk/) and [online examples](https://www.mapbox.com/ios-sdk/examples/) apply to the Mapbox Maps SDK for macOS with few differences, mostly around unimplemented features like user location tracking.
+For further instructions, consult the [macOS SDK documentation](https://mapbox.github.io/mapbox-gl-native/macos/) or run `make xdocument` to generate the documentation. The [Mapbox Maps SDK for iOS](https://www.mapbox.com/ios-sdk/)’s [API documentation](https://www.mapbox.com/ios-sdk/) and [online examples](https://www.mapbox.com/ios-sdk/examples/) apply to the Mapbox Maps SDK for macOS with few differences, mostly around unimplemented features like user location tracking.