From 411a562061f404fa7174222f38a1a9a13a396fd9 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Tue, 9 Feb 2016 17:42:38 +0200 Subject: [core] Enforce constants usage Use 'LATITUDE_MAX', 'LONGITUDE_MAX', 'DEG2RAD' and 'RAD2DEG' whenever possible. --- test/map/transform.cpp | 33 +++++++++++++++++---------------- test/util/geo.cpp | 31 ++++++++++++++++--------------- 2 files changed, 33 insertions(+), 31 deletions(-) (limited to 'test') diff --git a/test/map/transform.cpp b/test/map/transform.cpp index 3eb1c1bee1..1d3309e7e2 100644 --- a/test/map/transform.cpp +++ b/test/map/transform.cpp @@ -109,8 +109,9 @@ TEST(Transform, InvalidBearing) { TEST(Transform, PerspectiveProjection) { MockView view; - Transform transform(view, ConstrainMode::HeightOnly); + LatLng loc; + Transform transform(view, ConstrainMode::HeightOnly); transform.resize({{ 1000, 1000 }}); transform.setScale(2 << 9); transform.setPitch(0.9); @@ -118,7 +119,7 @@ TEST(Transform, PerspectiveProjection) { // expected values are from mapbox-gl-js - LatLng loc = transform.getState().pointToLatLng({ 500, 500 }); + loc = transform.getLatLng(); ASSERT_NEAR(-77, loc.longitude, 0.0001); ASSERT_NEAR(38, loc.latitude, 0.0001); @@ -145,17 +146,17 @@ TEST(Transform, ConstrainHeightOnly) { Transform transform(view, ConstrainMode::HeightOnly); transform.resize({{ 1000, 1000 }}); - transform.setScale(1024); + transform.setScale(std::pow(2, util::MAX_ZOOM)); transform.setLatLng(LatLngBounds::world().southwest()); - loc = transform.getState().pointToLatLng({ 500, 500 }); - ASSERT_NEAR(-85.021422866378714, loc.latitude, 0.0001); - ASSERT_NEAR(180, std::abs(loc.longitude), 0.0001); + loc = transform.getLatLng(); + ASSERT_NEAR(-util::LATITUDE_MAX, loc.latitude, 0.001); + ASSERT_NEAR(-util::LONGITUDE_MAX, loc.longitude, 0.001); transform.setLatLng(LatLngBounds::world().northeast()); - loc = transform.getState().pointToLatLng({ 500, 500 }); - ASSERT_NEAR(85.021422866378742, loc.latitude, 0.0001); - ASSERT_NEAR(180, std::abs(loc.longitude), 0.0001); + loc = transform.getLatLng(); + ASSERT_NEAR(util::LATITUDE_MAX, loc.latitude, 0.001); + ASSERT_NEAR(util::LONGITUDE_MAX, std::abs(loc.longitude), 0.001); } TEST(Transform, ConstrainWidthAndHeight) { @@ -164,17 +165,17 @@ TEST(Transform, ConstrainWidthAndHeight) { Transform transform(view, ConstrainMode::WidthAndHeight); transform.resize({{ 1000, 1000 }}); - transform.setScale(1024); + transform.setScale(std::pow(2, util::MAX_ZOOM)); transform.setLatLng(LatLngBounds::world().southwest()); - loc = transform.getState().pointToLatLng({ 500, 500 }); - ASSERT_NEAR(-85.021422866378714, loc.latitude, 0.0001); - ASSERT_NEAR(-179.65667724609375, loc.longitude, 0.0001); + loc = transform.getLatLng(); + ASSERT_NEAR(-util::LATITUDE_MAX, loc.latitude, 0.001); + ASSERT_NEAR(-util::LONGITUDE_MAX, loc.longitude, 0.001); transform.setLatLng(LatLngBounds::world().northeast()); - loc = transform.getState().pointToLatLng({ 500, 500 }); - ASSERT_NEAR(85.021422866378742, loc.latitude, 0.0001); - ASSERT_NEAR(179.65667724609358, std::abs(loc.longitude), 0.0001); + loc = transform.getLatLng(); + ASSERT_NEAR(util::LATITUDE_MAX, loc.latitude, 0.001); + ASSERT_NEAR(util::LONGITUDE_MAX, std::abs(loc.longitude), 0.001); } TEST(Transform, Anchor) { diff --git a/test/util/geo.cpp b/test/util/geo.cpp index 96335c5dba..86f448ebbc 100644 --- a/test/util/geo.cpp +++ b/test/util/geo.cpp @@ -1,5 +1,6 @@ #include "../fixtures/util.hpp" +#include #include #include @@ -87,36 +88,36 @@ TEST(LatLngBounds, Northwest) { TEST(LatLng, FromTileID) { for (int i = 0; i < 20; i++) { const LatLng ll{ TileID(i, 0, 0, 0) }; - ASSERT_DOUBLE_EQ(-180, ll.longitude); - ASSERT_DOUBLE_EQ(85.051128779806604, ll.latitude); + ASSERT_DOUBLE_EQ(-util::LONGITUDE_MAX, ll.longitude); + ASSERT_DOUBLE_EQ(util::LATITUDE_MAX, ll.latitude); } { const LatLng ll{ TileID(0, 1, 0, 0) }; - ASSERT_DOUBLE_EQ(180, ll.longitude); - ASSERT_DOUBLE_EQ(85.051128779806604, ll.latitude); + ASSERT_DOUBLE_EQ(util::LONGITUDE_MAX, ll.longitude); + ASSERT_DOUBLE_EQ(util::LATITUDE_MAX, ll.latitude); } { const LatLng ll{ TileID(0, -1, 0, 0) }; ASSERT_DOUBLE_EQ(-540, ll.longitude); - ASSERT_DOUBLE_EQ(85.051128779806604, ll.latitude); + ASSERT_DOUBLE_EQ(util::LATITUDE_MAX, ll.latitude); } } TEST(LatLngBounds, FromTileID) { { const LatLngBounds bounds{ TileID(0, 0, 0, 0) }; - ASSERT_DOUBLE_EQ(-180, bounds.west()); - ASSERT_DOUBLE_EQ(-85.051128779806604, bounds.south()); - ASSERT_DOUBLE_EQ(180, bounds.east()); - ASSERT_DOUBLE_EQ(85.051128779806604, bounds.north()); + ASSERT_DOUBLE_EQ(-util::LONGITUDE_MAX, bounds.west()); + ASSERT_DOUBLE_EQ(-util::LATITUDE_MAX, bounds.south()); + ASSERT_DOUBLE_EQ(util::LONGITUDE_MAX, bounds.east()); + ASSERT_DOUBLE_EQ(util::LATITUDE_MAX, bounds.north()); } { const LatLngBounds bounds{ TileID(1, 0, 1, 0) }; - ASSERT_DOUBLE_EQ(-180, bounds.west()); - ASSERT_DOUBLE_EQ(-85.051128779806604, bounds.south()); + ASSERT_DOUBLE_EQ(-util::LONGITUDE_MAX, bounds.west()); + ASSERT_DOUBLE_EQ(-util::LATITUDE_MAX, bounds.south()); ASSERT_DOUBLE_EQ(0, bounds.east()); ASSERT_DOUBLE_EQ(0, bounds.north()); } @@ -124,16 +125,16 @@ TEST(LatLngBounds, FromTileID) { { const LatLngBounds bounds{ TileID(1, 1, 1, 0) }; ASSERT_DOUBLE_EQ(0, bounds.west()); - ASSERT_DOUBLE_EQ(-85.051128779806604, bounds.south()); - ASSERT_DOUBLE_EQ(180, bounds.east()); + ASSERT_DOUBLE_EQ(-util::LATITUDE_MAX, bounds.south()); + ASSERT_DOUBLE_EQ(util::LONGITUDE_MAX, bounds.east()); ASSERT_DOUBLE_EQ(0, bounds.north()); } { const LatLngBounds bounds{ TileID(1, 0, 0, 0) }; - ASSERT_DOUBLE_EQ(-180, bounds.west()); + ASSERT_DOUBLE_EQ(-util::LONGITUDE_MAX, bounds.west()); ASSERT_DOUBLE_EQ(0, bounds.south()); ASSERT_DOUBLE_EQ(0, bounds.east()); - ASSERT_DOUBLE_EQ(85.051128779806604, bounds.north()); + ASSERT_DOUBLE_EQ(util::LATITUDE_MAX, bounds.north()); } } -- cgit v1.2.1