Move coordinate_type from geometry.hpp to geometry_int.hpp

This will help prevent accidental usage of integral geometry, which is required
by some algorithms but is usually a mistake to use.

Makefile.am

@@ -17,6 +17,7 @@ pcb2gcode_SOURCES = \
     eulerian_paths.cpp \
     exporter.hpp \
     geometry.hpp \
+    geometry_int.hpp \
     gerberimporter.hpp \
     gerberimporter.cpp \
     importer.hpp \
@@ -69,7 +70,7 @@ check_PROGRAMS = voronoi_tests eulerian_paths_tests segmentize_tests tsp_solver_
                  available_drills_tests gerberimporter_tests options_tests path_finding_tests \
                  autoleveller_tests
 voronoi_tests_SOURCES = voronoi.hpp voronoi.cpp voronoi_tests.cpp
-eulerian_paths_tests_SOURCES = eulerian_paths_tests.cpp
+eulerian_paths_tests_SOURCES = eulerian_paths_tests.cpp eulerian_paths.hpp geometry_int.hpp
 segmentize_tests_SOURCES = segmentize_tests.cpp segmentize.cpp segmentize.hpp
 path_finding_tests_SOURCES = path_finding_tests.cpp path_finding.cpp path_finding.hpp
 tsp_solver_tests_SOURCES = tsp_solver_tests.cpp tsp_solver.hpp

bg_helpers.hpp

@@ -188,17 +188,6 @@ static inline multi_polygon_type_fp buffer(polygon_type_fp const & geometry_in,
   return geometry_out;
 }
 
