New LatLon class.

2 files changed, 29 insertions, 14 deletions

diff --git a/geometry/geometry_tests/geometry_tests.pro b/geometry/geometry_tests/geometry_tests.pro
index a27e531258..200cda12f8 100644
--- a/geometry/geometry_tests/geometry_tests.pro
+++ b/geometry/geometry_tests/geometry_tests.pro
@@ -19,26 +19,27 @@ HEADERS += \
 
 SOURCES += \
   ../../testing/testingmain.cpp \
-  distance_test.cpp \
-  distance_on_sphere_test.cpp \
   angle_test.cpp \
-  common_test.cpp \
-  screen_test.cpp \
+  anyrect_test.cpp \
   cellid_test.cpp \
+  common_test.cpp \
+  covering_test.cpp \
+  distance_on_sphere_test.cpp \
+  distance_test.cpp \
   intersect_test.cpp \
-  point_test.cpp \
+  latlon_test.cpp \
   packer_test.cpp \
-  segments_intersect_test.cpp \
-  covering_test.cpp \
+  point_test.cpp \
   pointu_to_uint64_test.cpp \
-  simplification_test.cpp \
-  transformations_test.cpp \
-  tree_test.cpp \
   polygon_test.cpp \
-  region_test.cpp \
   rect_test.cpp \
-  robust_test.cpp \
-  anyrect_test.cpp \
   region2d_binary_op_test.cpp \
-  vector_test.cpp \
+  region_test.cpp \
+  robust_test.cpp \
+  screen_test.cpp \
+  segments_intersect_test.cpp \
+  simplification_test.cpp \
   spline_test.cpp \
+  transformations_test.cpp \
+  tree_test.cpp \
+  vector_test.cpp \
diff --git a/geometry/geometry_tests/latlon_test.cpp b/geometry/geometry_tests/latlon_test.cpp
new file mode 100644
index 0000000000..2bb306f0cc
--- /dev/null
+++ b/geometry/geometry_tests/latlon_test.cpp
@@ -0,0 +1,14 @@
+#include "testing/testing.hpp"
+#include "geometry/latlon.hpp"
+#include "geometry/point2d.hpp"
+#include "indexer/mercator.hpp"
+
+UNIT_TEST(LatLonPointConstructorTest)
+{
+  m2::PointD basePoint(39.123, 42.456);
+  ms::LatLon wgsPoint(basePoint);
+  m2::PointD resultPoint(MercatorBounds::LonToX(wgsPoint.lon),
+                         MercatorBounds::LatToY(wgsPoint.lat));
+  TEST_ALMOST_EQUAL_ULPS(basePoint.x, resultPoint.x, ());
+  TEST_ALMOST_EQUAL_ULPS(basePoint.y, resultPoint.y, ());
+}