fix: don't pass a non-positive pinch scale to math.log - #2241
Open
AzazelSensei wants to merge 1 commit into
Open
fix: don't pass a non-positive pinch scale to math.log#2241AzazelSensei wants to merge 1 commit into
AzazelSensei wants to merge 1 commit into
Conversation
The pinch path checked details.scale > 0, but the value actually logged is details.scale + _scaleCorrector. After a gesture-race win that corrector is 1 - lastScale, so the sum can go <= 0. math.log of that is NaN and it ends up in the camera. Skip the zoom update for that frame, and make zoomForScale return the start zoom when the scale isn't usable. Fixes fleaflet#2237
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #2237
The pinch-zoom path only checked
details.scale > 0before callingmath.log. The value that actually gets logged isdetails.scale + _scaleCorrector. After a multi-finger gesture race win, that corrector is1 - lastScale, so the sum can be 0 or negative.logof that is NaN, and it goes straight into the camera.I now check the corrected scale at the call site.
zoomForScalealso keeps the start zoom if the scale isn't a positive finite number, so the other two callers are covered too.There's a unit test with the numbers from the issue (
lastScale = 2.5, new gesture atdetails.scale = 1.0).