revert geometry changes for now - will develop them in branch to reduce downstream breakage

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/boost_geometry_adapters.hpp>
+#include <mapnik/geometry_adapters.hpp>
 #include <mapnik/geometry_envelope.hpp>
 #include <mapnik/geometry_correct.hpp>
 #include <mapnik/geometry_is_empty.hpp>

include/build.py

@@ -38,7 +38,6 @@ subdirs = [
     'text',
     'text/placements',
     'text/formatting',
-    'geometry',
     'markers_placements'
     ]
 

include/mapnik/geometry/boost_geometry_adapters.hpp

@@ -1,220 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-#ifndef MAPNIK_GEOMETRY_ADAPTERS_HPP
-#define MAPNIK_GEOMETRY_ADAPTERS_HPP
-
-#include <mapnik/config.hpp>
-
-// undef B0 to workaround https://svn.boost.org/trac/boost/ticket/10467
-#pragma GCC diagnostic push
-#include <mapnik/warning_ignore.hpp>
-#undef B0
-#include <boost/geometry/geometries/register/linestring.hpp>
-#include <boost/geometry/geometries/register/point.hpp>
-#include <boost/geometry/geometries/register/ring.hpp>
-// NOTE: ideally we would not include all of boost/geometry here to save on compile time
-// however we need to pull in <boost/geometry/multi/multi.hpp> for things to work
-// and once we do that the compile time is == to just including boost/geometry.hpp
-#include <boost/geometry.hpp>
-#pragma GCC diagnostic pop
-
-#include <mapnik/geometry.hpp>
-#include <mapnik/coord.hpp>
-#include <mapnik/box2d.hpp>
-
-#include <cstdint>
-
-// register point
-BOOST_GEOMETRY_REGISTER_POINT_2D (mapnik::geometry::point<double>, double, boost::geometry::cs::cartesian, x, y)
-BOOST_GEOMETRY_REGISTER_POINT_2D (mapnik::geometry::point<std::int64_t>, std::int64_t, boost::geometry::cs::cartesian, x, y)
-// ring
-BOOST_GEOMETRY_REGISTER_RING_TEMPLATED(mapnik::geometry::linear_ring)
-// needed by box2d<double>
-BOOST_GEOMETRY_REGISTER_POINT_2D(mapnik::coord2d, double, boost::geometry::cs::cartesian, x, y)
-
-namespace boost {
-
-template <typename CoordinateType>
-struct range_iterator<mapnik::geometry::line_string<CoordinateType> >
-{
-    using type = typename mapnik::geometry::line_string<CoordinateType>::iterator;
-};
-
-template <typename CoordinateType>
-struct range_const_iterator<mapnik::geometry::line_string<CoordinateType> >
-{
-    using type = typename mapnik::geometry::line_string<CoordinateType>::const_iterator;
-};
-
-template <typename CoordinateType>
-inline typename mapnik::geometry::line_string<CoordinateType>::iterator
-range_begin(mapnik::geometry::line_string<CoordinateType> & line) {return line.begin();}
-
-template <typename CoordinateType>
-inline typename mapnik::geometry::line_string<CoordinateType>::iterator
-range_end(mapnik::geometry::line_string<CoordinateType> & line) {return line.end();}
-
-template <typename CoordinateType>
-inline typename mapnik::geometry::line_string<CoordinateType>::const_iterator
-range_begin(mapnik::geometry::line_string<CoordinateType> const& line) {return line.begin();}
-
-template <typename CoordinateType>
-inline typename mapnik::geometry::line_string<CoordinateType>::const_iterator
-range_end(mapnik::geometry::line_string<CoordinateType> const& line) {return line.end();}
-
-namespace geometry { namespace traits {
-
-// register mapnik::box2d<double>
-template<> struct tag<mapnik::box2d<double> > { using type = box_tag; };
-template<> struct point_type<mapnik::box2d<double> > { using type = mapnik::coord2d; };
-
-template <>
-struct indexed_access<mapnik::box2d<double>, min_corner, 0>
-{
-    using ct = coordinate_type<mapnik::coord2d>::type;
-    static inline ct get(mapnik::box2d<double> const& b) { return b.minx();}
-    static inline void set(mapnik::box2d<double> &b, ct const& value) { b.set_minx(value); }
-};
-
-template <>
-struct indexed_access<mapnik::box2d<double>, min_corner, 1>
-{
-    using ct = coordinate_type<mapnik::coord2d>::type;
-    static inline ct get(mapnik::box2d<double> const& b) { return b.miny();}
-    static inline void set(mapnik::box2d<double> &b, ct const& value) { b.set_miny(value); }
-};
-
-template <>
-struct indexed_access<mapnik::box2d<double>, max_corner, 0>
-{
-    using ct = coordinate_type<mapnik::coord2d>::type;
-    static inline ct get(mapnik::box2d<double> const& b) { return b.maxx();}
-    static inline void set(mapnik::box2d<double> &b, ct const& value) { b.set_maxx(value); }
-};
-
-template <>
-struct indexed_access<mapnik::box2d<double>, max_corner, 1>
-{
-    using ct = coordinate_type<mapnik::coord2d>::type;
-    static inline ct get(mapnik::box2d<double> const& b) { return b.maxy();}
-    static inline void set(mapnik::box2d<double> &b , ct const& value) { b.set_maxy(value); }
-};
-
-// mapnik::geometry::line_string
-template<typename CoordinateType>
-struct tag<mapnik::geometry::line_string<CoordinateType> >
-{
-    using type = linestring_tag;
-};
-
-// mapnik::geometry::polygon
-template<typename CoordinateType>
-struct tag<mapnik::geometry::polygon<CoordinateType> >
-{
-    using type = polygon_tag;
-};
-
-template <typename CoordinateType>
-struct point_order<mapnik::geometry::linear_ring<CoordinateType> >
-{
-    static const order_selector value = counterclockwise;
-};
-
-template<typename CoordinateType>
-struct tag<mapnik::geometry::multi_point<CoordinateType> >
-{
-    using type = multi_point_tag;
-};
-
-template<typename CoordinateType>
-struct tag<mapnik::geometry::multi_line_string<CoordinateType> >
-{
-    using type = multi_linestring_tag;
-};
-
-template<typename CoordinateType>
-struct tag<mapnik::geometry::multi_polygon<CoordinateType> >
-{
-    using type = multi_polygon_tag;
-};
-
-// ring
-template <typename CoordinateType>
-struct ring_const_type<mapnik::geometry::polygon<CoordinateType> >
-{
-    using type = typename mapnik::geometry::linear_ring<CoordinateType> const&;
-};
-
-template <typename CoordinateType>
-struct ring_mutable_type<mapnik::geometry::polygon<CoordinateType> >
-{
-    using type = typename mapnik::geometry::linear_ring<CoordinateType>&;
-};
-
-// interior
-template <typename CoordinateType>
-struct interior_const_type<mapnik::geometry::polygon<CoordinateType> >
-{
-    using type = typename mapnik::geometry::polygon<CoordinateType>::rings_container const&;
-};
-
-template <typename CoordinateType>
-struct interior_mutable_type<mapnik::geometry::polygon<CoordinateType> >
-{
-    using type = typename mapnik::geometry::polygon<CoordinateType>::rings_container&;
-};
-
-// exterior
-template <typename CoordinateType>
-struct exterior_ring<mapnik::geometry::polygon<CoordinateType> >
-{
-    static mapnik::geometry::linear_ring<CoordinateType> & get(mapnik::geometry::polygon<CoordinateType> & p)
-    {
-        return p.exterior_ring;
-    }
-
-    static mapnik::geometry::linear_ring<CoordinateType> const& get(mapnik::geometry::polygon<CoordinateType> const& p)
-    {
-        return p.exterior_ring;
-    }
-};
-
-template <typename CoordinateType>
-struct interior_rings<mapnik::geometry::polygon<CoordinateType> >
-{
-    using holes_type = typename mapnik::geometry::polygon<CoordinateType>::rings_container;
-    static holes_type&  get(mapnik::geometry::polygon<CoordinateType> & p)
-    {
-        return p.interior_rings;
-    }
-
-    static holes_type const& get(mapnik::geometry::polygon<CoordinateType> const& p)
-    {
-        return p.interior_rings;
-    }
-};
-
-}}}
-
-
-#endif //MAPNIK_GEOMETRY_ADAPTERS_HPP

