diff options
author | Jason Wray <jason@mapbox.com> | 2019-01-24 16:45:51 -0800 |
---|---|---|
committer | Jason Wray <friedbunny@users.noreply.github.com> | 2019-01-25 11:57:45 -0800 |
commit | 67e5761e722318e96b86e4615fdd071c1805bae8 (patch) | |
tree | e1e7d1115a2f9e45392212f0670288a31dce8a01 /platform/ios | |
parent | d7cd06eb55a4bdce3edbd86f6ab6088d5e7e8331 (diff) | |
download | qtlocation-mapboxgl-67e5761e722318e96b86e4615fdd071c1805bae8.tar.gz |
[ios] Update more URLs to docs.mapbox.com/ios
Diffstat (limited to 'platform/ios')
-rw-r--r-- | platform/ios/DEVELOPING.md | 2 | ||||
-rw-r--r-- | platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m | 6 | ||||
-rw-r--r-- | platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec | 6 | ||||
-rw-r--r-- | platform/ios/Mapbox-iOS-SDK-stripped.podspec | 6 | ||||
-rw-r--r-- | platform/ios/Mapbox-iOS-SDK.podspec | 6 | ||||
-rw-r--r-- | platform/ios/README.md | 4 | ||||
-rw-r--r-- | platform/ios/jazzy.yml | 2 | ||||
-rwxr-xr-x | platform/ios/scripts/document.sh | 2 | ||||
-rw-r--r-- | platform/ios/src/MGLAnnotationImage.h | 2 | ||||
-rw-r--r-- | platform/ios/src/MGLAnnotationView.h | 4 | ||||
-rw-r--r-- | platform/ios/src/MGLCalloutView.h | 2 | ||||
-rw-r--r-- | platform/ios/src/MGLMapView.h | 39 | ||||
-rw-r--r-- | platform/ios/src/MGLMapViewDelegate.h | 40 | ||||
-rw-r--r-- | platform/ios/src/MGLMapboxEvents.m | 2 | ||||
-rw-r--r-- | platform/ios/src/MGLUserLocation.h | 4 | ||||
-rw-r--r-- | platform/ios/src/MGLUserLocationAnnotationView.h | 2 |
16 files changed, 67 insertions, 62 deletions
diff --git a/platform/ios/DEVELOPING.md b/platform/ios/DEVELOPING.md index 394e7c2611..8dabc98a6f 100644 --- a/platform/ios/DEVELOPING.md +++ b/platform/ios/DEVELOPING.md @@ -59,7 +59,7 @@ 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 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. +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://docs.mapbox.com/ios/api/maps/). 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 diff --git a/platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m b/platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m index 31c494b7d5..9933f0312b 100644 --- a/platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m +++ b/platform/ios/Integration Tests/MGLStyleLayerIntegrationTests.m @@ -6,7 +6,7 @@ @implementation MGLStyleLayerIntegrationTests - (MGLCircleStyleLayer*)setupCircleStyleLayer { - // Adapted from https://www.mapbox.com/ios-sdk/examples/dds-circle-layer/ + // 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/ @@ -23,7 +23,7 @@ - (void)testForInterpolatingExpressionRenderCrashWithEmptyStops { // Tests: https://github.com/mapbox/mapbox-gl-native/issues/9539 - // Adapted from https://www.mapbox.com/ios-sdk/examples/dds-circle-layer/ + // Adapted from https://docs.mapbox.com/ios/examples/dds-circle-layer/ self.mapView.centerCoordinate = CLLocationCoordinate2DMake(38.897,-77.039); self.mapView.zoomLevel = 10.5; @@ -42,7 +42,7 @@ - (void)testForSteppingExpressionRenderCrashWithEmptyStops { // Tests: https://github.com/mapbox/mapbox-gl-native/issues/9539 - // Adapted from https://www.mapbox.com/ios-sdk/examples/dds-circle-layer/ + // Adapted from https://docs.mapbox.com/ios/examples/dds-circle-layer/ self.mapView.centerCoordinate = CLLocationCoordinate2DMake(38.897,-77.039); self.mapView.zoomLevel = 10.5; diff --git a/platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec b/platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec index c3237601cc..f1b9eee2a6 100644 --- a/platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec +++ b/platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec @@ -7,12 +7,12 @@ Pod::Spec.new do |m| m.summary = 'Open source vector map solution for iOS with full styling capabilities.' m.description = 'Open source, OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa Touch APIs.' - m.homepage = 'https://www.mapbox.com/ios-sdk/' + m.homepage = 'https://docs.mapbox.com/ios/maps/' m.license = { :type => 'BSD', :file => 'LICENSE.md' } m.author = { 'Mapbox' => 'mobile@mapbox.com' } - m.screenshot = "https://www.mapbox.com/ios-sdk/api/#{version}/img/screenshot.png" + m.screenshot = "https://docs.mapbox.com/ios/api/maps/#{version}/img/screenshot.png" m.social_media_url = 'https://twitter.com/mapbox' - m.documentation_url = 'https://www.mapbox.com/ios-sdk/api/' + m.documentation_url = 'https://docs.mapbox.com/ios/api/maps/' m.source = { :http => "https://mapbox.s3.amazonaws.com/mapbox-gl-native/ios/builds/mapbox-ios-sdk-nightly-dynamic.zip", diff --git a/platform/ios/Mapbox-iOS-SDK-stripped.podspec b/platform/ios/Mapbox-iOS-SDK-stripped.podspec index 20bee73e80..289bf43b36 100644 --- a/platform/ios/Mapbox-iOS-SDK-stripped.podspec +++ b/platform/ios/Mapbox-iOS-SDK-stripped.podspec @@ -7,12 +7,12 @@ Pod::Spec.new do |m| m.summary = 'Open source vector map solution for iOS with full styling capabilities.' m.description = 'Open source, OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa Touch APIs.' - m.homepage = 'https://www.mapbox.com/ios-sdk/' + m.homepage = 'https://docs.mapbox.com/ios/maps/' m.license = { :type => 'BSD', :file => 'LICENSE.md' } m.author = { 'Mapbox' => 'mobile@mapbox.com' } - m.screenshot = "https://www.mapbox.com/ios-sdk/api/#{version}/img/screenshot.png" + m.screenshot = "https://docs.mapbox.com/ios/api/maps/#{version}/img/screenshot.png" m.social_media_url = 'https://twitter.com/mapbox' - m.documentation_url = 'https://www.mapbox.com/ios-sdk/api/' + m.documentation_url = 'https://docs.mapbox.com/ios/api/maps/' m.source = { :http => "https://mapbox.s3.amazonaws.com/mapbox-gl-native/ios/builds/mapbox-ios-sdk-#{m.version.to_s}-dynamic.zip", diff --git a/platform/ios/Mapbox-iOS-SDK.podspec b/platform/ios/Mapbox-iOS-SDK.podspec index e5179c9263..9bd5b0740c 100644 --- a/platform/ios/Mapbox-iOS-SDK.podspec +++ b/platform/ios/Mapbox-iOS-SDK.podspec @@ -7,12 +7,12 @@ Pod::Spec.new do |m| m.summary = 'Open source vector map solution for iOS with full styling capabilities.' m.description = 'Open source, OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa Touch APIs.' - m.homepage = 'https://www.mapbox.com/ios-sdk/' + m.homepage = 'https://docs.mapbox.com/ios/maps/' m.license = { :type => 'BSD', :file => 'LICENSE.md' } m.author = { 'Mapbox' => 'mobile@mapbox.com' } - m.screenshot = "https://www.mapbox.com/ios-sdk/api/#{version}/img/screenshot.png" + m.screenshot = "https://docs.mapbox.com/ios/api/maps/#{version}/img/screenshot.png" m.social_media_url = 'https://twitter.com/mapbox' - m.documentation_url = 'https://www.mapbox.com/ios-sdk/api/' + m.documentation_url = 'https://docs.mapbox.com/ios/api/maps/' m.source = { :http => "https://mapbox.s3.amazonaws.com/mapbox-gl-native/ios/builds/mapbox-ios-sdk-#{m.version.to_s}-dynamic.zip", diff --git a/platform/ios/README.md b/platform/ios/README.md index 27c8ad4cc8..fe6f3be95d 100644 --- a/platform/ios/README.md +++ b/platform/ios/README.md @@ -1,10 +1,10 @@ -# [Mapbox Maps SDK for iOS](https://www.mapbox.com/ios-sdk/) +# [Mapbox Maps SDK for iOS](https://docs.mapbox.com/ios/maps/) [![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) A library based on [Mapbox GL Native](../../README.md) for embedding interactive map views with scalable, customizable vector maps into Cocoa Touch applications on iOS using Objective-C, Swift, or Interface Builder. -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. +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 Maps SDK for iOS website](https://docs.mapbox.com/ios/maps/) for installation instructions. * [Integrate the Mapbox Maps SDK for iOS into your application](https://www.mapbox.com/install/ios/). * [Learn about custom builds](INSTALL.md) diff --git a/platform/ios/jazzy.yml b/platform/ios/jazzy.yml index 31381650da..d459e93613 100644 --- a/platform/ios/jazzy.yml +++ b/platform/ios/jazzy.yml @@ -2,7 +2,7 @@ module: Mapbox author: Mapbox author_url: https://www.mapbox.com/ github_url: https://github.com/mapbox/mapbox-gl-native -dash_url: https://www.mapbox.com/ios-sdk/docsets/Mapbox.xml +dash_url: https://docs.mapbox.com/ios/docsets/Mapbox.xml copyright: '© 2014–2019 [Mapbox](https://www.mapbox.com/). See [license](https://github.com/mapbox/mapbox-gl-native/blob/master/LICENSE.md) for more details.' head: | diff --git a/platform/ios/scripts/document.sh b/platform/ios/scripts/document.sh index 99c8967aa1..ec307445af 100755 --- a/platform/ios/scripts/document.sh +++ b/platform/ios/scripts/document.sh @@ -55,7 +55,7 @@ jazzy \ --module-version ${SHORT_VERSION} \ --readme ${README} \ --documentation="platform/{darwin,ios}/docs/guides/*.md" \ - --root-url https://www.mapbox.com/ios-sdk/api/${RELEASE_VERSION}/ \ + --root-url https://docs.mapbox.com/ios/api/maps/${RELEASE_VERSION}/ \ --theme ${THEME} \ --output ${OUTPUT} diff --git a/platform/ios/src/MGLAnnotationImage.h b/platform/ios/src/MGLAnnotationImage.h index fd76a9b43a..10b13a58c3 100644 --- a/platform/ios/src/MGLAnnotationImage.h +++ b/platform/ios/src/MGLAnnotationImage.h @@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN by the map view. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/marker-image/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/marker-image/"> Mark a place on the map with an image</a> example to learn how use an image as a marker using `MGLAnnotationImage`. */ diff --git a/platform/ios/src/MGLAnnotationView.h b/platform/ios/src/MGLAnnotationView.h index 61fd22f1c2..afedeb7908 100644 --- a/platform/ios/src/MGLAnnotationView.h +++ b/platform/ios/src/MGLAnnotationView.h @@ -224,7 +224,7 @@ MGL_EXPORT change is immediate. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/annotation-vie + See the <a href="https://docs.mapbox.com/ios/maps/examples/annotation-vie ws/">Annotation views</a> example to learn how to modify an `MGLAnnotationView`'s behavior when it is selected. */ @@ -257,7 +257,7 @@ MGL_EXPORT continue to completion. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/draggable-views + See the <a href="https://docs.mapbox.com/ios/maps/examples/draggable-views /">Draggable annotation views</a> to learn how to enable users to drag `MGLAnnotationView` objects on your map. */ diff --git a/platform/ios/src/MGLCalloutView.h b/platform/ios/src/MGLCalloutView.h index 7b2177fdd5..a5868ac102 100644 --- a/platform/ios/src/MGLCalloutView.h +++ b/platform/ios/src/MGLCalloutView.h @@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN use the optional methods available in the `MGLCalloutViewDelegate` protocol. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/custom-callout/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/custom-callout/"> Display custom views as callouts</a> example to learn how to customize an `MGLCalloutView`. */ diff --git a/platform/ios/src/MGLMapView.h b/platform/ios/src/MGLMapView.h index 6e3380553d..cad35c81d8 100644 --- a/platform/ios/src/MGLMapView.h +++ b/platform/ios/src/MGLMapView.h @@ -53,7 +53,9 @@ typedef NS_ENUM(NSUInteger, MGLAnnotationVerticalAlignment) { `MGLMapView.userTrackingMode`. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/user-tracking-mode/">Switch between user tracking modes</a> example to learn how to toggle modes and how each mode behaves. + See the <a href="https://docs.mapbox.com/ios/maps/examples/user-tracking-mode/"> + Switch between user tracking modes</a> example to learn how to toggle modes and + how each mode behaves. */ typedef NS_ENUM(NSUInteger, MGLUserTrackingMode) { /** The map does not follow the user location. */ @@ -156,7 +158,7 @@ FOUNDATION_EXTERN MGL_EXPORT MGLExceptionName const MGLResourceNotFoundException ensuring that your use adheres to the relevant terms of use. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/simple-map-view/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/simple-map-view/"> Simple map view</a> example to learn how to initialize a basic `MGLMapView`. */ MGL_EXPORT IB_DESIGNABLE @@ -185,13 +187,14 @@ MGL_EXPORT IB_DESIGNABLE @return An initialized map view. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/custom-style/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/custom-style/"> Apply a style designed in Mapbox Studio</a> example to learn how to - initialize an `MGLMapView` with a custom style. See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/raster-styles/"> - Appy a style designed in Mapbox Studio Classic</a> example to learn how to - intialize an `MGLMapView` with a Studio Classic style _or_ a custom style - JSON. See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/source-custom-vector/"> - Use third-party vector tiles</a> example to learn how to initialize an + initialize an `MGLMapView` with a custom style. See the + <a href="https://docs.mapbox.com/ios/maps/examples/raster-styles/"> Apply a + style designed in Mapbox Studio Classic</a> example to learn how to intialize + an `MGLMapView` with a Studio Classic style _or_ a custom style JSON. See the + <a href="https://docs.mapbox.com/ios/maps/examples/source-custom-vector/"> Use + third-party vector tiles</a> example to learn how to initialize an `MGLMapView` with a third-party tile source. */ - (instancetype)initWithFrame:(CGRect)frame styleURL:(nullable NSURL *)styleURL; @@ -248,7 +251,7 @@ MGL_EXPORT IB_DESIGNABLE you want to introspect individual style attributes, use the `style` property. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/switch-styles/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/switch-styles/"> Switch between map styles</a> example to learn how to change the style of a map at runtime. */ @@ -421,7 +424,7 @@ MGL_EXPORT IB_DESIGNABLE `-setUserTrackingMode:animated:` method instead. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/user-location-annotation/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/user-location-annotation/"> Customize the user location annotation</a> to learn how to customize the default user location annotation shown by `MGLUserTrackingMode`. */ @@ -918,7 +921,7 @@ MGL_EXPORT IB_DESIGNABLE immediately. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/camera-animation/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/camera-animation/"> Camera animation</a> example to learn how to trigger an animation that rotates around a central point. */ @@ -937,7 +940,7 @@ MGL_EXPORT IB_DESIGNABLE is `0`, this parameter is ignored. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/camera-animation/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/camera-animation/"> Camera animation</a> example to learn how to create a timed animation that rotates around a central point for a specific duration. */ @@ -1185,7 +1188,7 @@ MGL_EXPORT IB_DESIGNABLE @return The geographic coordinate at the given point. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/point-conversion/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/point-conversion/"> Point conversion</a> example to learn how to convert a `CGPoint` to a map coordinate. */ @@ -1204,7 +1207,7 @@ MGL_EXPORT IB_DESIGNABLE corresponding to the given geographic coordinate. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/point-conversion/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/point-conversion/"> Point conversion</a> example to learn how to convert a map coordinate to a `CGPoint` object. */ @@ -1281,8 +1284,8 @@ MGL_EXPORT IB_DESIGNABLE annotation object. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/annotation-models/"> - Annotation models</a> and <a href="https://www.mapbox.com/ios-sdk/maps/examples/line-geojson/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/annotation-models/"> + Annotation models</a> and <a href="https://docs.mapbox.com/ios/maps/examples/line-geojson/"> Add a line annotation from GeoJSON</a> examples to learn how to add an annotation to an `MGLMapView` object. */ @@ -1352,7 +1355,7 @@ MGL_EXPORT IB_DESIGNABLE such object exists in the reuse queue. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/annotation-view-image/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/annotation-view-image/"> Add annotation views and images</a> example learn how to most efficiently reuse an `MGLAnnotationImage`. */ @@ -1517,7 +1520,7 @@ MGL_EXPORT IB_DESIGNABLE represent features in the sources used by the current style. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/select-layer/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/select-layer/"> Select a feature within a layer</a> example to learn how to query an `MGLMapView` object for visible `MGLFeature` objects. */ diff --git a/platform/ios/src/MGLMapViewDelegate.h b/platform/ios/src/MGLMapViewDelegate.h index ffc460b995..e9f864f370 100644 --- a/platform/ios/src/MGLMapViewDelegate.h +++ b/platform/ios/src/MGLMapViewDelegate.h @@ -43,7 +43,7 @@ NS_ASSUME_NONNULL_BEGIN `oldCamera` or change to `newCamera`. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/constraining-gestures/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/constraining-gestures/"> Restrict map panning to an area</a> example to learn how to use this method and `MGLMapCamera` objects to restrict a users ability to pan your map. */ @@ -116,7 +116,7 @@ NS_ASSUME_NONNULL_BEGIN @param mapView The map view whose viewpoint is changing. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/clustering/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/clustering/"> Cluster point data</a> example to learn how to trigger an action whenever the map region changes. */ @@ -268,8 +268,8 @@ NS_ASSUME_NONNULL_BEGIN @param style The style that was loaded. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/runtime-multiple-annotations/"> - Dynamically style interactive points</a> and <a href="https://www.mapbox.com/ios-sdk/maps/examples/shape-collection/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/runtime-multiple-annotations/"> + Dynamically style interactive points</a> and <a href="https://docs.mapbox.com/ios/maps/examples/shape-collection/"> Add multiple shapes from a single shape source</a> examples to learn how to ensure a map's style has loaded before modifying it at runtime. */ @@ -374,9 +374,9 @@ NS_ASSUME_NONNULL_BEGIN `nil` if you want to display the default marker image or an annotation view. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/annotation-models/"> - Annotation models</a>, <a href="https://www.mapbox.com/ios-sdk/maps/examples/annotation-view-image/"> - Add annotation views and images</a>, and <a href="https://www.mapbox.com/ios-sdk/maps/examples/marker-image/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/annotation-models/"> + Annotation models</a>, <a href="https://docs.mapbox.com/ios/maps/examples/annotation-view-image/"> + Add annotation views and images</a>, and <a href="https://docs.mapbox.com/ios/maps/examples/marker-image/"> Mark a place on the map with an image</a> examples to learn to specify which image should be used for `MGLAnnotation` objects that have been added to your map. @@ -414,7 +414,7 @@ NS_ASSUME_NONNULL_BEGIN @return A color to use for the shape outline. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/annotation-models/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/annotation-models/"> Annotation models</a> example to learn how to modify the outline color of an `MGLShape` object that has been added to your map as an annotation. */ @@ -434,7 +434,7 @@ NS_ASSUME_NONNULL_BEGIN @return The polygon’s interior fill color. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/polygon/">Add + See the <a href="https://docs.mapbox.com/ios/maps/examples/polygon/">Add a polygon annotation</a> example to learn how to modify the color of a an `MGLPolygon` at runtime. */ @@ -451,7 +451,7 @@ NS_ASSUME_NONNULL_BEGIN @return A line width for the polyline, measured in points. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/line-geojson/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/line-geojson/"> Add a line annotation from GeoJSON</a> example to learn how to modify the line width of an `MGLPolylineFeature` on your map. */ @@ -483,7 +483,7 @@ NS_ASSUME_NONNULL_BEGIN want to display an annotation image instead. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/annotation-view-image/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/annotation-view-image/"> Add annotation views and images</a> example to learn how to specify what `MGLViewAnnotation` to use for a given `MGLPointAnnotation` object on your map. @@ -530,7 +530,7 @@ NS_ASSUME_NONNULL_BEGIN @param annotation The annotation that was selected. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/runtime-multiple-annotations/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/runtime-multiple-annotations/"> Dynamically style interactive points</a> example to learn how to remove an annotation view if it has already been selected. */ @@ -609,9 +609,9 @@ NS_ASSUME_NONNULL_BEGIN callout. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/annotation-view-image/"> - Add annotation views and images</a>, <a href="https://www.mapbox.com/ios-sdk/maps/examples/custom-callout/"> - Display custom views as callouts</a>, and <a href="https://www.mapbox.com/ios-sdk/maps/examples/default-callout/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/annotation-view-image/"> + Add annotation views and images</a>, <a href="https://docs.mapbox.com/ios/maps/examples/custom-callout/"> + Display custom views as callouts</a>, and <a href="https://docs.mapbox.com/ios/maps/examples/default-callout/"> Default callout usage</a> examples to learn how to show callouts for `MGLAnnotation` objects. */ @@ -633,7 +633,7 @@ NS_ASSUME_NONNULL_BEGIN default callout view. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/custom-callout/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/custom-callout/"> Display custom views as callouts</a> example to learn how to customize an `MGLAnnotation` object's `MGLCalloutView`. */ @@ -664,7 +664,7 @@ NS_ASSUME_NONNULL_BEGIN @return The accessory view to display. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/default-callout/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/default-callout/"> Default callout usage</a> example to learn how to modify the view that is displayed on the left side of the standard callout bubble. */ @@ -695,7 +695,7 @@ NS_ASSUME_NONNULL_BEGIN @return The accessory view to display. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/default-callout/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/default-callout/"> Default callout usage</a> example to learn how to modify the view that is displayed on the right side of the standard callout bubble. */ @@ -725,7 +725,7 @@ NS_ASSUME_NONNULL_BEGIN @param control The control that was tapped. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/default-callout/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/default-callout/"> Default callout usage</a> example to learn how to trigger an action when the standard callout bubble's accessory control is tapped. */ @@ -748,7 +748,7 @@ NS_ASSUME_NONNULL_BEGIN @param annotation The annotation whose callout was tapped. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/custom-callout/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/custom-callout/"> Display custom views as callouts</a> example to learn how to trigger an action when an `MGLAnnotation`s `MGLCalloutView` is tapped. */ diff --git a/platform/ios/src/MGLMapboxEvents.m b/platform/ios/src/MGLMapboxEvents.m index e9f27b3446..0635f974e1 100644 --- a/platform/ios/src/MGLMapboxEvents.m +++ b/platform/ios/src/MGLMapboxEvents.m @@ -189,7 +189,7 @@ static NSString * const MGLVariableGeofence = @"VariableGeofence"; @"End users must be able to opt out of Mapbox Telemetry in your app, either inside Settings (via Settings.bundle) or inside this app. " @"By default, this opt-out control is included as a menu item in the attribution action sheet. " @"If you reimplement the opt-out control inside this app, disable this assertion by setting MGLMapboxMetricsEnabledSettingShownInApp to YES in Info.plist." - @"\n\nSee https://www.mapbox.com/ios-sdk/#telemetry_opt_out for more information." + @"\n\nSee https://docs.mapbox.com/help/how-mapbox-works/attribution/#mapbox-maps-sdk-for-ios for more information." @"\n\nAdditionally, by hiding this attribution control you agree to display the required attribution elsewhere in this app."]; } } diff --git a/platform/ios/src/MGLUserLocation.h b/platform/ios/src/MGLUserLocation.h index de720d9050..d7c8576c47 100644 --- a/platform/ios/src/MGLUserLocation.h +++ b/platform/ios/src/MGLUserLocation.h @@ -13,7 +13,9 @@ NS_ASSUME_NONNULL_BEGIN `userLocation` property of the map view displayed in your application. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/user-location-annotation/">Customize the user location annotation</a> example to learn how to overide the default user location annotation. + See the <a href="https://docs.mapbox.com/ios/maps/examples/user-location-annotation/"> + Customize the user location annotation</a> example to learn how to overide the + default user location annotation. */ MGL_EXPORT @interface MGLUserLocation : NSObject <MGLAnnotation, NSSecureCoding> diff --git a/platform/ios/src/MGLUserLocationAnnotationView.h b/platform/ios/src/MGLUserLocationAnnotationView.h index 573fb9f95f..f5197b9f76 100644 --- a/platform/ios/src/MGLUserLocationAnnotationView.h +++ b/platform/ios/src/MGLUserLocationAnnotationView.h @@ -27,7 +27,7 @@ MGL_EXPORT is inactive. #### Related examples - See the <a href="https://www.mapbox.com/ios-sdk/maps/examples/user-location-annotation/"> + See the <a href="https://docs.mapbox.com/ios/maps/examples/user-location-annotation/"> Customize the user location annotation</a> example to learn how to customize the default user location annotation object. */ |