diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-19 11:47:26 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-20 13:54:19 -0700 |
| commit | 8baa804a44927fe23b4fed3cb07eb6db9a78f2e8 (patch) | |
| tree | 2338eae730607f23f5b6b2f64d8196dfa27ad592 /test | |
| parent | 342475efb748558b90437672fba333b3f9af0adc (diff) | |
| download | qtlocation-mapboxgl-8baa804a44927fe23b4fed3cb07eb6db9a78f2e8.tar.gz | |
[core] Fix swapped lat/lon in geo.cpp
Diffstat (limited to 'test')
| -rw-r--r-- | test/miscellaneous/geo.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/test/miscellaneous/geo.cpp b/test/miscellaneous/geo.cpp index 093ea7040c..88f8bc496b 100644 --- a/test/miscellaneous/geo.cpp +++ b/test/miscellaneous/geo.cpp @@ -8,20 +8,20 @@ using namespace mbgl; TEST(Geo, LatLngFromTileID) { for (int i = 0; i < 20; i++) { const LatLng ll{ TileID(i, 0, 0, 0) }; - ASSERT_DOUBLE_EQ(-180, ll.latitude); - ASSERT_DOUBLE_EQ(85.051128779806604, ll.longitude); + ASSERT_DOUBLE_EQ(-180, ll.longitude); + ASSERT_DOUBLE_EQ(85.051128779806604, ll.latitude); } { const LatLng ll{ TileID(0, 1, 0, 0) }; - ASSERT_DOUBLE_EQ(180, ll.latitude); - ASSERT_DOUBLE_EQ(85.051128779806604, ll.longitude); + ASSERT_DOUBLE_EQ(180, ll.longitude); + ASSERT_DOUBLE_EQ(85.051128779806604, ll.latitude); } { const LatLng ll{ TileID(0, -1, 0, 0) }; - ASSERT_DOUBLE_EQ(-540, ll.latitude); - ASSERT_DOUBLE_EQ(85.051128779806604, ll.longitude); + ASSERT_DOUBLE_EQ(-540, ll.longitude); + ASSERT_DOUBLE_EQ(85.051128779806604, ll.latitude); } } @@ -29,33 +29,33 @@ TEST(Geo, LatLngFromTileID) { TEST(Geo, LatLngBoundsFromTileID) { { const LatLngBounds bounds{ TileID(0, 0, 0, 0) }; - ASSERT_DOUBLE_EQ(-180, bounds.sw.latitude); - ASSERT_DOUBLE_EQ(-85.051128779806604, bounds.sw.longitude); - ASSERT_DOUBLE_EQ(180, bounds.ne.latitude); - ASSERT_DOUBLE_EQ(85.051128779806604, bounds.ne.longitude); + ASSERT_DOUBLE_EQ(-180, bounds.sw.longitude); + ASSERT_DOUBLE_EQ(-85.051128779806604, bounds.sw.latitude); + ASSERT_DOUBLE_EQ(180, bounds.ne.longitude); + ASSERT_DOUBLE_EQ(85.051128779806604, bounds.ne.latitude); } { const LatLngBounds bounds{ TileID(1, 0, 1, 0) }; - ASSERT_DOUBLE_EQ(-180, bounds.sw.latitude); - ASSERT_DOUBLE_EQ(-85.051128779806604, bounds.sw.longitude); - ASSERT_DOUBLE_EQ(0, bounds.ne.latitude); + ASSERT_DOUBLE_EQ(-180, bounds.sw.longitude); + ASSERT_DOUBLE_EQ(-85.051128779806604, bounds.sw.latitude); ASSERT_DOUBLE_EQ(0, bounds.ne.longitude); + ASSERT_DOUBLE_EQ(0, bounds.ne.latitude); } { const LatLngBounds bounds{ TileID(1, 1, 1, 0) }; - ASSERT_DOUBLE_EQ(0, bounds.sw.latitude); - ASSERT_DOUBLE_EQ(-85.051128779806604, bounds.sw.longitude); - ASSERT_DOUBLE_EQ(180, bounds.ne.latitude); - ASSERT_DOUBLE_EQ(0, bounds.ne.longitude); + ASSERT_DOUBLE_EQ(0, bounds.sw.longitude); + ASSERT_DOUBLE_EQ(-85.051128779806604, bounds.sw.latitude); + ASSERT_DOUBLE_EQ(180, bounds.ne.longitude); + ASSERT_DOUBLE_EQ(0, bounds.ne.latitude); } { const LatLngBounds bounds{ TileID(1, 0, 0, 0) }; - ASSERT_DOUBLE_EQ(-180, bounds.sw.latitude); - ASSERT_DOUBLE_EQ(0, bounds.sw.longitude); - ASSERT_DOUBLE_EQ(0, bounds.ne.latitude); - ASSERT_DOUBLE_EQ(85.051128779806604, bounds.ne.longitude); + ASSERT_DOUBLE_EQ(-180, bounds.sw.longitude); + ASSERT_DOUBLE_EQ(0, bounds.sw.latitude); + ASSERT_DOUBLE_EQ(0, bounds.ne.longitude); + ASSERT_DOUBLE_EQ(85.051128779806604, bounds.ne.latitude); } } |