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

Commit

Permalink
ignore Transform changes with NaN parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
@kkaefer
kkaefer committed May 8, 2015
1 parent 544b9f6 commit dbc8fde
Show file tree
Hide file tree
Showing 3 changed files with 163 additions and 1 deletion.
38 changes: 37 additions & 1 deletion src/mbgl/map/transform.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ static double _normalizeAngle(double angle, double anchorAngle)
if (std::abs(angle + util::M2PI - anchorAngle) < diff) {
angle += util::M2PI;
}

return angle;
}

Expand Down Expand Up @@ -61,6 +61,10 @@ bool Transform::resize(const uint16_t w, const uint16_t h, const float ratio,
#pragma mark - Position

void Transform::moveBy(const double dx, const double dy, const Duration duration) {
if (std::isnan(dx) || std::isnan(dy)) {
return;
}

std::lock_guard<std::recursive_mutex> lock(mtx);

_moveBy(dx, dy, duration);
Expand Down Expand Up @@ -104,6 +108,10 @@ void Transform::_moveBy(const double dx, const double dy, const Duration duratio
}

void Transform::setLatLng(const LatLng latLng, const Duration duration) {
if (std::isnan(latLng.latitude) || std::isnan(latLng.longitude)) {
return;
}

std::lock_guard<std::recursive_mutex> lock(mtx);

const double m = 1 - 1e-15;
Expand All @@ -116,6 +124,10 @@ void Transform::setLatLng(const LatLng latLng, const Duration duration) {
}

void Transform::setLatLngZoom(const LatLng latLng, const double zoom, const Duration duration) {
if (std::isnan(latLng.latitude) || std::isnan(latLng.longitude) || std::isnan(zoom)) {
return;
}

std::lock_guard<std::recursive_mutex> lock(mtx);

double new_scale = std::pow(2.0, zoom);
Expand All @@ -137,6 +149,10 @@ void Transform::setLatLngZoom(const LatLng latLng, const double zoom, const Dura
#pragma mark - Zoom

void Transform::scaleBy(const double ds, const double cx, const double cy, const Duration duration) {
if (std::isnan(ds) || std::isnan(cx) || std::isnan(cy)) {
return;
}

std::lock_guard<std::recursive_mutex> lock(mtx);

// clamp scale to min/max values
Expand All @@ -152,12 +168,20 @@ void Transform::scaleBy(const double ds, const double cx, const double cy, const

void Transform::setScale(const double scale, const double cx, const double cy,
const Duration duration) {
if (std::isnan(scale) || std::isnan(cx) || std::isnan(cy)) {
return;
}

std::lock_guard<std::recursive_mutex> lock(mtx);

_setScale(scale, cx, cy, duration);
}

void Transform::setZoom(const double zoom, const Duration duration) {
if (std::isnan(zoom)) {
return;
}

std::lock_guard<std::recursive_mutex> lock(mtx);

_setScale(std::pow(2.0, zoom), -1, -1, duration);
Expand Down Expand Up @@ -287,6 +311,10 @@ void Transform::constrain(double& scale, double& y) const {

void Transform::rotateBy(const double start_x, const double start_y, const double end_x,
const double end_y, const Duration duration) {
if (std::isnan(start_x) || std::isnan(start_y) || std::isnan(end_x) || std::isnan(end_y)) {
return;
}

std::lock_guard<std::recursive_mutex> lock(mtx);

double center_x = static_cast<double>(current.width) / 2.0, center_y = static_cast<double>(current.height) / 2.0;
Expand Down Expand Up @@ -317,12 +345,20 @@ void Transform::rotateBy(const double start_x, const double start_y, const doubl
}

void Transform::setAngle(const double new_angle, const Duration duration) {
if (std::isnan(new_angle)) {
return;
}

std::lock_guard<std::recursive_mutex> lock(mtx);

_setAngle(new_angle, duration);
}

void Transform::setAngle(const double new_angle, const double cx, const double cy) {
if (std::isnan(new_angle) || std::isnan(cx) || std::isnan(cy)) {
return;
}

std::lock_guard<std::recursive_mutex> lock(mtx);

double dx = 0, dy = 0;
Expand Down
125 changes: 125 additions & 0 deletions test/miscellaneous/transform.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
#include "../fixtures/util.hpp"

#include <mbgl/util/run_loop.hpp>
#include <mbgl/map/map_data.hpp>
#include <mbgl/map/map_context.hpp>
#include <mbgl/platform/default/headless_view.hpp>
#include <mbgl/platform/default/headless_display.hpp>
#include <mbgl/storage/default_file_source.hpp>

#include <cstdlib>

using namespace mbgl;

class MockView : public View {
public:
void activate() override {
}
void deactivate() override {
}
void notify() override {
}
void invalidate(std::function<void()>) override {
}
};

TEST(Transform, InvalidScale) {
MockView view;
Transform transform(view);

ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
ASSERT_DOUBLE_EQ(1, transform.getScale());

transform.setScale(2);

ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
ASSERT_DOUBLE_EQ(2, transform.getScale());

const double invalid = std::nan("");
transform.setScale(invalid);

ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
ASSERT_DOUBLE_EQ(2, transform.getScale());

transform.scaleBy(invalid);

ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
ASSERT_DOUBLE_EQ(2, transform.getScale());

transform.setZoom(invalid);

ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
ASSERT_DOUBLE_EQ(2, transform.getScale());

transform.setLatLngZoom({ 0, 0 }, invalid);

ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
ASSERT_DOUBLE_EQ(2, transform.getScale());
}

TEST(Transform, InvalidLatLng) {
MockView view;
Transform transform(view);

ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
ASSERT_DOUBLE_EQ(1, transform.getScale());

transform.setScale(2);
transform.setLatLng({ 8, 10 });

ASSERT_DOUBLE_EQ(8, transform.getLatLng().latitude);
ASSERT_DOUBLE_EQ(10, transform.getLatLng().longitude);
ASSERT_DOUBLE_EQ(2, transform.getScale());

transform.setLatLngZoom({ 10, 8 }, 2);

ASSERT_DOUBLE_EQ(10, transform.getLatLng().latitude);
ASSERT_DOUBLE_EQ(8, transform.getLatLng().longitude);
ASSERT_DOUBLE_EQ(4, transform.getScale());

const double invalid = std::nan("");
transform.setLatLngZoom({ invalid, 8 }, 2);

ASSERT_DOUBLE_EQ(10, transform.getLatLng().latitude);
ASSERT_DOUBLE_EQ(8, transform.getLatLng().longitude);
ASSERT_DOUBLE_EQ(4, transform.getScale());

transform.setLatLngZoom({ 10, invalid }, 2);

ASSERT_DOUBLE_EQ(10, transform.getLatLng().latitude);
ASSERT_DOUBLE_EQ(8, transform.getLatLng().longitude);
ASSERT_DOUBLE_EQ(4, transform.getScale());
}


TEST(Transform, InvalidBearing) {
MockView view;
Transform transform(view);

ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
ASSERT_DOUBLE_EQ(1, transform.getScale());

transform.setScale(2);
transform.setAngle(2);

ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
ASSERT_DOUBLE_EQ(2, transform.getScale());
ASSERT_DOUBLE_EQ(2, transform.getAngle());

const double invalid = std::nan("");
transform.setAngle(invalid);

ASSERT_DOUBLE_EQ(0, transform.getLatLng().latitude);
ASSERT_DOUBLE_EQ(0, transform.getLatLng().longitude);
ASSERT_DOUBLE_EQ(2, transform.getScale());
ASSERT_DOUBLE_EQ(2, transform.getAngle());
}
1 change: 1 addition & 0 deletions test/test.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
'miscellaneous/rotation_range.cpp',
'miscellaneous/style_parser.cpp',
'miscellaneous/text_conversions.cpp',
'miscellaneous/transform.cpp',
'miscellaneous/tile.cpp',
'miscellaneous/variant.cpp',
'miscellaneous/worker.cpp',
Expand Down

0 comments on commit dbc8fde

Please sign in to comment.