[core] Privatize math.hpp and vec.hpp

test/math/clamp.cpp

@@ -0,0 +1,24 @@
+#include <mbgl/test/util.hpp>
+
+#include <mbgl/util/constants.hpp>
+#include <mbgl/math/clamp.hpp>
+
+using namespace mbgl;
+
+TEST(Math, ClampFloatingPoint) {
+    double lowestValue = std::numeric_limits<double>::lowest();
+    double maximumValue = std::numeric_limits<double>::max();
+    double quietNAN = std::numeric_limits<double>::quiet_NaN();
+
+    ASSERT_DOUBLE_EQ(0., util::clamp(0., quietNAN, quietNAN));
+    ASSERT_DOUBLE_EQ(0., util::clamp(0., lowestValue, maximumValue));
+}
+
+TEST(Math, ClampIntegral) {
+    int32_t lowestValue = std::numeric_limits<int32_t>::lowest();
+    int32_t maximumValue = std::numeric_limits<int32_t>::max();
+    int32_t quietNAN = std::numeric_limits<int32_t>::quiet_NaN();
+
+    ASSERT_EQ(0, util::clamp(0, quietNAN, quietNAN));
+    ASSERT_EQ(0, util::clamp(0, lowestValue, maximumValue));
+}

test/math/minmax.cpp

@@ -1,7 +1,7 @@
 #include <mbgl/test/util.hpp>
 
 #include <mbgl/util/constants.hpp>
-#include <mbgl/util/math.hpp>
+#include <mbgl/math/minmax.hpp>
 
 using namespace mbgl;
 
@@ -19,9 +19,6 @@ TEST(Math, MinMaxFloatingPoint) {
     ASSERT_DOUBLE_EQ(maximumValue, util::max(double(NAN), maximumValue));
     ASSERT_DOUBLE_EQ(maximumValue, util::max(quietNAN, maximumValue));
     ASSERT_DOUBLE_EQ(10., util::max(8., 9., 10.));
-
-    ASSERT_DOUBLE_EQ(0., util::clamp(0., quietNAN, quietNAN));
-    ASSERT_DOUBLE_EQ(0., util::clamp(0., lowestValue, maximumValue));
 }
 
 TEST(Math, MinMaxIntegral) {
@@ -36,7 +33,4 @@ TEST(Math, MinMaxIntegral) {
 
     ASSERT_EQ(maximumValue, util::max(quietNAN, maximumValue));
     ASSERT_EQ(10, util::max(8, 9, 10));
-
-    ASSERT_EQ(0, util::clamp(0, quietNAN, quietNAN));
-    ASSERT_EQ(0, util::clamp(0, lowestValue, maximumValue));
 }

test/test.gypi

@@ -24,7 +24,6 @@
         'util/geo.cpp',
         'util/image.cpp',
         'util/mapbox.cpp',
-        'util/math.cpp',
         'util/merge_lines.cpp',
         'util/run_loop.cpp',
         'util/text_conversions.cpp',
@@ -48,6 +47,9 @@
         'map/tile.cpp',
         'map/transform.cpp',
 
+        'math/minmax.cpp',
+        'math/clamp.cpp',
+
         'storage/offline.cpp',
         'storage/offline_database.cpp',
         'storage/offline_download.cpp',