diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-04-23 10:44:02 -0400 |
|---|---|---|
| committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-04-23 10:44:02 -0400 |
| commit | e08b6fe87f5824ab05a4cc67d9a76af5bb5ddd3b (patch) | |
| tree | 886e10260bfa044f62943186ec837b9ccd02934c /platform/ios/docs/img | |
| parent | 2bb785dad2489d04db179fa9cf65514640db0a96 (diff) | |
| parent | a45670cfb5752866b9c8130024a313944684c2db (diff) | |
| download | qtlocation-mapboxgl-e08b6fe87f5824ab05a4cc67d9a76af5bb5ddd3b.tar.gz | |
Merge branch 'release-boba' into masterupstream/fabian-merge-v4.0.0
# Conflicts:
# circle.yml
# include/mbgl/style/expression/let.hpp
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
# platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java
# platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
# platform/android/gradle/dependencies.gradle
# platform/android/src/example_custom_layer.cpp
# platform/android/src/geojson/point.cpp
# platform/darwin/src/NSPredicate+MGLAdditions.mm
# platform/darwin/test/MGLExpressionTests.mm
# platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec
# platform/ios/Mapbox-iOS-SDK-symbols.podspec
# platform/ios/Mapbox-iOS-SDK.podspec
# platform/ios/app/MBXViewController.m
# src/mbgl/renderer/layers/render_custom_layer.cpp
# src/mbgl/style/conversion/filter.cpp
# src/mbgl/style/expression/interpolate.cpp
# src/mbgl/style/expression/value.cpp
# test/style/filter.test.cpp
Diffstat (limited to 'platform/ios/docs/img')
14 files changed, 0 insertions, 0 deletions
diff --git a/platform/ios/docs/img/adding-points-to-a-map/annotation-image.png b/platform/ios/docs/img/adding-points-to-a-map/annotation-image.png Binary files differnew file mode 100644 index 0000000000..b9aa946363 --- /dev/null +++ b/platform/ios/docs/img/adding-points-to-a-map/annotation-image.png diff --git a/platform/ios/docs/img/adding-points-to-a-map/annotation-view.png b/platform/ios/docs/img/adding-points-to-a-map/annotation-view.png Binary files differnew file mode 100644 index 0000000000..90c181f664 --- /dev/null +++ b/platform/ios/docs/img/adding-points-to-a-map/annotation-view.png diff --git a/platform/ios/docs/img/adding-points-to-a-map/circle-layer.png b/platform/ios/docs/img/adding-points-to-a-map/circle-layer.png Binary files differnew file mode 100644 index 0000000000..5edf88e0da --- /dev/null +++ b/platform/ios/docs/img/adding-points-to-a-map/circle-layer.png diff --git a/platform/ios/docs/img/adding-points-to-a-map/symbol-layer.png b/platform/ios/docs/img/adding-points-to-a-map/symbol-layer.png Binary files differnew file mode 100644 index 0000000000..cff39b0bce --- /dev/null +++ b/platform/ios/docs/img/adding-points-to-a-map/symbol-layer.png diff --git a/platform/ios/docs/img/runtime-styling/CustomAnnotations.gif b/platform/ios/docs/img/runtime-styling/CustomAnnotations.gif Binary files differindex dee99d01fd..71d4c4a8a0 100644 --- a/platform/ios/docs/img/runtime-styling/CustomAnnotations.gif +++ b/platform/ios/docs/img/runtime-styling/CustomAnnotations.gif diff --git a/platform/ios/docs/img/runtime-styling/DynamicStyles.gif b/platform/ios/docs/img/runtime-styling/DynamicStyles.gif Binary files differindex b42d30c602..8854474ede 100644 --- a/platform/ios/docs/img/runtime-styling/DynamicStyles.gif +++ b/platform/ios/docs/img/runtime-styling/DynamicStyles.gif diff --git a/platform/ios/docs/img/runtime-styling/Emoji.gif b/platform/ios/docs/img/runtime-styling/Emoji.gif Binary files differindex fc50b28972..afb7a42693 100644 --- a/platform/ios/docs/img/runtime-styling/Emoji.gif +++ b/platform/ios/docs/img/runtime-styling/Emoji.gif diff --git a/platform/ios/docs/img/runtime-styling/HexBins.gif b/platform/ios/docs/img/runtime-styling/HexBins.gif Binary files differindex c810085f22..6078ac9e8d 100644 --- a/platform/ios/docs/img/runtime-styling/HexBins.gif +++ b/platform/ios/docs/img/runtime-styling/HexBins.gif diff --git a/platform/ios/docs/img/runtime-styling/Population.gif b/platform/ios/docs/img/runtime-styling/Population.gif Binary files differindex 81b6c6310f..8de14e6422 100644 --- a/platform/ios/docs/img/runtime-styling/Population.gif +++ b/platform/ios/docs/img/runtime-styling/Population.gif diff --git a/platform/ios/docs/img/runtime-styling/SnowLevels.gif b/platform/ios/docs/img/runtime-styling/SnowLevels.gif Binary files differindex 8ee2f9fddd..463e0398d2 100644 --- a/platform/ios/docs/img/runtime-styling/SnowLevels.gif +++ b/platform/ios/docs/img/runtime-styling/SnowLevels.gif diff --git a/platform/ios/docs/img/studio-workflow/add-properties.gif b/platform/ios/docs/img/studio-workflow/add-properties.gif Binary files differindex 740fae655b..6cab64c050 100644 --- a/platform/ios/docs/img/studio-workflow/add-properties.gif +++ b/platform/ios/docs/img/studio-workflow/add-properties.gif diff --git a/platform/ios/docs/img/studio-workflow/create-polygons.gif b/platform/ios/docs/img/studio-workflow/create-polygons.gif Binary files differindex 6eb2c0afb8..6383dd31df 100644 --- a/platform/ios/docs/img/studio-workflow/create-polygons.gif +++ b/platform/ios/docs/img/studio-workflow/create-polygons.gif diff --git a/platform/ios/docs/img/studio-workflow/property-values.png b/platform/ios/docs/img/studio-workflow/property-values.png Binary files differindex 95704241f9..2b85db80d6 100644 --- a/platform/ios/docs/img/studio-workflow/property-values.png +++ b/platform/ios/docs/img/studio-workflow/property-values.png diff --git a/platform/ios/docs/img/studio-workflow/stop-functions.png b/platform/ios/docs/img/studio-workflow/stop-functions.png Binary files differindex 4affecf005..8480cb2d53 100644 --- a/platform/ios/docs/img/studio-workflow/stop-functions.png +++ b/platform/ios/docs/img/studio-workflow/stop-functions.png |
