From ddecdeca9493ac1caaae2301eb822bdbf2f75ff9 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 14 Apr 2017 12:37:43 -0700
Subject: [core] Move ProjectedMeters to projection.hpp

---
 test/util/geo.test.cpp        | 15 ---------------
 test/util/projection.test.cpp | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 16 deletions(-)

(limited to 'test')

diff --git a/test/util/geo.test.cpp b/test/util/geo.test.cpp
index 3dfa8e1cca..d0d01b6f88 100644
--- a/test/util/geo.test.cpp
+++ b/test/util/geo.test.cpp
@@ -33,21 +33,6 @@ TEST(LatLng, InvalidLatLng) {
     }
 }
 
-TEST(ProjectedMeters, InvalidProjectedMeters) {
-    try {
-        ProjectedMeters { NAN };
-        ASSERT_TRUE(false) << "should throw";
-    } catch (const std::domain_error& error) {
-        ASSERT_EQ(std::string(error.what()), "northing must not be NaN");
-    }
-    try {
-        ProjectedMeters { 0, NAN };
-        ASSERT_TRUE(false) << "should throw";
-    } catch (const std::domain_error& error) {
-        ASSERT_EQ(std::string(error.what()), "easting must not be NaN");
-    }
-}
-
 TEST(EdgeInsets, InvalidEdgeInsets) {
     try {
         EdgeInsets { NAN };
diff --git a/test/util/projection.test.cpp b/test/util/projection.test.cpp
index 9f27fe3d14..a489320dde 100644
--- a/test/util/projection.test.cpp
+++ b/test/util/projection.test.cpp
@@ -1,7 +1,6 @@
 #include <mbgl/test/util.hpp>
 
 #include <mbgl/util/constants.hpp>
-#include <mbgl/util/geo.hpp>
 #include <mbgl/util/projection.hpp>
 
 #include <limits>
@@ -61,3 +60,18 @@ TEST(Projection, ProjectedMeters) {
     EXPECT_EQ(latLng.latitude(), util::LATITUDE_MAX);
     EXPECT_EQ(latLng.longitude(), util::LONGITUDE_MAX);
 }
+
+TEST(Projection, InvalidProjectedMeters) {
+    try {
+        ProjectedMeters { NAN };
+        ASSERT_TRUE(false) << "should throw";
+    } catch (const std::domain_error& error) {
+        ASSERT_EQ(std::string(error.what()), "northing must not be NaN");
+    }
+    try {
+        ProjectedMeters { 0, NAN };
+        ASSERT_TRUE(false) << "should throw";
+    } catch (const std::domain_error& error) {
+        ASSERT_EQ(std::string(error.what()), "easting must not be NaN");
+    }
+}
-- 
cgit v1.2.1