include/mapnik/geometry/fusion_adapted.hpp

@@ -1,52 +0,0 @@
-/*****************************************************************************
- *
- * This file is part of Mapnik (c++ mapping toolkit)
- *
- * Copyright (C) 2015 Artem Pavlenko
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- *****************************************************************************/
-
-
-#ifndef MAPNIK_GEOMETRY_FUSION_ADAPTED_HPP
-#define MAPNIK_GEOMETRY_FUSION_ADAPTED_HPP
-
-#include <mapnik/geometry.hpp>
-#include <boost/fusion/include/adapt_struct.hpp>
-
-BOOST_FUSION_ADAPT_STRUCT(
-    mapnik::geometry::point<double>,
-    (double, x)
-    (double, y)
-)
-
-BOOST_FUSION_ADAPT_STRUCT(
-    mapnik::geometry::point<std::int64_t>,
-    (std::int64_t, x)
-    (std::int64_t, y)
-)
-
-BOOST_FUSION_ADAPT_STRUCT(
-    mapnik::geometry::polygon<double>,
-    (mapnik::geometry::linear_ring<double> const&, exterior_ring)
-    (mapnik::geometry::polygon<double>::rings_container const& , interior_rings))
-
-BOOST_FUSION_ADAPT_STRUCT(
-    mapnik::geometry::polygon<std::int64_t>,
-    (mapnik::geometry::linear_ring<std::int64_t> const&, exterior_ring)
-    (mapnik::geometry::polygon<std::int64_t>::rings_container const& , interior_rings))
-
-#endif // MAPNIK_GEOMETRY_FUSION_ADAPTED_HPP

