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

Commit

Permalink
fix #8300 flyTo for close points
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ansis authored and jfirebaugh committed Jun 6, 2017
1 parent c047c29 commit acafdae
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions src/mbgl/map/transform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -241,16 +241,13 @@ void Transform::flyTo(const CameraOptions &camera, const AnimationOptions &anima
return std::log(std::sqrt(b * b + 1) - b);
};

// When u₀ = u₁, the optimal path doesn’t require both ascent and descent.
bool isClose = std::abs(u1) < 0.000001;
// Perform a more or less instantaneous transition if the path is too short.
if (isClose && std::abs(w0 - w1) < 0.000001) {
easeTo(camera, animation);
return;
}

/// r₀: Zoom-out factor during ascent.
double r0 = r(0);
double r1 = r(1);

// When u₀ = u₁, the optimal path doesn’t require both ascent and descent.
bool isClose = std::abs(u1) < 1.0 || !std::isfinite(r0) || !std::isfinite(r1);

/** w(s): Returns the visible span on the ground, measured in pixels with
respect to the initial scale.
Expand All @@ -268,7 +265,7 @@ void Transform::flyTo(const CameraOptions &camera, const AnimationOptions &anima
};
/// S: Total length of the flight path, measured in ρ-screenfuls.
double S = (isClose ? (std::abs(std::log(w1 / w0)) / rho)
: ((r(1) - r0) / rho));
: ((r1 - r0) / rho));

Duration duration;
if (animation.duration) {
Expand Down Expand Up @@ -296,7 +293,7 @@ void Transform::flyTo(const CameraOptions &camera, const AnimationOptions &anima
/// s: The distance traveled along the flight path, measured in
/// ρ-screenfuls.
double s = k * S;
double us = u(s);
double us = k == 1.0 ? 1.0 : u(s);

// Calculate the current point and zoom level along the flight path.
Point<double> framePoint = util::interpolate(startPoint, endPoint, us);
Expand Down

0 comments on commit acafdae

Please sign in to comment.