summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeyStenson <heather.stenson@mapbox.com>2019-07-12 15:50:50 -0700
committerHeyStenson <heather.stenson@mapbox.com>2019-07-12 15:50:50 -0700
commite63ff1bbb843696a6d4ca5ce4f72142ce318170b (patch)
tree453347c503d8dff7cfcb71065e15b6a07a853a46
parent6397bc8e2a042b36b93b6ebe8431c192fa00b696 (diff)
downloadqtlocation-mapboxgl-e63ff1bbb843696a6d4ca5ce4f72142ce318170b.tar.gz
styles map id -> style url
-rw-r--r--platform/darwin/src/MGLMapSnapshotter.h2
-rw-r--r--platform/darwin/src/MGLOfflineRegion.h4
-rw-r--r--platform/darwin/src/MGLShapeOfflineRegion.h4
-rw-r--r--platform/darwin/src/MGLTilePyramidOfflineRegion.h4
-rw-r--r--platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m4
-rw-r--r--platform/ios/src/MGLMapView.h6
-rw-r--r--platform/macos/src/MGLMapView+IBAdditions.h4
-rw-r--r--platform/macos/src/MGLMapView.h6
8 files changed, 17 insertions, 17 deletions
diff --git a/platform/darwin/src/MGLMapSnapshotter.h b/platform/darwin/src/MGLMapSnapshotter.h
index 146cbd2e15..1ee9bd99bb 100644
--- a/platform/darwin/src/MGLMapSnapshotter.h
+++ b/platform/darwin/src/MGLMapSnapshotter.h
@@ -15,7 +15,7 @@ MGL_EXPORT
Creates a set of options with the minimum required information.
@param styleURL URL of the map style to snapshot. The URL may be a full HTTP or
- HTTPS URL, a Mapbox URL indicating the style’s map ID
+ HTTPS URL, a Mapbox style URL
(`mapbox://styles/{user}/{style}`), or a path to a local file relative to
the application’s resource path. Specify `nil` for the default style.
@param size The image size.
diff --git a/platform/darwin/src/MGLOfflineRegion.h b/platform/darwin/src/MGLOfflineRegion.h
index 6a9bdbc399..0bb1981d61 100644
--- a/platform/darwin/src/MGLOfflineRegion.h
+++ b/platform/darwin/src/MGLOfflineRegion.h
@@ -14,8 +14,8 @@ NS_ASSUME_NONNULL_BEGIN
In addition to the JSON stylesheet, different styles may require different font
glyphs, sprite sheets, and other resources.
- The URL may be a full HTTP or HTTPS URL or a Mapbox URL indicating the style’s
- map ID (`mapbox://styles/{user}/{style}`).
+ The URL may be a full HTTP or HTTPS URL or a Mapbox
+ style URL (`mapbox://styles/{user}/{style}`).
*/
@property (nonatomic, readonly) NSURL *styleURL;
diff --git a/platform/darwin/src/MGLShapeOfflineRegion.h b/platform/darwin/src/MGLShapeOfflineRegion.h
index f1def03be8..7e871067b6 100644
--- a/platform/darwin/src/MGLShapeOfflineRegion.h
+++ b/platform/darwin/src/MGLShapeOfflineRegion.h
@@ -59,8 +59,8 @@ MGL_EXPORT
This is the designated initializer for `MGLShapeOfflineRegion`.
@param styleURL URL of the map style for which to download resources. The URL
- may be a full HTTP or HTTPS URL or a Mapbox URL indicating the style’s map
- ID (`mapbox://styles/{user}/{style}`). Specify `nil` for the default style.
+ may be a full HTTP or HTTPS URL or a Mapbox
+ style URL (`mapbox://styles/{user}/{style}`). Specify `nil` for the default style.
Relative file URLs cannot be used as offline style URLs. To download the
online resources required by a local style, specify a URL to an online copy
of the style.
diff --git a/platform/darwin/src/MGLTilePyramidOfflineRegion.h b/platform/darwin/src/MGLTilePyramidOfflineRegion.h
index d04e656230..41fc200154 100644
--- a/platform/darwin/src/MGLTilePyramidOfflineRegion.h
+++ b/platform/darwin/src/MGLTilePyramidOfflineRegion.h
@@ -61,8 +61,8 @@ MGL_EXPORT
This is the designated initializer for `MGLTilePyramidOfflineRegion`.
@param styleURL URL of the map style for which to download resources. The URL
- may be a full HTTP or HTTPS URL or a Mapbox URL indicating the style’s map
- ID (`mapbox://styles/{user}/{style}`). Specify `nil` for the default style.
+ may be a full HTTP or HTTPS URL or a Mapbox
+ style URL (`mapbox://styles/{user}/{style}`). Specify `nil` for the default style.
Relative file URLs cannot be used as offline style URLs. To download the
online resources required by a local style, specify a URL to an online copy
of the style.
diff --git a/platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m b/platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m
index 9933f0312b..4501294f72 100644
--- a/platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m
+++ b/platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m
@@ -8,8 +8,8 @@
- (MGLCircleStyleLayer*)setupCircleStyleLayer {
// Adapted from https://docs.mapbox.com/ios/examples/dds-circle-layer/
- // "mapbox://examples.2uf7qges" is a map ID referencing a tileset. For more
- // more information, see docs.mapbox.com/help/glossary/map-id/
+ // "mapbox://examples.2uf7qges" is a tileset ID. For more
+ // more information, see docs.mapbox.com/help/glossary/tileset-id/
MGLSource *source = [[MGLVectorTileSource alloc] initWithIdentifier:@"trees" configurationURL:[NSURL URLWithString:@"mapbox://examples.2uf7qges"]];
[self.mapView.style addSource:source];
diff --git a/platform/ios/src/MGLMapView.h b/platform/ios/src/MGLMapView.h
index 9fe9a6c10a..f799852fa7 100644
--- a/platform/ios/src/MGLMapView.h
+++ b/platform/ios/src/MGLMapView.h
@@ -198,7 +198,7 @@ MGL_EXPORT
@param frame The frame for the view, measured in points.
@param styleURL URL of the map style to display. The URL may be a full HTTP
- or HTTPS URL, a Mapbox URL indicating the style’s map ID
+ or HTTPS URL, a Mapbox style URL
(`mapbox://styles/{user}/{style}`), or a path to a local file relative
to the application’s resource path. Specify `nil` for the default style.
@return An initialized map view.
@@ -255,8 +255,8 @@ MGL_EXPORT
/**
URL of the style currently displayed in the receiver.
- The URL may be a full HTTP or HTTPS URL, a Mapbox URL indicating the style’s
- map ID (`mapbox://styles/{user}/{style}`), or a path to a local file
+ The URL may be a full HTTP or HTTPS URL, a Mapbox
+ style URL (`mapbox://styles/{user}/{style}`), or a path to a local file
relative to the application’s resource path.
If you set this property to `nil`, the receiver will use the default style
diff --git a/platform/macos/src/MGLMapView+IBAdditions.h b/platform/macos/src/MGLMapView+IBAdditions.h
index 8a4a90917b..29d914a7d9 100644
--- a/platform/macos/src/MGLMapView+IBAdditions.h
+++ b/platform/macos/src/MGLMapView+IBAdditions.h
@@ -21,8 +21,8 @@ NS_ASSUME_NONNULL_BEGIN
/** URL of the style currently displayed in the receiver.
- The URL may be a full HTTP or HTTPS URL, a Mapbox URL indicating the style’s
- map ID (`mapbox://styles/<user>/<style>`), or a path to a local file
+ The URL may be a full HTTP or HTTPS URL, a Mapbox
+ style URL (`mapbox://styles/<user>/<style>`), or a path to a local file
relative to the application’s resource path. Leave this field blank for the
default style. */
@property (nonatomic, nullable) IBInspectable NSString *styleURL__;
diff --git a/platform/macos/src/MGLMapView.h b/platform/macos/src/MGLMapView.h
index f5fcee5b25..7617063430 100644
--- a/platform/macos/src/MGLMapView.h
+++ b/platform/macos/src/MGLMapView.h
@@ -84,7 +84,7 @@ MGL_EXPORT IB_DESIGNABLE
@param frame The frame for the view, measured in points.
@param styleURL URL of the map style to display. The URL may be a full HTTP or
- HTTPS URL, a Mapbox URL indicating the style’s map ID
+ HTTPS URL, a Mapbox style URL
(`mapbox://styles/<user>/<style>`), or a path to a local file relative to
the application’s resource path. Specify `nil` for the default style.
@return An initialized map view.
@@ -130,8 +130,8 @@ MGL_EXPORT IB_DESIGNABLE
/**
URL of the style currently displayed in the receiver.
- The URL may be a full HTTP or HTTPS URL, a Mapbox URL indicating the style’s
- map ID (`mapbox://styles/<user>/<style>`), or a path to a local file relative
+ The URL may be a full HTTP or HTTPS URL, a Mapbox
+ style URL (`mapbox://styles/<user>/<style>`), or a path to a local file relative
to the application’s resource path.
If you set this property to `nil`, the receiver will use the default style and