Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Invoke callback if fling is valid #9192

Merged
merged 1 commit into from
Jun 6, 2017
Merged

Invoke callback if fling is valid #9192

merged 1 commit into from
Jun 6, 2017

Conversation

tobrun
Copy link
Member

@tobrun tobrun commented Jun 6, 2017

closes #9177

@tobrun tobrun added the Android Mapbox Maps SDK for Android label Jun 6, 2017
@tobrun tobrun added this to the android-v5.1.0 milestone Jun 6, 2017
@tobrun tobrun self-assigned this Jun 6, 2017
@tobrun tobrun requested a review from Guardiola31337 June 6, 2017 06:24
LukasPaczos
LukasPaczos reviewed Jun 6, 2017
View reviewed changes
...m/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java Outdated
@@ -357,6 +356,8 @@ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float ve
return false;
}

cameraChangeDispatcher.onCameraMoveStarted(REASON_API_GESTURE);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this could be moved below transform.cancelTransitions(); so that onCameraMoveCanceled() is called before onCameraMoveStarted()

@LukasPaczos LukasPaczos mentioned this pull request Jun 6, 2017
Closed
@tobrun tobrun force-pushed the 9177-camera-move-listener branch from 86d4f86 to 1d2f2a9 Compare June 6, 2017 07:38
Guardiola31337
Guardiola31337 approved these changes Jun 6, 2017
View reviewed changes
Copy link
Contributor