include/mapnik/geometry_centroid.hpp

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

include/mapnik/json/extract_bounding_box_grammar_impl.hpp

@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/json/extract_bounding_box_grammar.hpp>
-#include <mapnik/geometry/fusion_adapted.hpp>
+#include <mapnik/geometry_fusion_adapted.hpp>
 // boost
 #include <boost/spirit/include/qi_omit.hpp>
 #include <boost/spirit/include/phoenix_object.hpp>

include/mapnik/json/geometry_generator_grammar_impl.hpp

@@ -24,7 +24,7 @@
 #include <mapnik/json/geometry_generator_grammar.hpp>
 #include <mapnik/util/spirit_transform_attribute.hpp>
 #include <mapnik/geometry_types.hpp>
-#include <mapnik/geometry/fusion_adapted.hpp>
+#include <mapnik/geometry_fusion_adapted.hpp>
 
 // boost
 #pragma GCC diagnostic push

include/mapnik/json/geometry_grammar_impl.hpp

@@ -24,7 +24,7 @@
 #include <mapnik/config.hpp>
 #include <mapnik/json/error_handler.hpp>
 #include <mapnik/json/geometry_grammar.hpp>
-#include <mapnik/geometry/fusion_adapted.hpp>
+#include <mapnik/geometry_fusion_adapted.hpp>
 // boost
 #include <boost/spirit/include/phoenix_stl.hpp>
 #include <boost/spirit/include/phoenix_function.hpp>

include/mapnik/json/positions_grammar_impl.hpp

@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/json/positions_grammar.hpp>
-#include <mapnik/geometry/fusion_adapted.hpp>
+#include <mapnik/geometry_fusion_adapted.hpp>
 // boost
 #include <boost/spirit/include/qi_omit.hpp>
 #include <boost/spirit/include/phoenix_object.hpp>

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/boost_geometry_adapters.hpp>
+#include <mapnik/geometry_adapters.hpp>
 #include <mapnik/geometry_correct.hpp>
 
 namespace mapnik { namespace topojson {

include/mapnik/wkt/wkt_generator_grammar_impl.hpp

@@ -23,7 +23,7 @@
 // mapnik
 #include <mapnik/wkt/wkt_generator_grammar.hpp>
 #include <mapnik/util/spirit_transform_attribute.hpp>
-#include <mapnik/geometry/fusion_adapted.hpp>
+#include <mapnik/geometry_fusion_adapted.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>

include/mapnik/wkt/wkt_grammar_impl.hpp

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #include <mapnik/wkt/wkt_grammar.hpp>
-#include <mapnik/geometry/fusion_adapted.hpp>
+#include <mapnik/geometry_fusion_adapted.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>

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/boost_geometry_adapters.hpp>
+#include <mapnik/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/boost_geometry_adapters.hpp>
+#include <mapnik/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/boost_geometry_adapters.hpp>
+#include <mapnik/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/boost_geometry_adapters.hpp>
+#include <mapnik/geometry_adapters.hpp>
 #include <mapnik/geometry_is_empty.hpp>
 #include <mapnik/util/geometry_to_wkt.hpp>
 // bool