diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-06-28 14:36:28 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-06-28 20:59:56 +0300 |
commit | 1df45a5e42b8f299d01cea09c9717c5df287f0b7 (patch) | |
tree | 50e507df58a0caa32de0636871d1e1c750de112c /src/mbgl | |
parent | 433e54e636293eb3b6644c143866aa0d39198441 (diff) | |
download | qtlocation-mapboxgl-1df45a5e42b8f299d01cea09c9717c5df287f0b7.tar.gz |
[core] Check if frameZoom is NaN in Transform::flyTo callback
Diffstat (limited to 'src/mbgl')
-rw-r--r-- | src/mbgl/map/transform.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp index 8d05bc0e91..50f979437d 100644 --- a/src/mbgl/map/transform.cpp +++ b/src/mbgl/map/transform.cpp @@ -293,6 +293,11 @@ void Transform::flyTo(const CameraOptions &camera, const AnimationOptions &anima Point<double> framePoint = util::interpolate(startPoint, endPoint, us); double frameZoom = startZoom + state.scaleZoom(1 / w(s)); + // Zoom can be NaN if size is empty. + if (std::isnan(frameZoom)) { + frameZoom = zoom; + } + // Convert to geographic coordinates and set the new viewpoint. LatLng frameLatLng = Projection::unproject(framePoint, startScale); state.setLatLngZoom(frameLatLng, frameZoom); |