summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [ios] More experimentsupstream/1ec5-annotation-cleanupMinh Nguyễn2017-07-052-2/+11
|
* [ios] Lots of experimentsMinh Nguyễn2017-07-058-16/+182
| | | | The transform matrix is correct, but applying it to the annotation container view incorrectly translates each annotation view, and applying it to each annotation view individually causes an incorrect anchor point to be used.
* [ios] Apply perspective to x-free annotation viewsMinh Nguyễn2017-07-051-17/+23
| | | | Working towards #5090.
* [ios] Annotation view degrees of freedomMinh Nguyễn2017-07-054-56/+97
| | | | | | | | Replaced MGLAnnotationView’s flat property with a freeAxes property that allows 0–2 degrees of freedom (pitch and/or rotation). Reformatted and copyedited MGLAnnotationView documentation. Removed the unnecessary custom getter on scalesWithViewingDistance. Fixes #2528.
* Revert "[ios] Removed MGLAnnotationView.flat"Minh Nguyễn2017-07-053-0/+20
| | | | This reverts commit f2fdc23ec7b39d1ee6c9e4b37ad4952e4a5f5447.
* Merge remote-tracking branch 'origin/tvn-merge-release'Minh Nguyễn2017-07-05145-7314/+10678
|\
| * [macos] - add Styles header to CHANGELOG.mdTobrun2017-07-051-0/+3
| |
| * [darwin] - re-add swift documentationTobrun2017-07-056-0/+44
| |
| * [android] - invible marker views performance fix #9419 (#9420)Łukasz Paczos2017-07-051-1/+1
| |
| * [core] Fix iterator invalidation in erase_ifJohn Firebaugh2017-07-051-4/+4
| | | | | | | | vector::erase invalidates iterators. It's not safe for erase_if to cache the end iterator nor increment, then erase.
| * Merge branch 'release-ios-v3.6.0-android-v5.1.0'Tobrun2017-07-05150-7355/+10672
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .travis.yml # circle.yml # cmake/core-files.cmake # include/mbgl/style/function/composite_function.hpp # platform/android/CHANGELOG.md # platform/android/MapboxGLAndroidSDK/build.gradle # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyBearingTracking.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyLocationTracking.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.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/TrackingSettings.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs # platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java # platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java # platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs # platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java # platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MockLocationEngine.java # platform/android/dependencies.gradle # platform/android/src/native_map_view.cpp # platform/darwin/scripts/generate-style-code.js # platform/darwin/src/MGLGeometry_Private.h # platform/darwin/src/MGLLight.h # platform/darwin/src/MGLLight.mm # platform/darwin/src/MGLSource.h # platform/darwin/src/MGLStyle.h # platform/darwin/src/MGLStyle.mm # platform/darwin/test/MGLLightTest.mm # platform/default/default_file_source.cpp # platform/ios/CHANGELOG.md # platform/ios/Mapbox-iOS-SDK-symbols.podspec # platform/ios/Mapbox-iOS-SDK.podspec # platform/ios/resources/Images.xcassets/default_marker.imageset/default_marker.pdf # platform/macos/CHANGELOG.md # scripts/generate-shaders.js # src/mbgl/layout/symbol_layout.cpp # src/mbgl/programs/program.hpp # src/mbgl/programs/symbol_program.hpp # src/mbgl/programs/uniforms.hpp # src/mbgl/renderer/frame_history.cpp # src/mbgl/renderer/paint_property_binder.hpp # src/mbgl/shaders/line.cpp # src/mbgl/shaders/line_pattern.cpp # src/mbgl/shaders/line_sdf.cpp # src/mbgl/sprite/sprite_atlas.hpp # src/mbgl/style/layers/line_layer_properties.hpp # src/mbgl/style/sources/geojson_source.cpp # src/mbgl/style/style.cpp # src/mbgl/text/glyph_atlas.hpp # src/mbgl/tile/geometry_tile.cpp # src/mbgl/tile/geometry_tile.hpp # test/style/style.test.cpp
| | * [android] - update changelog for 5.1.0 release (#9405)android-v5.1.0Tobrun2017-07-013-3/+8
| | |
| | * [android] - bump Mapbox Android Services to latest for 5.1.0 final release ↵Tobrun2017-06-301-1/+1
| | | | | | | | | | | | (#9402)
| | * Downgrade location provider dependency (#9394)Tobrun2017-06-305-63/+27
| | | | | | | | | | | | | | | | | | * [android] - downgrade LOST to Mapbox SDK 5.0.2 version. * bump LOST back to Mapbox Android SDK version 4.x
| | * macos-v0.5.0macos-v0.5.0Minh Nguyễn2017-06-292-2/+2
| | |
| | * [macos] Updated screenshotMinh Nguyễn2017-06-291-0/+0
| | | | | | | | | | | | The new screenshot features 3D extruded buildings, vertical CJK, and right-to-left Arabic, all via runtime styling.
| | * ios] Update pods spec for iOS v3.6.0ios-v3.6.0Fabian Guerra2017-06-292-2/+2
| | |
| | * [macos] Fixed cursor shifting after drag gestureMinh Nguyễn2017-06-292-1/+2
| | | | | | | | | | | | | | | | | | When redisplaying the mouse cursor after a modified drag gesture, incorporate the conversion from view coordinates to window coordinates. Previously, this code performed the conversion but threw away the results. Fixes #8670.
| | * [macos] Reorganized changelogMinh Nguyễn2017-06-291-4/+12
| | |
| | * [ios] moved changes to darwin (#9387)Jordan Kiley2017-06-292-0/+4
| | |
| | * OnCameraIdle hook into quickzoom gesture (#9339)Tobrun2017-06-296-19/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [android] - OnCameraIdle hook into quickzoom gesture * double tap fix * show MyLocationView bearing for GPS when Compass is not available, only show error about missing compass once, fix test activity. * fix accessor lint warning
| | * [core] Fix iterator invalidation in erase_ifJohn Firebaugh2017-06-281-4/+4
| | | | | | | | | | | | vector::erase invalidates iterators. It's not safe for erase_if to cache the end iterator nor increment, then erase.
| | * [ios] Minimize tilt gesture delayJason Wray2017-06-282-9/+11
| | |
| | * [ios, macos] Fix size and color of default marker imageJason Wray2017-06-264-1/+2
| | |
| | * [ios] Fixed infinite loop zooming in past z23Minh Nguyễn2017-06-241-1/+1
| | | | | | | | | | | | At zoom levels where the minimum 1 meter or 4 feet would be wider than the scale bar’s maximum width, the local variable holding the preferred row was left undefined. A loop that later iterated based on this row would effectively iterate infinitely until memory pressure forces the system to quit the application.
| | * [ios] Update pods spec for iOS v3.6.0-rc.1ios-v3.6.0-rc.1Fabian Guerra2017-06-222-2/+2
| | |
| | * [ios, macos] Updated changelogsMinh Nguyễn2017-06-222-4/+6
| | | | | | | | | | | | Also corrected the version number in the macOS changelog.
| | * [ios] Updated German localizationMinh Nguyễn2017-06-221-0/+18
| | |
| | * [ios] Added Hungarian localization from TransifexMinh Nguyễn2017-06-224-0/+99
| | |
| | * [ios] Allow delegate to keep wandering pinch from panning mapMinh Nguyễn2017-06-222-10/+11
| | | | | | | | | | | | | | | | | | MGLMapView consults MGLMapViewDelegate about whether to zoom the map in response to a pinch gesture, but it should also account for the delegate’s response when panning the map due to the pinch’s center point wandering. Fixes #9168.
| | * Boxing ObjC structs (#9343)Fabian Guerra Soto2017-06-227-8/+10
| | | | | | | | | | | | | | | | | | * [ios, macos] Make structs boxable * [ios, macos] Update changelogs.
| | * [ios, macos] Corrected MGLSource subclassing documentationMinh Nguyễn2017-06-222-6/+7
| | |
| | * [ios, macos] Rewrote MGLStyle class documentationMinh Nguyễn2017-06-221-8/+45
| | | | | | | | | | | | The documentation comment now provides a high-level overview of the runtime styling API and its components, as well as the main workflow for using a style.
| | * 7910: cancel tracking if ongoing animation is stopped manually (#7916)Romain Quidet2017-06-222-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 7910: cancel tracking if ongoing animation is stopped manually * 7910 updating change log * [ios] Fix map camera animation when a significant change occurs * [ios] Update cancel tracking documentation.
| | * [build] Unbreak TravisJohn Firebaugh2017-06-211-0/+2
| | |
| | * [android] - restore LatLngBounds conversion, add regression test (#9324)Tobrun2017-06-212-4/+44
| | |
| | * [android] - update CHANGELOG for release 5.1.0-beta.5 (#9316)android-v5.1.0-beta.5android-v5.1.0-beta.4Tobrun2017-06-211-0/+15
| | |
| | * [android] update mapboxServicesVersion to 2.1.2 (#9311)Antonio Zugaldia2017-06-201-1/+1
| | |
| | * Revisit Javadoc for 5.1.0 (#9266)Tobrun2017-06-2041-215/+940
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [android] - revisit public API javadoc * [android] fix javadoc minor mistakes and typos * grammar tweak * add missing public javadoc
| | * [android] Update to LOST 3.0.1 (#9302)Antonio Zugaldia2017-06-201-1/+1
| | |
| | * fix trackball long press timeout calling the main thread method on a ↵Pablo Guardiola2017-06-201-1/+2
| | | | | | | | | | | | background thread (#9305)
| | * [android] fix pulse marker view options parcelable creator (#9283)Pablo Guardiola2017-06-201-6/+6
| | |
| | * [android] fix custom marker views anchor issue (#9282)Pablo Guardiola2017-06-201-5/+17
| | |
| | * Validate camera position before transforming (#9275)Tobrun2017-06-202-3/+9
| | | | | | | | | | | | | | | | | | * [android] - add camera position validation before transforming * annotate CameraUpdate with nullability
| | * [android] - update activity test generation with newest classes, make ↵Tobrun2017-06-202-5/+6
| | | | | | | | | | | | FillExtrusionActivity conform to generated activity test setup. (#9276)
| | * [core] Trigger repaint on source changesJohn Firebaugh2017-06-192-0/+3
| | |
| | * [ios] Update telemetry cert pinning (#9292)Jesse Bounds2017-06-196-77/+73
| | |
| | * [core] Fix composite function approximation for non-integer stopsJohn Firebaugh2017-06-193-27/+83
| | |
| | * [ios, macos] Updated changelogsMinh Nguyễn2017-06-162-0/+6
| | |
| | * [ios] Update pods spec for iOS v3.6.0-beta.3ios-v3.6.0-beta.3Fabian Guerra2017-06-162-2/+2
| | |