sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move geometry_adapters.hpp to geometry/boost_geometry_adapters.hpp

Browse source
This commit is contained in:
artemp 2016-04-11 15:14:52 +02:00
parent b24ade9a1c
commit caa03d78bd
14 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
benchmark/test_polygon_clipping.cpp
View file

@ -10,7 +10,7 @@
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/vertex_adapters.hpp> #include <mapnik/vertex_adapters.hpp>
#include <mapnik/geometry.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_envelope.hpp>
#include <mapnik/geometry_correct.hpp> #include <mapnik/geometry_correct.hpp>
#include <mapnik/geometry_is_empty.hpp> #include <mapnik/geometry_is_empty.hpp>

0
include/mapnik/geometry_adapters.hpp → include/mapnik/geometry/boost_geometry_adapters.hpp
View file

2
include/mapnik/geometry_centroid.hpp
View file

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

2
include/mapnik/geometry_correct.hpp
View file

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

2
include/mapnik/geometry_is_simple.hpp
View file

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

2
include/mapnik/geometry_is_valid.hpp
View file

@ -29,7 +29,7 @@
#if BOOST_VERSION >= 105800 #if BOOST_VERSION >= 105800
#include <mapnik/geometry.hpp> #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/is_valid.hpp>
#include <boost/geometry/algorithms/validity_failure_type.hpp> #include <boost/geometry/algorithms/validity_failure_type.hpp>

2
include/mapnik/geometry_strategy.hpp
View file

@ -23,7 +23,7 @@
#ifndef MAPNIK_GEOMETRY_STRATEGY_HPP #ifndef MAPNIK_GEOMETRY_STRATEGY_HPP
#define 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> #include <mapnik/util/rounding_cast.hpp>
namespace mapnik { namespace mapnik {

2
include/mapnik/geometry_transform.hpp
View file

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

2
include/mapnik/json/topojson_utils.hpp
View file

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

2
plugins/input/csv/csv_datasource.cpp
View file

@ -38,7 +38,7 @@
#include <mapnik/boolean.hpp> #include <mapnik/boolean.hpp>
#include <mapnik/util/trim.hpp> #include <mapnik/util/trim.hpp>
#include <mapnik/geometry.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/util/geometry_to_ds_type.hpp>
#include <mapnik/value_types.hpp> #include <mapnik/value_types.hpp>
#include <mapnik/util/fs.hpp> #include <mapnik/util/fs.hpp>

2
plugins/input/geojson/geojson_datasource.cpp
View file

@ -49,7 +49,7 @@
#include <mapnik/util/file_io.hpp> #include <mapnik/util/file_io.hpp>
#include <mapnik/util/geometry_to_ds_type.hpp> #include <mapnik/util/geometry_to_ds_type.hpp>
#include <mapnik/make_unique.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/feature_collection_grammar.hpp>
#include <mapnik/json/extract_bounding_box_grammar_impl.hpp> #include <mapnik/json/extract_bounding_box_grammar_impl.hpp>
#include <mapnik/util/fs.hpp> #include <mapnik/util/fs.hpp>

2
plugins/input/topojson/topojson_datasource.cpp
View file

@ -33,7 +33,7 @@
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>
#include <mapnik/value_types.hpp> #include <mapnik/value_types.hpp>
#include <mapnik/box2d.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_grammar.hpp>
#include <mapnik/json/topojson_utils.hpp> #include <mapnik/json/topojson_utils.hpp>
#include <mapnik/util/variant.hpp> #include <mapnik/util/variant.hpp>

2
test/unit/serialization/wkb_test.cpp
View file

@ -2,7 +2,7 @@
// mapnik // mapnik
#include <mapnik/wkb.hpp> #include <mapnik/wkb.hpp>
#include <mapnik/geometry.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/geometry_is_empty.hpp>
#include <mapnik/util/geometry_to_wkt.hpp> #include <mapnik/util/geometry_to_wkt.hpp>
// bool // bool