summaryrefslogtreecommitdiff
path: root/platform/darwin/src
diff options
context:
space:
mode:
authorHeather Stenson <heather.stenson@mapbox.com>2019-07-16 18:36:07 -0700
committerChloe Krawczyk <chloe.krawczyk@mapbox.com>2019-07-16 18:36:07 -0700
commit5f6f20e667d36fd2f2475756c55d17bade8ee3e2 (patch)
tree5df083a440592d5c88365aedf207f2c9aa864b07 /platform/darwin/src
parent9d8839c4b83e2ea7901e0f06ba1985cd7547f01b (diff)
downloadqtlocation-mapboxgl-5f6f20e667d36fd2f2475756c55d17bade8ee3e2.tar.gz
[ios, macos] Change "map ID" to "tileset ID" (#15116)upstream/15022_memory_consumption
* map id --> tileset id * styles map id -> style url * update changelog
Diffstat (limited to 'platform/darwin/src')
-rw-r--r--platform/darwin/src/MGLMapSnapshotter.h2
-rw-r--r--platform/darwin/src/MGLOfflineRegion.h4
-rw-r--r--platform/darwin/src/MGLRasterTileSource.h10
-rw-r--r--platform/darwin/src/MGLShapeOfflineRegion.h4
-rw-r--r--platform/darwin/src/MGLTilePyramidOfflineRegion.h4
-rw-r--r--platform/darwin/src/MGLVectorTileSource.h4
6 files changed, 14 insertions, 14 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 c668e3bf22..f873424c93 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/MGLRasterTileSource.h b/platform/darwin/src/MGLRasterTileSource.h
index 08498a46f1..a8d0a470e0 100644
--- a/platform/darwin/src/MGLRasterTileSource.h
+++ b/platform/darwin/src/MGLRasterTileSource.h
@@ -70,13 +70,13 @@ MGL_EXPORT
After initializing and configuring the source, add it to a map view’s style
using the `-[MGLStyle addSource:]` method.
- The URL may be a full HTTP or HTTPS URL or, for tile sets hosted by Mapbox, a
- Mapbox URL indicating a map identifier (`mapbox://<mapid>`). The URL should
+ The URL may be a full HTTP or HTTPS URL or, for tilesets hosted by Mapbox, a
+ Mapbox URL indicating a tileset ID (`mapbox://<tilesetid>`). The URL should
point to a JSON file that conforms to the
<a href="https://github.com/mapbox/tilejson-spec/">TileJSON specification</a>.
If a Mapbox URL is specified, this source uses a tile size of 256. For all
- other tile sets, the default value is 512. (See the
+ other tilesets, the default value is 512. (See the
`MGLTileSourceOptionTileSize` documentation for more information about tile
sizes.) If you need to use a tile size other than the default, use the
`-initWithIdentifier:configurationURL:tileSize:` method.
@@ -96,8 +96,8 @@ MGL_EXPORT
After initializing and configuring the source, add it to a map view’s style
using the `-[MGLStyle addSource:]` method.
- The URL may be a full HTTP or HTTPS URL or, for tile sets hosted by Mapbox, a
- Mapbox URL indicating a map identifier (`mapbox://<mapid>`). The URL should
+ The URL may be a full HTTP or HTTPS URL or, for tilesets hosted by Mapbox, a
+ Mapbox URL indicating a tileset ID (`mapbox://<tilesetid>`). The URL should
point to a JSON file that conforms to the
<a href="https://github.com/mapbox/tilejson-spec/">TileJSON specification</a>.
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/darwin/src/MGLVectorTileSource.h b/platform/darwin/src/MGLVectorTileSource.h
index 53de9dbc2a..f198d7ad2c 100644
--- a/platform/darwin/src/MGLVectorTileSource.h
+++ b/platform/darwin/src/MGLVectorTileSource.h
@@ -71,8 +71,8 @@ MGL_EXPORT
After initializing and configuring the source, add it to a map view’s style
using the `-[MGLStyle addSource:]` method.
- The URL may be a full HTTP or HTTPS URL or, for tile sets hosted by Mapbox, a
- Mapbox URL indicating a map identifier (`mapbox://<mapid>`). The URL should
+ The URL may be a full HTTP or HTTPS URL or, for tilesets hosted by Mapbox, a
+ Mapbox URL indicating a tileset ID (`mapbox://<tilesetid>`). The URL should
point to a JSON file that conforms to the
<a href="https://github.com/mapbox/tilejson-spec/">TileJSON specification</a>.