remove coordinate_type from closest_point_info as we'd expect closest_point to be represented using FP even when input geometries are defined using integer coordinate_type (e.g std::int64_t)

artemp · artemp · commit 0b13ab69af27 · 2017-10-16T12:24:46.000+02:00
diff --git a/include/boost/geometry/extensions/strategies/cartesian/closest_point.hpp b/include/boost/geometry/extensions/strategies/cartesian/closest_point.hpp
@@ -127,12 +127,14 @@ public :
         if (c1 < zero)
         {
             result.distance = apply_point_point(p, p1);
-            result.closest_point = p1;
+            result.closest_point.x = p1.x;
+            result.closest_point.y = p1.y;
         }
         else if(c1 > c2)
         {
             result.distance = apply_point_point(p, p2);
-            result.closest_point = p2;
+            result.closest_point.x = p2.x;
+            result.closest_point.y = p2.y;
         }
         else
         {
diff --git a/include/mapbox/geometry/algorithms/closest_point.hpp b/include/mapbox/geometry/algorithms/closest_point.hpp
@@ -2,22 +2,19 @@
 
 namespace mapbox { namespace geometry { namespace algorithms {
 
-template <typename T>
 struct closest_point_info
 {
-    using coordinate_type = T;
     closest_point_info()
-        : x(),y(),distance(-1) {}
-    closest_point_info(coordinate_type x_, coordinate_type y_, double distance_)
+        : x(), y(), distance(-1) {}
+    closest_point_info(double x_, double y_, double distance_)
         : x(x_),
           y(y_),
           distance(distance_) {}
-    coordinate_type x;
-    coordinate_type y;
+    double x;
+    double y;
     double distance;
 };
 
 template <typename T1, typename T2>
-auto closest_point(T1 const& geom, mapbox::geometry::point<T2> const& pt)->closest_point_info<T2>;
-
+closest_point_info closest_point(T1 const& geom, mapbox::geometry::point<T2> const& pt);
 }}}
diff --git a/include/mapbox/geometry/algorithms/closest_point_impl.hpp b/include/mapbox/geometry/algorithms/closest_point_impl.hpp
@@ -11,8 +11,8 @@ template <typename T>
 struct closest_point
 {
     using coordinate_type = T;
-    using info_type = boost::geometry::closest_point_result<mapbox::geometry::point<coordinate_type>>;
-    using result_type = closest_point_info<coordinate_type>;
+    using info_type = boost::geometry::closest_point_result<mapbox::geometry::point<double>>;
+    using result_type = closest_point_info;
     closest_point(mapbox::geometry::point<coordinate_type> const& pt)
         : pt_(pt) {}
 
@@ -90,7 +90,7 @@ struct closest_point
 }
 
 template <typename T1, typename T2>
-auto closest_point(T1 const& geom, mapbox::geometry::point<T2> const& pt)->closest_point_info<T2>
+closest_point_info closest_point(T1 const& geom, mapbox::geometry::point<T2> const& pt)
 {
     return detail::closest_point<T2>(pt)(geom);
 }
diff --git a/src/closest_point_d.cpp b/src/closest_point_d.cpp
@@ -4,13 +4,13 @@
 
 namespace mapbox { namespace geometry { namespace algorithms {
 
-template closest_point_info<double> closest_point(geometry<double> const&, point<double> const&);
-template closest_point_info<double> closest_point(point<double> const&, point<double> const&);
-template closest_point_info<double> closest_point(line_string<double> const&, point<double> const&);
-template closest_point_info<double> closest_point(polygon<double>const&, point<double> const&);
-template closest_point_info<double> closest_point(multi_point<double>const&, point<double> const&);
-template closest_point_info<double> closest_point(multi_line_string<double>const&, point<double> const&);
-template closest_point_info<double> closest_point(multi_polygon<double>const&, point<double> const&);
-template closest_point_info<double> closest_point(geometry_collection<double> const&, point<double> const&);
+template closest_point_info closest_point(geometry<double> const&, point<double> const&);
+template closest_point_info closest_point(point<double> const&, point<double> const&);
+template closest_point_info closest_point(line_string<double> const&, point<double> const&);
+template closest_point_info closest_point(polygon<double>const&, point<double> const&);
+template closest_point_info closest_point(multi_point<double>const&, point<double> const&);
+template closest_point_info closest_point(multi_line_string<double>const&, point<double> const&);
+template closest_point_info closest_point(multi_polygon<double>const&, point<double> const&);
+template closest_point_info closest_point(geometry_collection<double> const&, point<double> const&);
 
 }}}
diff --git a/src/closest_point_i64.cpp b/src/closest_point_i64.cpp
@@ -4,13 +4,13 @@
 
 namespace mapbox { namespace geometry { namespace algorithms {
 
-template closest_point_info<std::int64_t> closest_point(geometry<std::int64_t> const&, point<std::int64_t> const&);
-template closest_point_info<std::int64_t> closest_point(point<std::int64_t> const&, point<std::int64_t> const&);
-template closest_point_info<std::int64_t> closest_point(line_string<std::int64_t> const&, point<std::int64_t> const&);
-template closest_point_info<std::int64_t> closest_point(polygon<std::int64_t>const&, point<std::int64_t> const&);
-template closest_point_info<std::int64_t> closest_point(multi_point<std::int64_t>const&, point<std::int64_t> const&);
-template closest_point_info<std::int64_t> closest_point(multi_line_string<std::int64_t>const&, point<std::int64_t> const&);
-template closest_point_info<std::int64_t> closest_point(multi_polygon<std::int64_t>const&, point<std::int64_t> const&);
-template closest_point_info<std::int64_t> closest_point(geometry_collection<std::int64_t> const&, point<std::int64_t> const&);
+template closest_point_info closest_point(geometry<std::int64_t> const&, point<std::int64_t> const&);
+template closest_point_info closest_point(point<std::int64_t> const&, point<std::int64_t> const&);
+template closest_point_info closest_point(line_string<std::int64_t> const&, point<std::int64_t> const&);
+template closest_point_info closest_point(polygon<std::int64_t>const&, point<std::int64_t> const&);
+template closest_point_info closest_point(multi_point<std::int64_t>const&, point<std::int64_t> const&);
+template closest_point_info closest_point(multi_line_string<std::int64_t>const&, point<std::int64_t> const&);
+template closest_point_info closest_point(multi_polygon<std::int64_t>const&, point<std::int64_t> const&);
+template closest_point_info closest_point(geometry_collection<std::int64_t> const&, point<std::int64_t> const&);
 
 }}}

Original file line number	Diff line number	Diff line change
`@@ -127,12 +127,14 @@ public :`
`127`	`127`	`if (c1 < zero)`
`128`	`128`	`{`
`129`	`129`	`result.distance = apply_point_point(p, p1);`
`130`		`- result.closest_point = p1;`
	`130`	`+ result.closest_point.x = p1.x;`
	`131`	`+ result.closest_point.y = p1.y;`
`131`	`132`	`}`
`132`	`133`	`else if(c1 > c2)`
`133`	`134`	`{`
`134`	`135`	`result.distance = apply_point_point(p, p2);`
`135`		`- result.closest_point = p2;`
	`136`	`+ result.closest_point.x = p2.x;`
	`137`	`+ result.closest_point.y = p2.y;`
`136`	`138`	`}`
`137`	`139`	`else`
`138`	`140`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ template <typename T>`
`11`	`11`	`struct closest_point`
`12`	`12`	`{`
`13`	`13`	`using coordinate_type = T;`
`14`		`- using info_type = boost::geometry::closest_point_result<mapbox::geometry::point<coordinate_type>>;`
`15`		`- using result_type = closest_point_info<coordinate_type>;`
	`14`	`+ using info_type = boost::geometry::closest_point_result<mapbox::geometry::point<double>>;`
	`15`	`+ using result_type = closest_point_info;`
`16`	`16`	`closest_point(mapbox::geometry::point<coordinate_type> const& pt)`
`17`	`17`	`: pt_(pt) {}`
`18`	`18`
`@@ -90,7 +90,7 @@ struct closest_point`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`template <typename T1, typename T2>`
`93`		`-auto closest_point(T1 const& geom, mapbox::geometry::point<T2> const& pt)->closest_point_info<T2>`
	`93`	`+closest_point_info closest_point(T1 const& geom, mapbox::geometry::point<T2> const& pt)`
`94`	`94`	`{`
`95`	`95`	`return detail::closest_point<T2>(pt)(geom);`
`96`	`96`	`}`