@Guardiola31337 Guardiola31337 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@tobrun tobrun merged commit ef7b355 into release-ios-v3.6.0-android-v5.1.0 Jun 6, 2017
@tobrun tobrun deleted the 9177-camera-move-listener branch June 6, 2017 10:13
@tobrun tobrun mentioned this pull request Jun 9, 2017
Closed
12 tasks
mappy-mobile pushed a commit to Mappy/mapbox-gl-native that referenced this pull request Jun 15, 2017
Merge branch 'release-ios-v3.6.0-android-v5.1.0' into merge_mapbox_v5_1
28b6bbb 
* release-ios-v3.6.0-android-v5.1.0: (395 commits)
  [android] - correct source changed map event javadoc (mapbox#9243)
  [ios, macos] Fix MGLSphericalPosition.radial misleading type.
  [android] - run MapboxMap invocations to ui thread for instrumentation tests (mapbox#9198)
  [android] - update changelog for v5.1.0-beta.4 (mapbox#9232)
  Cherry picks to release branch (mapbox#9230)
  [android] - update components with camera values when animating (mapbox#9174)
  Custom location source fix (mapbox#9142)
  [android] - invalidating MyLocationView bearing when not following position (mapbox#9212)
  [android] - option to disable camera animation while following position (mapbox#9210)
  [android] - remove conversion from pixels to dp (mapbox#9205)
  fix mapbox#8300 flyTo for close points
  [android] - keep location tracking mode after screen rotation (mapbox#9187)
  [android] - dealing with infinite camera move callbacks (mapbox#9177) (mapbox#9194)
  [android] - only invoke callback if fling scrolling animation isn't going to be ignored. (mapbox#9192)
  [android] - validate if gestures should execute (mapbox#9173)
  [ios] Make annotation view rotation alignment configurable (mapbox#9147)
  [core] Make TransformState LatLngBounds optional
  add null check in custom location engine activity to prevent null pointer exception (mapbox#9159)
  [android] Cherry picking 9133 (mapbox#9145)
  [ios] Update pods spec for iOS v3.6.0-beta.2
  ...

# Conflicts:
#	Makefile
#	cmake/core-files.cmake
#	platform/android/MapboxGLAndroidSDK/build.gradle
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/proguard-rules.pro
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MapboxConstants.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.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/Transform.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/LatLngBoundsActivity.java
#	platform/android/config.cmake
#	platform/android/src/map/camera_position.cpp
#	platform/android/src/native_map_view.cpp
#	platform/android/src/native_map_view.hpp
#	platform/qt/src/qmapboxgl_p.hpp
#	src/mbgl/renderer/painter_line.cpp
#	src/mbgl/sprite/sprite_atlas.cpp
#	src/mbgl/sprite/sprite_atlas.hpp
#	src/mbgl/sprite/sprite_parser.cpp
#	src/mbgl/sprite/sprite_parser.hpp
#	src/mbgl/style/layers/line_layer_impl.cpp
#	src/mbgl/style/layers/line_layer_impl.hpp
#	src/mbgl/style/style.cpp
#	src/mbgl/style/style.hpp
#	test/map/transform.test.cpp
#	test/sprite/sprite_atlas.test.cpp
#	test/style/style.test.cpp
@tobrun tobrun mentioned this pull request Jun 21, 2017
Closed
11 tasks
@tobrun tobrun mentioned this pull request Jun 30, 2017
Closed
16 tasks
tobrun added a commit that referenced this pull request Jul 5, 2017
@tobrun
Merge release-ios-v3.6.0-android-v5.1.0 (#9416)
20a5ef6 
* [android] Update release script to support CircleCI builds (#8950)

* update release script to trigger builds on circleci now

* update release script to trigger builds on circleci now

* [core] When a layer is added, reload its source's tiles

* [android] - keep observer when timeout occurs, make observer param nullable, fixup log messages (#8919)

* [android] - avoid crashing when deleting already deleted region (#8920)

* [android] - update LOST to 2.3.0 (#8872)

* [android] - update proguard config, allow debug mimification, update OkHttp to latest version (#8944)

* [core, android, ios, macos, qt] v10 default styles

Upgraded from v9 default styles to v10 wherever the developer expects to get the latest and greatest, as well as in a couple tests where it may be beneficial to ensure that we can handle a two-digit version number in the style URL.

Cherry-picked from ed54849.

* [ios, macos] Updated documented default style version

MGLStyleDefaultVersion is just for Streets now. Deleted style version documentation tests because not all styles are on the same version.

Cherry-picked from ca97dd8.

* [ios, macos] Undeprecated unversioned style URL factory methods

Undeprecated the unversioned style URL factory methods in MGLStyle for consistency with the Android and Qt SDKs. Added warnings about using them with the runtime styling API.

Refactored mbgl::util::default_styles to track different versions for different styles.

Cherry-picked from 9e384b7.

* [core, android, ios, macos] Added Traffic Day/Night to default styles

The Styles API section of the Mapbox API Documentation site now lists Traffic Day v2 and Traffic Night v2, so this change adds those styles to all the places where styles are listed.

Also switched iosapp and macosapp to unversioned style factory methods since MGLStyleDefaultVersion is no longer applicable for all styles.

Cherry-picked from 4d6f545.

* [android] Release android-v5.1.0-beta.2 (#8976)

* [android] url getter on sources

* [android] fix ui test filter in makefile

* [android] - build SNAPSHOT from release branch (#8958)

* [android] - update changelog for 5.1.0-beta.2

* [android] - bump version number

* [android] - Camera change listener v2.0

* [core] allow filesource url transform reset

* [android] Update attribution wordmark (#8774)

* Update wordmark on android

* Moved attribution i icon to the right of mapbox word (in mapview preview image)

* update padding and margin

* [android] update hardcoded branch name

* revert version to 5.1.0-SNAPSHOT

* [android] - MarkerView deselect events with OnMarkerViewClickListener integration (#8996)

* [android] - publish SNAPSHOT from release 5.1.0 branch (#8995)

* [ios, macos] edited identity interpolation mode documentation (#8657)

* [ios, macos] Factored out tile URL template guide

Factored out redundant tile URL template documentation from the MGLRasterSource and MGLVectorSource documentation into a jazzy guide. This documentation used to live in one place, on a method on MGLTileSource, but that method had to be moved to MGLTileSource’s concrete subclasses. A jazzy guide is easier to link to, in any case.

* [ios] Telemetry button in modal view controllers (#9027)

Fixes #8980.

* [android] - bump tools and support lib version due to SNAPSHOT dependencies (#9046)

* [android] - bump tools and support lib version for SNAPSHOT dependencies

* revert unsupported Circle CI build tools version

* [core] Make destructor virtual to avoid object splicing during destruction

* [core] add error for non-virtual destructor deletes + add virtual dtors

* [android] -  remove marker from selected markers when removing marker from annotation manager. (#9047)

* Observe layout guides (#7716)

* [ios] observe layout guides

* [ios] update changelog

* [ios, macos] Change == to = in style function initializers

* [ios] Add annotation view initializer with annotation and reuse id (#9029)

* [ios] Remove annotation view from container view when annotation removed (#9025)

The annotation container view keeps an array of annotation views that is separate from the array of subviews that is a property of the UIView parent class. This removes an annotation view from that container view array when the associated annotation is removed. This avoids issue related to previously removed annotation views continuing to be involved in map view logic around annotation view selection due to taps.

* [android] - correct bearing conversion when animating the map with jumpTo, easeTo and animateTo. (#9050)

* [ios, macos] Updated `maximumZoomLevel` description, cherry-picked #8818 (#8842)

Cherry-picked from a3e4e67.

* [ios] Updated podspecs and changelog for v3.5.3 (#8870)

Cherry-picked from 25c1990.

* [ios] Update podspecs and changelog for iOS v3.5.4

Cherry-picked from db7bb50.

* [ios, macos] Updated changelogs

* [ios, macos] changed TRUE -> 'true' (#9059) fixes #9056

* [ios, macos] Light property implementation in MGLStyle (#9043)

* [ios, macos] Add MGLLight to MGLStyle

* [ios, macos] Implement Objc bindings for Light object

* [ios, macos] Remove rawLight from MGLLight and re-implement it as value class

* [ios, macos] Fix build on macos

* [ios, macos] Add MGLLight documentation, Move MGLLightPosition to MGLLight

* [ios, macos] Add MGLLight tests.

* [ios, macos] Update changelogs

* [ios, macos] Fix misspelling

* [ios, macos] Fix MGLLightAnchor enum property names

* [ios, macos] Update documentation. Improve varialble naming.

* [ios, macos] Rename MGLLightPosition to MGLSphericalPosition

* [ios, macos] Update data types of MGLSphericalPosition

* [android] - horizontally rotated in snapshot (#9083)

* Cherry-pick arabic text to release branch v3.6.0 (#9071)

* [core] Throttle tiles to redo symbol placement at most once every 300ms.
Fixes issue #8435 and prepares for pitch-scaling changes in issue #8967.

* [core] Disable letter-spacing for Arabic labels (issue #9057)

* [ios,macos] multipolygon coordinate (#8713)

* [ios] MGLMultiPolygon's coordinate property implemented

* [ios,macos] Add polylabalel to project config

* [ios,macos] Change coordinate property for MGLPolyline,MGLPolygon,MGLMultiPolygon

* [macos] Change project configuration to support polilabel

* [ios,macos] Add MGLLocationCoordinate2DFromPoint

* [ios, macos] Update changelogs

* [ios, macos] remove unnecesary variables

* [ios, macos] Add radians conversions

* [ios, macos] Add coordinate calc to MGLPolyline

* [ios, macos] Move radian fuctions to MGLGeometry_Private.h

* [ios, macos] Fix code style

* [ios, macos] Fix code indentation

* [ios, macos] Fix radian per meters constant

* [ios, macos] Add test scenarios to testPolyline

* [ios, macos] Fix test accuracy

* [ios, macos] More robust Streets localization

Added Arabic, Portuguese, and Simplified Chinese to the list of languages with specialized fields in the Mapbox Streets source.

Rely on NSBundle to select the most appropriate locale based on the user’s preferred languages.

* [ios] Fallback to Mapbox.bundle as the framework bundle (#9074)

Fixes an issue where localizations could not be found when using static builds.

Throws exception if our bundle can't be found.

* [ios] Move image resources to an asset catalog & switch to PDFs

* [ios, macos] Updated changelogs

Reorganized the changelogs with a new packaging section. Added blurbs about #9062, #8713, #9060, and #9031.

* [ios] Update pods spec for iOS v3.6.0-beta.1

* [macos] Enable View ‣ Traffic Night

Enable the View ‣ Traffic Night menu item and check it when that style is active.

* [android] - stop location updates when toggle MyLocationView state (#9099)

* [android] - LatLngBounds bearing default value (#9102)

* [ios, macos] Fix MGLLight.achor to accept style functions

* [ios] Fix annotation initializers for subclasses of MGLAnnotationView (#9104)

Use a common init function in both of the provided initializers so that subclasses of `MGLAnnotationView` written in Swift don't need to override `init(annotation, reuseIdentifier)`

* [ios] Moved `MGLLight` in jazzy table of contents (#9111)

* [android] - logo placement for creating a Mapview programatically (#9094)

* [android] - Correct logo placement for creating a Mapview programatically, fixup non default placements

* Fixed NIGHTY_TWO_DP typo to NINETY_TWO_DP

* [android] - add binding support for Light (#9013)

* [android] Update Lost to final version 3.0.0 (#9112)

* update lost to final version 3.0.0

* bump MAS version to 2.1.1

* [android] - convert dp to pixels when getting meters per pixel at. (#9048)

* Release Android v5.1.0-beta.3 (#9115)

* [android] - Changelog update for Android release v5.1.0-beta.3

* update CI & version

* reset release properties

* [android] - harden orientation changes (#9128)

* [ios] Remove filter of single metric event

* [ios] remove layout guide observers

* Migrate to GL JS–powered feedback form (#9078)

* [ios, macos] Updated feedback URL

* [ios, macos] Add referrer, heading, pitch to feedback URL

* [ios, macos] Updated changelogs for feedback changes

* [ios] Vary referrer by platform

* [android] - javadoc update for 5.1.0 release (#9138)

* [android] - javadoc update for 5.1.0 release

* oxford comma

* Grammar/spelling tweaks

* grammar tweak

* grammar tweak

* Grammar tweaks

* Grammar tweaks

* [android] fix missing access token variable issue (#9151)

* [ios] Update pods spec for iOS v3.6.0-beta.2

* [android] Cherry picking 9133 (#9145)

* [android] Fix tracking mode + camera race condition (#9133)

* [android] fix tracking mode + camera race condition

* fix resetTrackingModesIfRequired bug (comparing current camera position with target camera position

* cherry pick #9133 and update CHANGELOG

* add null check to prevent null pointer exception

* add null check in custom location engine activity to prevent null pointer exception (#9159)

* [core] Make TransformState LatLngBounds optional

* [ios] Make annotation view rotation alignment configurable (#9147)

This commit adds `rotatesWithMap` property on `MGLAnnotationView`. This
property, when set to `YES` fixes the annotation to a map such that view
follows map's rotation angle. This is useful when user wants to display
rotation-dependent annotations (e.g. sector lights).

* [android] - validate if gestures should execute (#9173)

* [android] - only invoke callback if fling scrolling animation isn't going to be ignored. (#9192)

* [android] - dealing with infinite camera move callbacks (#9177) (#9194)

* [android] - keep location tracking mode after screen rotation (#9187)

* [android] - keep location tracking mode after screen rotation (#9186)

* [android] - using easeCamera to keep location tracking instead of overloaded moveCamera (#9187)

* [android] - checkstyle fix up

* fix #8300 flyTo for close points

The isClose threshold is switched from 0.000001 pixels to 1 pixel.
As a backup, it checks whether r0 and r1 are finite. It might be
possible to have just the threshold check or just the finiteness check,
but I don't see the harm in having both.

std::abs(w0 - w1) < 0.000001 is removed because it doesn't look like
it's needed. All calculations should run fine even if w0 === w1.

Finally, the point interpolation is tweaked so that at the end of the
flying (when k === 1) it ends up at the exact end point. I didn't see
any bugs related to this, but it seems like a good thing to have
explicitly.

* [android] - remove conversion from pixels to dp (#9205)

* [android] - option to disable camera animation while following position (#9210)

* [android] - invalidating MyLocationView bearing when not following position (#9212)

* Custom location source fix (#9142)

*  [android] - custom location engine fixes (#9139)

* Update to latest LOST dependency, fixup internal location source integration

* [android] - update components with camera values when animating (#9174)

* Cherry picks to release branch (#9230)

* [ios][macos] test remove source in use

* [android] test remove source in use

* [core] check source usage before remove

* [core] ensure layer::accept works with non-void return values on gcc

* [android] - remove upgrade runtime exceptions (#9191)

* [android] - update changelog for v5.1.0-beta.4 (#9232)

* [android] - run MapboxMap invocations to ui thread for instrumentation tests (#9198)

* [ios, macos] Fix MGLSphericalPosition.radial misleading type.

* [android] - correct source changed map event javadoc (#9243)

* Cherry pick release (#9263)

* [core] - bump earcut version dependency to handle  unused lamba warning (#9242)

* [android] - snapshot bitmap contains view based content (#9252)

* [core] store vertex attribute binding to prevent duplicate binds

We have an "oldBinding" value that we use for checking whether the vertex attribute was already
bound to the current VAO, but we never set the state. Additionally, we're also checking whether
the previous state was already any binding (optional is set), and don't re-enable the vertex
attribute array. Additionally, we now only disable the vertex attribute array when the previous
state was in fact an array attribute. We still don't deduplicate constant glVertexAttrib* calls,
but that's a little trickier.

* [core] add shader defines for enabling/disabling attributes/uniforms for DDS

* [core] only bind uniforms that exist in the program

* [core] add uniforms to DataDrivenPaintPropertys

* [core] add constant DDS values as uniforms

* [core] Dynamic program compilation for data-driven properties

* [core] Reduce number of varyings to 8 or less

For #pragmas, don't generate varyings for attributes that aren't used by the fragment shader. Pack other varyings more tightly.

* [core] Don't upload the FrameHistory texture in frames where it's not changing

* [core] cleanup ProgramParameters

* [ios, macos] Revised descriptions for abstract classes (#9095)

Addresses #8635

* [ios] Remove old Fabric build infrastructure

* MGLLight autogenerate scripts (#9260)

* [ios, macos] Add the MGLLight generation templates

* [ios, macos] Add MGLLight generation script

* [ios, macos] Add the auto-generation script for MGLLight.mm

* [ios, macos] Add the auto-generation script for MGLLightTest.mm

* [core] Add const to Position constructor.

* [ios, macos] Simplify MGLLightTest.mm autogenerate script.

* [ios] Update pods spec for iOS v3.6.0-beta.3

* [ios, macos] Updated changelogs

* [core] Fix composite function approximation for non-integer stops

* [ios] Update telemetry cert pinning (#9292)

* [core] Trigger repaint on source changes

* [android] - update activity test generation with newest classes, make FillExtrusionActivity conform to generated activity test setup. (#9276)

* Validate camera position before transforming (#9275)

* [android] - add camera position validation before transforming

* annotate CameraUpdate with nullability

* [android] fix custom marker views anchor issue (#9282)

* [android] fix pulse marker view options parcelable creator (#9283)

* fix trackball long press timeout calling the main thread method on a background thread (#9305)

* [android] Update to LOST 3.0.1 (#9302)

* Revisit Javadoc for 5.1.0 (#9266)

* [android] - revisit public API javadoc

* [android] fix javadoc minor mistakes and typos

* grammar tweak

* add missing public javadoc

* [android] update mapboxServicesVersion to 2.1.2 (#9311)

* [android] - update CHANGELOG for release 5.1.0-beta.5 (#9316)

* [android] - restore LatLngBounds conversion, add regression test (#9324)

* [build] Unbreak Travis

* 7910: cancel tracking if ongoing animation is stopped manually (#7916)

* 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.

* [ios, macos] Rewrote MGLStyle class documentation

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.

* [ios, macos] Corrected MGLSource subclassing documentation

* Boxing ObjC structs (#9343)

* [ios, macos] Make structs boxable

* [ios, macos] Update changelogs.

* [ios] Allow delegate to keep wandering pinch from panning map

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.

* [ios] Added Hungarian localization from Transifex

* [ios] Updated German localization

* [ios, macos] Updated changelogs

Also corrected the version number in the macOS changelog.

* [ios] Update pods spec for iOS v3.6.0-rc.1

* [ios] Fixed infinite loop zooming in past z23

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, macos] Fix size and color of default marker image

* [ios] Minimize tilt gesture delay

* [core] Fix iterator invalidation in erase_if

vector::erase invalidates iterators. It's not safe for erase_if to cache the end iterator nor increment, then erase.

* OnCameraIdle hook into quickzoom gesture (#9339)

* [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

* [ios] moved changes to darwin (#9387)

* [macos] Reorganized changelog

* [macos] Fixed cursor shifting after drag gesture

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.

* ios] Update pods spec for iOS v3.6.0

* [macos] Updated screenshot

The new screenshot features 3D extruded buildings, vertical CJK, and right-to-left Arabic, all via runtime styling.

* macos-v0.5.0

* Downgrade location provider dependency (#9394)

* [android] - downgrade LOST to Mapbox SDK 5.0.2 version.

* bump LOST back to Mapbox Android SDK version 4.x

* [android] - bump Mapbox Android Services to latest for 5.1.0 final release (#9402)

* [android] - update changelog for 5.1.0 release (#9405)

* [core] Fix iterator invalidation in erase_if

vector::erase invalidates iterators. It's not safe for erase_if to cache the end iterator nor increment, then erase.

* [android] - invible marker views performance fix #9419 (#9420)

* [darwin] - re-add swift documentation

* [macos] - add Styles header to CHANGELOG.md
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@LukasPaczos LukasPaczos LukasPaczos left review comments

@Guardiola31337 Guardiola31337 Guardiola31337 approved these changes

Assignees

@tobrun tobrun

Labels
Android Mapbox Maps SDK for Android
Projects
None yet
Milestone
android-v5.1.0
Development

Successfully merging this pull request may close these issues.
3 participants
@tobrun @Guardiola31337 @LukasPaczos