This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
[core] Guard against camera's minScale being NaN
#5693
Merged
Conversation
This file contains 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
| @@ -509,7 +509,7 @@ CameraOptions Map::cameraForLatLngs(const std::vector<LatLng>& latLngs, optional | |||
| scaleX -= (padding->left + padding->right) / width; | |||
| scaleY -= (padding->top + padding->bottom) / height; | |||
| } | |||
| double minScale = ::fmin(scaleX, scaleY); | |||
| double minScale = (isnan(scaleX) && isnan(scaleY)) ? INFINITY : ::fmin(scaleX, scaleY); | |||
There was a problem hiding this comment.
Instead of checking for NaN here, I think perhaps we should condition some of the logic above on whether width or height is zero.
There was a problem hiding this comment.
Sure, this is probably better:
// Calculate the zoom level.
double minScale = INFINITY;
if (width > 0 || height > 0) {
double scaleX = getWidth() / width;
double scaleY = getHeight() / height;
if (padding && *padding) {
scaleX -= (padding->left + padding->right) / width;
scaleY -= (padding->top + padding->bottom) / height;
}
minScale = ::fmin(scaleX, scaleY);
}
double zoom = util::log2(getScale() * minScale);
zoom = util::clamp(zoom, getMinZoom(), getMaxZoom());
friedbunny
added a commit
to mapbox/ios-sdk-examples
that referenced
this pull request
Jul 14, 2016
`-showAnnotations:animated:` is broken for a single point: mapbox/mapbox-gl-native#5693.
| scaleX -= (padding->left + padding->right) / width; | ||
| scaleY -= (padding->top + padding->bottom) / height; | ||
| } | ||
| minScale = ::fmin(scaleX, scaleY); |
There was a problem hiding this comment.
Nit: We have a generic util::min in mbgl/math/minmax.hpp.
There was a problem hiding this comment.
Switched in b92a2f3.
|
Good catch @friedbunny 👍 |
Fixes a bug where calculating the padded bounds for a single point would cause division by zero, resulting in NaN for `minScale`. This invalid `minScale` would then be used to create an invalid padded `centerPixel`.
friedbunny
force-pushed
the
fb-delicious-camera-nan
branch
from
b92a2f3
to
09221ec
Compare
|
For posterity, the symptoms of this bug were: using |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 a bug where calculating a camera's padded bounds for a single point would cause division by zero, resulting in NaN for
minScale. This invalidminScalewould then be used to create an invalid paddedcenterPixel.This was introduced by 8e30a4a in #4285, where the scale and padding calculations were split.
The “Add Custom Callout Point” option in ios-app exercises this bug, where the map zooms in on a single annotation, à la:
/cc @brunoabinader @1ec5