diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-02-09 17:42:38 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-03-01 20:58:54 +0000 |
| commit | 411a562061f404fa7174222f38a1a9a13a396fd9 (patch) | |
| tree | fcbc295f48d48d86f75ced98b8a9ad137cf5bce0 /test/util | |
| parent | 9955087767d226c09816d562be39be1f1a1e84c5 (diff) | |
| download | qtlocation-mapboxgl-411a562061f404fa7174222f38a1a9a13a396fd9.tar.gz | |
[core] Enforce constants usage
Use 'LATITUDE_MAX', 'LONGITUDE_MAX', 'DEG2RAD' and 'RAD2DEG' whenever
possible.
Diffstat (limited to 'test/util')
| -rw-r--r-- | test/util/geo.cpp | 31 |
1 files changed, 16 insertions, 15 deletions
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 <mbgl/util/constants.hpp> #include <mbgl/util/geo.hpp> #include <mbgl/map/tile_id.hpp> @@ -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()); } } |