summaryrefslogtreecommitdiff
path: root/platform/macos
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/macos
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/macos')
-rw-r--r--platform/macos/CHANGELOG.md1
-rw-r--r--platform/macos/src/MGLMapView+IBAdditions.h4
-rw-r--r--platform/macos/src/MGLMapView.h6
3 files changed, 6 insertions, 5 deletions
diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md
index 49dd5ff53a..88fa37052b 100644
--- a/platform/macos/CHANGELOG.md
+++ b/platform/macos/CHANGELOG.md
@@ -17,6 +17,7 @@
### Other changes
* The `-[MGLMapView setCamera:withDuration:animationTimingFunction:edgePadding:completionHandler:]` method now adds the current value of the `MGLMapView.contentInsets` property to the `edgePadding` parameter. ([#14813](https://github.com/mapbox/mapbox-gl-native/pull/14813))
+* Updated "map ID" to the more accurate term "tileset ID" in documentation; updated "style's Map ID" to the more accurate term "style URL". ([#15116](https://github.com/mapbox/mapbox-gl-native/pull/15116))
### Other changes
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