move geometry_adapters.hpp to geometry/boost_geometry_adapters.hpp

benchmark/test_polygon_clipping.cpp

@@ -10,7 +10,7 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/vertex_adapters.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_geometry_adapters.hpp>
 #include <mapnik/geometry_envelope.hpp>
 #include <mapnik/geometry_correct.hpp>
 #include <mapnik/geometry_is_empty.hpp>

include/mapnik/geometry_centroid.hpp

@@ -24,7 +24,7 @@
 #define MAPNIK_GEOMETRY_CENTROID_HPP
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_geometry_adapters.hpp>
 #include <boost/geometry/algorithms/centroid.hpp>
 #include <mapnik/geometry_is_empty.hpp>
 #include <mapnik/geometry_remove_empty.hpp>

include/mapnik/geometry_correct.hpp

@@ -24,7 +24,7 @@
 #define MAPNIK_GEOMETRY_CORRECT_HPP
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_geometry_adapters.hpp>
 #include <mapnik/util/variant.hpp>
 
 #pragma GCC diagnostic push

include/mapnik/geometry_is_simple.hpp

@@ -29,7 +29,7 @@
 #if BOOST_VERSION >= 105600
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_geometry_adapters.hpp>
 #include <boost/geometry/algorithms/is_simple.hpp>
 
 namespace mapnik { namespace geometry {

include/mapnik/geometry_is_valid.hpp

@@ -29,7 +29,7 @@
 #if BOOST_VERSION >= 105800
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_geometry_adapters.hpp>
 #include <boost/geometry/algorithms/is_valid.hpp>
 #include <boost/geometry/algorithms/validity_failure_type.hpp>
 

include/mapnik/geometry_strategy.hpp

@@ -23,7 +23,7 @@
 #ifndef MAPNIK_GEOMETRY_STRATEGY_HPP
 #define MAPNIK_GEOMETRY_STRATEGY_HPP
 
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_geometry_adapters.hpp>
 #include <mapnik/util/rounding_cast.hpp>
 
 namespace mapnik {

include/mapnik/geometry_transform.hpp

@@ -24,7 +24,7 @@
 #define MAPNIK_GEOMETRY_TRANSFORM_HPP
 
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_geometry_adapters.hpp>
 #include <boost/geometry/algorithms/transform.hpp>
 
 namespace mapnik { namespace geometry { namespace detail {

include/mapnik/json/topojson_grammar_impl.hpp

@@ -33,7 +33,7 @@
 BOOST_FUSION_ADAPT_STRUCT(
     mapnik::topojson::coordinate,
     (double, x)
-    (double, y)
+     (double, y)
     )
 
 BOOST_FUSION_ADAPT_STRUCT(

include/mapnik/json/topojson_utils.hpp

@@ -28,7 +28,7 @@
 #include <mapnik/unicode.hpp>
 #include <mapnik/json/topology.hpp>
 #include <mapnik/feature_factory.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_geometry_adapters.hpp>
 #include <mapnik/geometry_correct.hpp>
 
 namespace mapnik { namespace topojson {

plugins/input/csv/csv_datasource.cpp

@@ -38,7 +38,7 @@
 #include <mapnik/boolean.hpp>
 #include <mapnik/util/trim.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_geometry_adapters.hpp>
 #include <mapnik/util/geometry_to_ds_type.hpp>
 #include <mapnik/value_types.hpp>
 #include <mapnik/util/fs.hpp>

plugins/input/geojson/geojson_datasource.cpp

@@ -49,7 +49,7 @@
 #include <mapnik/util/file_io.hpp>
 #include <mapnik/util/geometry_to_ds_type.hpp>
 #include <mapnik/make_unique.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_geometry_adapters.hpp>
 #include <mapnik/json/feature_collection_grammar.hpp>
 #include <mapnik/json/extract_bounding_box_grammar_impl.hpp>
 #include <mapnik/util/fs.hpp>

plugins/input/topojson/topojson_datasource.cpp

@@ -33,7 +33,7 @@
 #include <mapnik/unicode.hpp>
 #include <mapnik/value_types.hpp>
 #include <mapnik/box2d.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_geometry_adapters.hpp>
 #include <mapnik/json/topojson_grammar.hpp>
 #include <mapnik/json/topojson_utils.hpp>
 #include <mapnik/util/variant.hpp>

test/unit/serialization/wkb_test.cpp

@@ -2,7 +2,7 @@
 // mapnik
 #include <mapnik/wkb.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/geometry_adapters.hpp>
+#include <mapnik/geometry/boost_geometry_adapters.hpp>
 #include <mapnik/geometry_is_empty.hpp>
 #include <mapnik/util/geometry_to_wkt.hpp>
 // bool