-template<typename CoordinateType>
-static inline void buffer(polygon_type const & geometry_in, multi_polygon_type_fp & geometry_out, CoordinateType expand_by) {
-  if (expand_by == 0) {
-    bg::convert(geometry_in, geometry_out);
-  } else {
-    polygon_type_fp geometry_in_fp;
-    bg::convert(geometry_in, geometry_in_fp);
-    buffer(geometry_in_fp, geometry_out, expand_by);
-  }
-}
-
 template<typename CoordinateType>
 static inline void buffer(multi_linestring_type_fp const & geometry_in, multi_polygon_type_fp & geometry_out, CoordinateType expand_by) {
   if (expand_by == 0) {

eulerian_paths.hpp

@@ -7,13 +7,6 @@
 #include "geometry.hpp"
 
 namespace eulerian_paths {
-static inline bool operator !=(const point_type& x, const point_type& y) {
-  return std::tie(x.x(), x.y()) != std::tie(y.x(), y.y());
-}
-
-static inline bool operator ==(const point_type& x, const point_type& y) {
-  return std::tie(x.x(), x.y()) == std::tie(y.x(), y.y());
-}
 
 static inline bool operator !=(const point_type_fp& x, const point_type_fp& y) {
   return std::tie(x.x(), x.y()) != std::tie(y.x(), y.y());

eulerian_paths_tests.cpp

@@ -2,8 +2,22 @@
 #include <boost/test/included/unit_test.hpp>
 
 #include <tuple>
+#include "geometry_int.hpp"
+
+namespace eulerian_paths {
+
+static inline bool operator !=(const point_type& x, const point_type& y) {
+  return std::tie(x.x(), x.y()) != std::tie(y.x(), y.y());
+}
+
+static inline bool operator ==(const point_type& x, const point_type& y) {
+  return std::tie(x.x(), x.y()) == std::tie(y.x(), y.y());
+}
+
+} // namespace eulerian_paths
 
 #include "eulerian_paths.hpp"
+#include "geometry_int.hpp"
 
 using std::vector;
 using namespace eulerian_paths;
@@ -44,9 +58,6 @@ BOOST_AUTO_TEST_CASE(window_pane) {
       {8,9},
       {1,4},
       {4,7},
-
-
-
       {2,5},
       {5,8},
       {3,6},

geometry.hpp

@@ -33,7 +33,6 @@
 // This one chooses the resolution of the output (viewBox).
 #define SVG_DOTS_PER_IN 2000
 
-typedef int64_t coordinate_type;
 typedef double coordinate_type_fp;
 typedef double ivalue_t;
 
@@ -48,16 +47,6 @@ BOOST_GEOMETRY_REGISTER_POINT_2D(icoordpair, ivalue_t, cs::cartesian, first, sec
 // Adaptation of icoords to Boost Geometry (ring)
 BOOST_GEOMETRY_REGISTER_RING(icoords)
 
-typedef boost::geometry::model::d2::point_xy<coordinate_type> point_type;
-typedef boost::geometry::model::multi_point<point_type> multi_point_type;
-typedef boost::geometry::model::segment<point_type> segment_type;
-typedef boost::geometry::model::ring<point_type> ring_type;
-typedef boost::geometry::model::box<point_type> box_type;
-typedef boost::geometry::model::linestring<point_type> linestring_type;
-typedef boost::geometry::model::multi_linestring<linestring_type> multi_linestring_type;
-typedef boost::geometry::model::polygon<point_type> polygon_type;
-typedef boost::geometry::model::multi_polygon<polygon_type> multi_polygon_type;
-
 typedef boost::geometry::model::d2::point_xy<coordinate_type_fp> point_type_fp;
 typedef boost::geometry::model::multi_point<point_type_fp> multi_point_type_fp;
 typedef boost::geometry::model::segment<point_type_fp> segment_type_fp;
@@ -70,9 +59,7 @@ typedef boost::geometry::model::multi_polygon<polygon_type_fp> multi_polygon_typ
 
 namespace bg = boost::geometry;
 
-typedef boost::polygon::point_data<coordinate_type> point_type_p;
 typedef boost::polygon::point_data<coordinate_type_fp> point_type_fp_p;
-typedef boost::polygon::segment_data<coordinate_type> segment_type_p;
 typedef boost::polygon::segment_data<coordinate_type_fp> segment_type_fp_p;
 
 #endif

geometry_int.hpp

@@ -0,0 +1,24 @@
+#ifndef GEOMETRY_INT_H
+#define GEOMETRY_INT_H
+
+#include <vector>
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/register/point.hpp>
+#include <boost/geometry/geometries/register/ring.hpp>
+#include <boost/polygon/polygon.hpp>
+
+typedef int64_t coordinate_type;
+typedef boost::geometry::model::d2::point_xy<coordinate_type> point_type;
+typedef boost::geometry::model::ring<point_type> ring_type;
+typedef boost::geometry::model::box<point_type> box_type;
+typedef boost::geometry::model::linestring<point_type> linestring_type;
+typedef boost::geometry::model::multi_linestring<linestring_type> multi_linestring_type;
+typedef boost::geometry::model::polygon<point_type> polygon_type;
+typedef boost::geometry::model::multi_polygon<polygon_type> multi_polygon_type;
+
+typedef boost::polygon::point_data<coordinate_type> point_type_p;
+typedef boost::polygon::segment_data<coordinate_type> segment_type_p;
+
+#endif

segmentize.cpp

@@ -1,7 +1,7 @@
 #include <vector>
 #include <map>
 
-#include "geometry.hpp"
+#include "geometry_int.hpp"
 #include <boost/polygon/isotropy.hpp>
 #include <boost/polygon/segment_concept.hpp>
 #include <boost/polygon/segment_utils.hpp>

segmentize.hpp

@@ -4,7 +4,7 @@
 #include <vector>
 #include <map>
 
-#include "geometry.hpp"
+#include "geometry_int.hpp"
 #include <boost/polygon/isotropy.hpp>
 #include <boost/polygon/segment_concept.hpp>
 #include <boost/polygon/segment_utils.hpp>

voronoi.hpp

@@ -26,6 +26,7 @@
 #include <memory>
 
 #include "geometry.hpp"
+#include "geometry_int.hpp"
 
 namespace boost { namespace polygon { namespace detail {