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

refactor souce code files with the following rule: the physical filesytem path matches namespace structure

Browse source 
e.g `mapnik::geometry::centroid()` -> `$(MAPNIK_SOURCE)/include/mapnik/geometry/centroid.hpp`
This commit is contained in:
artemp 2016-08-02 14:43:02 +01:00
parent d6a3be87a4
commit 8ce7a1c43d
84 changed files with 142 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
benchmark/test_polygon_clipping.cpp
View file

@ -10,10 +10,10 @@
#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_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>
#include <mapnik/image_util.hpp> #include <mapnik/image_util.hpp>
#include <mapnik/color.hpp> #include <mapnik/color.hpp>
// boost geometry // boost geometry

2
include/mapnik/feature.hpp
View file

@ -29,7 +29,7 @@
#include <mapnik/value.hpp> #include <mapnik/value.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/box2d.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_envelope.hpp> #include <mapnik/geometry/envelope.hpp>
// //
#include <mapnik/feature_kv_iterator.hpp> #include <mapnik/feature_kv_iterator.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>

2
include/mapnik/geom_util.hpp
View file

@ -27,7 +27,7 @@
#include <mapnik/box2d.hpp> #include <mapnik/box2d.hpp>
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/vertex.hpp> #include <mapnik/vertex.hpp>
#include <mapnik/geometry_types.hpp> #include <mapnik/geometry/geometry_types.hpp>
// stl // stl
#include <cmath> #include <cmath>
#include <vector> #include <vector>

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

6
include/mapnik/geometry_centroid.hpp → include/mapnik/geometry/centroid.hpp
View file

@ -24,10 +24,10 @@
#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_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>
namespace mapnik { namespace geometry { namespace mapnik { namespace geometry {

2
include/mapnik/geometry_correct.hpp → 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_adapters.hpp>
#include <mapnik/util/variant.hpp> #include <mapnik/util/variant.hpp>
#pragma GCC diagnostic push #pragma GCC diagnostic push

0
include/mapnik/geometry_envelope.hpp → include/mapnik/geometry/envelope.hpp
View file

2
include/mapnik/geometry_envelope_impl.hpp → include/mapnik/geometry/envelope_impl.hpp
View file

@ -20,7 +20,7 @@
* *
*****************************************************************************/ *****************************************************************************/
#include <mapnik/geometry_envelope.hpp> #include <mapnik/geometry/envelope.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/box2d.hpp>

0
include/mapnik/geometry_fusion_adapted.hpp → include/mapnik/geometry/fusion_adapted.hpp
View file

2
include/mapnik/geometry_type.hpp → include/mapnik/geometry/geometry_type.hpp
View file

@ -25,7 +25,7 @@
// mapnik // mapnik
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_types.hpp> #include <mapnik/geometry/geometry_types.hpp>
namespace mapnik { namespace geometry { namespace detail { namespace mapnik { namespace geometry { namespace detail {

0
include/mapnik/geometry_types.hpp → include/mapnik/geometry/geometry_types.hpp
View file

0
include/mapnik/geometry_is_empty.hpp → include/mapnik/geometry/is_empty.hpp
View file

2
include/mapnik/geometry_is_simple.hpp → 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_adapters.hpp>
#include <boost/geometry/algorithms/is_simple.hpp> #include <boost/geometry/algorithms/is_simple.hpp>
namespace mapnik { namespace geometry { namespace mapnik { namespace geometry {

10
include/mapnik/geometry_is_valid.hpp → 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_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>
@ -102,7 +102,7 @@ struct geometry_is_valid
struct geometry_is_valid_reason struct geometry_is_valid_reason
{ {
using result_type = bool; using result_type = bool;
boost::geometry::validity_failure_type & failure_; boost::geometry::validity_failure_type & failure_;
geometry_is_valid_reason(boost::geometry::validity_failure_type & failure): geometry_is_valid_reason(boost::geometry::validity_failure_type & failure):
@ -170,7 +170,7 @@ struct geometry_is_valid_reason
struct geometry_is_valid_string struct geometry_is_valid_string
{ {
using result_type = bool; using result_type = bool;
std::string & message_; std::string & message_;
geometry_is_valid_string(std::string & message): geometry_is_valid_string(std::string & message):
@ -257,7 +257,7 @@ inline bool is_valid(T const& geom, boost::geometry::validity_failure_type & fai
} }
template <typename T> template <typename T>
inline bool is_valid(mapnik::geometry::geometry<T> const& geom, inline bool is_valid(mapnik::geometry::geometry<T> const& geom,
boost::geometry::validity_failure_type & failure) boost::geometry::validity_failure_type & failure)
{ {
return util::apply_visitor(detail::geometry_is_valid_reason(failure), geom); return util::apply_visitor(detail::geometry_is_valid_reason(failure), geom);
@ -270,7 +270,7 @@ inline bool is_valid(T const& geom, std::string & message)
} }
template <typename T> template <typename T>
inline bool is_valid(mapnik::geometry::geometry<T> const& geom, inline bool is_valid(mapnik::geometry::geometry<T> const& geom,
std::string & message) std::string & message)
{ {
return util::apply_visitor(detail::geometry_is_valid_string(message), geom); return util::apply_visitor(detail::geometry_is_valid_string(message), geom);

2
include/mapnik/geometry_remove_empty.hpp → include/mapnik/geometry/remove_empty.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_GEOMETRY_REMOVE_EMPTY_HPP #define MAPNIK_GEOMETRY_REMOVE_EMPTY_HPP
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_is_empty.hpp> #include <mapnik/geometry/is_empty.hpp>
namespace mapnik { namespace geometry { namespace mapnik { namespace geometry {

0
include/mapnik/geometry_reprojection.hpp → include/mapnik/geometry/reprojection.hpp
View file

2
include/mapnik/geometry_reprojection_impl.hpp → include/mapnik/geometry/reprojection_impl.hpp
View file

@ -21,7 +21,7 @@
*****************************************************************************/ *****************************************************************************/
// mapnik // mapnik
#include <mapnik/geometry_reprojection.hpp> #include <mapnik/geometry/reprojection.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
namespace mapnik { namespace mapnik {

30
include/mapnik/geometry_strategy.hpp → include/mapnik/geometry/strategy.hpp
View file

@ -23,20 +23,20 @@
#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_adapters.hpp>
#include <mapnik/util/rounding_cast.hpp> #include <mapnik/util/rounding_cast.hpp>
namespace mapnik { namespace mapnik {
namespace geometry { namespace geometry {
namespace helper namespace helper
{ {
template <std::size_t... Ts> template <std::size_t... Ts>
struct index {}; struct index {};
template <std::size_t N, std::size_t... Ts> template <std::size_t N, std::size_t... Ts>
struct gen_seq : gen_seq<N - 1, N - 1, Ts...> {}; struct gen_seq : gen_seq<N - 1, N - 1, Ts...> {};
template <std::size_t... Ts> template <std::size_t... Ts>
struct gen_seq<0, Ts...> : index<Ts...> {}; struct gen_seq<0, Ts...> : index<Ts...> {};
} }
@ -70,7 +70,7 @@ struct strategy_group
template <typename P1, typename P2, typename T, typename ...Args> template <typename P1, typename P2, typename T, typename ...Args>
inline P2 execute(P1 const& p, bool & status, T const& strat, Args const& ... args) const inline P2 execute(P1 const& p, bool & status, T const& strat, Args const& ... args) const
{ {
return execute<P1,P2>(strat.template execute<P1,P1>(p, status), status, args...); return execute<P1,P2>(strat.template execute<P1,P1>(p, status), status, args...);
} }
@ -79,7 +79,7 @@ struct strategy_group
{ {
return strat.template execute<P1,P2>(p, status); return strat.template execute<P1,P2>(p, status);
} }
private: private:
std::tuple<Strategies const& ...> ops_; std::tuple<Strategies const& ...> ops_;
@ -87,7 +87,7 @@ private:
// The difference between this strategy group and the previous is that the conversion from P1 to P2 happens // The difference between this strategy group and the previous is that the conversion from P1 to P2 happens
// in the first strategy rather then the last strategy. // in the first strategy rather then the last strategy.
template <typename... Strategies> template <typename... Strategies>
struct strategy_group_first struct strategy_group_first
{ {
@ -116,13 +116,13 @@ struct strategy_group_first
template <typename P1, typename P2, typename T, typename ...Args> template <typename P1, typename P2, typename T, typename ...Args>
inline P2 execute_first(P1 const& p, bool & status, T const& strat, Args const& ... args) const inline P2 execute_first(P1 const& p, bool & status, T const& strat, Args const& ... args) const
{ {
return execute<P2>(strat.template execute<P1,P2>(p, status), status, args...); return execute<P2>(strat.template execute<P1,P2>(p, status), status, args...);
} }
template <typename P2, typename T, typename ...Args> template <typename P2, typename T, typename ...Args>
inline P2 execute(P2 const& p, bool & status, T const& strat, Args const& ... args) const inline P2 execute(P2 const& p, bool & status, T const& strat, Args const& ... args) const
{ {
return execute<P2>(strat.template execute<P2,P2>(p, status), status, args...); return execute<P2>(strat.template execute<P2,P2>(p, status), status, args...);
} }
@ -131,13 +131,13 @@ struct strategy_group_first
{ {
return strat.template execute<P2,P2>(p, status); return strat.template execute<P2,P2>(p, status);
} }
template <typename P2> template <typename P2>
inline P2 execute(P2 const& p, bool & status) const inline P2 execute(P2 const& p, bool & status) const
{ {
return p; return p;
} }
private: private:
std::tuple<Strategies const& ...> ops_; std::tuple<Strategies const& ...> ops_;
@ -151,7 +151,7 @@ struct scale_strategy
template <typename P1, typename P2> template <typename P1, typename P2>
inline bool apply(P1 const & p1, P2 & p2) const inline bool apply(P1 const & p1, P2 & p2) const
{ {
using p2_type = typename boost::geometry::coordinate_type<P2>::type; using p2_type = typename boost::geometry::coordinate_type<P2>::type;
double x = (boost::geometry::get<0>(p1) * scale_) + offset_; double x = (boost::geometry::get<0>(p1) * scale_) + offset_;
double y = (boost::geometry::get<1>(p1) * scale_) + offset_; double y = (boost::geometry::get<1>(p1) * scale_) + offset_;
@ -159,7 +159,7 @@ struct scale_strategy
boost::geometry::set<1>(p2, static_cast<p2_type>(y)); boost::geometry::set<1>(p2, static_cast<p2_type>(y));
return true; return true;
} }
template <typename P1, typename P2> template <typename P1, typename P2>
inline P2 execute(P1 const& p1, bool & status) const inline P2 execute(P1 const& p1, bool & status) const
{ {
@ -181,7 +181,7 @@ struct scale_rounding_strategy
template <typename P1, typename P2> template <typename P1, typename P2>
inline bool apply(P1 const & p1, P2 & p2) const inline bool apply(P1 const & p1, P2 & p2) const
{ {
using p2_type = typename boost::geometry::coordinate_type<P2>::type; using p2_type = typename boost::geometry::coordinate_type<P2>::type;
double x = (boost::geometry::get<0>(p1) * scale_) + offset_; double x = (boost::geometry::get<0>(p1) * scale_) + offset_;
double y = (boost::geometry::get<1>(p1) * scale_) + offset_; double y = (boost::geometry::get<1>(p1) * scale_) + offset_;
@ -189,7 +189,7 @@ struct scale_rounding_strategy
boost::geometry::set<1>(p2, static_cast<p2_type>(std::round(y))); boost::geometry::set<1>(p2, static_cast<p2_type>(std::round(y)));
return true; return true;
} }
template <typename P1, typename P2> template <typename P1, typename P2>
inline P2 execute(P1 const& p1, bool & status) const inline P2 execute(P1 const& p1, bool & status) const
{ {

2
include/mapnik/geometry_transform.hpp → 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_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/extract_bounding_box_grammar_impl.hpp
View file

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

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

@ -26,7 +26,7 @@
// mapnik // mapnik
#include <mapnik/global.hpp> #include <mapnik/global.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_type.hpp> #include <mapnik/geometry/geometry_type.hpp>
// boost // boost
#pragma GCC diagnostic push #pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>

4
include/mapnik/json/geometry_generator_grammar_impl.hpp
View file

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

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

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

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

@ -24,7 +24,7 @@
#define MAPNIK_JSON_GEOMETRY_UTIL_HPP #define MAPNIK_JSON_GEOMETRY_UTIL_HPP
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_correct.hpp> #include <mapnik/geometry/correct.hpp>
#include <mapnik/json/positions.hpp> #include <mapnik/json/positions.hpp>
namespace mapnik { namespace json { namespace mapnik { namespace json {

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

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

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

@ -29,8 +29,8 @@
#include <mapnik/json/topology.hpp> #include <mapnik/json/topology.hpp>
#include <mapnik/json/attribute_value_visitor.hpp> #include <mapnik/json/attribute_value_visitor.hpp>
#include <mapnik/feature_factory.hpp> #include <mapnik/feature_factory.hpp>
#include <mapnik/geometry_adapters.hpp> #include <mapnik/geometry/boost_adapters.hpp>
#include <mapnik/geometry_correct.hpp> #include <mapnik/geometry/correct.hpp>
namespace mapnik { namespace topojson { namespace mapnik { namespace topojson {

4
include/mapnik/marker_helpers.hpp
View file

@ -25,8 +25,8 @@
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_type.hpp> #include <mapnik/geometry/geometry_type.hpp>
#include <mapnik/geometry_centroid.hpp> #include <mapnik/geometry/centroid.hpp>
#include <mapnik/symbolizer.hpp> #include <mapnik/symbolizer.hpp>
#include <mapnik/svg/svg_path_attributes.hpp> #include <mapnik/svg/svg_path_attributes.hpp>
#include <mapnik/marker.hpp> // for svg_storage_type #include <mapnik/marker.hpp> // for svg_storage_type

2
include/mapnik/markers_placements/interior.hpp
View file

@ -25,7 +25,7 @@
#include <mapnik/markers_placements/point.hpp> #include <mapnik/markers_placements/point.hpp>
#include <mapnik/geom_util.hpp> #include <mapnik/geom_util.hpp>
#include <mapnik/geometry_types.hpp> #include <mapnik/geometry/geometry_types.hpp>
namespace mapnik { namespace mapnik {

2
include/mapnik/markers_placements/line.hpp
View file

@ -27,7 +27,7 @@
#include <mapnik/view_transform.hpp> #include <mapnik/view_transform.hpp>
#include <mapnik/vertex_cache.hpp> #include <mapnik/vertex_cache.hpp>
#include <mapnik/tolerance_iterator.hpp> #include <mapnik/tolerance_iterator.hpp>
#include <mapnik/geometry_types.hpp> #include <mapnik/geometry/geometry_types.hpp>
namespace mapnik { namespace mapnik {

2
include/mapnik/markers_placements/point.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_MARKERS_PLACEMENTS_POINT_HPP #define MAPNIK_MARKERS_PLACEMENTS_POINT_HPP
#include <mapnik/geom_util.hpp> #include <mapnik/geom_util.hpp>
#include <mapnik/geometry_types.hpp> #include <mapnik/geometry/geometry_types.hpp>
#include <mapnik/markers_placements/basic.hpp> #include <mapnik/markers_placements/basic.hpp>
namespace mapnik { namespace mapnik {

2
include/mapnik/memory_featureset.hpp
View file

@ -26,7 +26,7 @@
// mapnik // mapnik
#include <mapnik/box2d.hpp> #include <mapnik/box2d.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_envelope.hpp> #include <mapnik/geometry/envelope.hpp>
#include <mapnik/featureset.hpp> #include <mapnik/featureset.hpp>
#include <mapnik/datasource.hpp> #include <mapnik/datasource.hpp>
#include <mapnik/memory_datasource.hpp> #include <mapnik/memory_datasource.hpp>

6
include/mapnik/renderer_common/process_point_symbolizer.hpp
View file

@ -29,9 +29,9 @@
#include <mapnik/marker.hpp> #include <mapnik/marker.hpp>
#include <mapnik/marker_cache.hpp> #include <mapnik/marker_cache.hpp>
#include <mapnik/label_collision_detector.hpp> #include <mapnik/label_collision_detector.hpp>
#include <mapnik/geometry_centroid.hpp> #include <mapnik/geometry/centroid.hpp>
#include <mapnik/geometry_type.hpp> #include <mapnik/geometry/geometry_type.hpp>
#include <mapnik/geometry_types.hpp> #include <mapnik/geometry/geometry_types.hpp>
#include <mapnik/vertex_adapters.hpp> #include <mapnik/vertex_adapters.hpp>
#include <mapnik/geom_util.hpp> #include <mapnik/geom_util.hpp>

2
include/mapnik/svg/geometry_svg_generator_impl.hpp
View file

@ -21,7 +21,7 @@
*****************************************************************************/ *****************************************************************************/
// mapnik // mapnik
#include <mapnik/geometry_types.hpp> #include <mapnik/geometry/geometry_types.hpp>
#include <mapnik/svg/geometry_svg_generator.hpp> #include <mapnik/svg/geometry_svg_generator.hpp>
namespace mapnik { namespace svg { namespace mapnik { namespace svg {

2
include/mapnik/util/geometry_to_wkb.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/make_unique.hpp> #include <mapnik/make_unique.hpp>
#include <mapnik/wkb.hpp> #include <mapnik/wkb.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_type.hpp> #include <mapnik/geometry/geometry_type.hpp>
// stl // stl
#include <sstream> #include <sstream>

2
include/mapnik/vertex_adapters.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_VERTEX_ADAPTERS_HPP #define MAPNIK_VERTEX_ADAPTERS_HPP
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_types.hpp> #include <mapnik/geometry/geometry_types.hpp>
#include <mapnik/vertex.hpp> #include <mapnik/vertex.hpp>
namespace mapnik { namespace geometry { namespace mapnik { namespace geometry {

2
include/mapnik/wkt/wkt_generator_grammar.hpp
View file

@ -26,7 +26,7 @@
// mapnik // mapnik
#include <mapnik/global.hpp> #include <mapnik/global.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_type.hpp> #include <mapnik/geometry/geometry_type.hpp>
#pragma GCC diagnostic push #pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>

2
include/mapnik/wkt/wkt_generator_grammar_impl.hpp
View file

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

2
include/mapnik/wkt/wkt_grammar_impl.hpp
View file

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

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_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/csv/csv_utils.cpp
View file

@ -23,7 +23,7 @@
// mapnik // mapnik
#include <mapnik/debug.hpp> #include <mapnik/debug.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_correct.hpp> #include <mapnik/geometry/correct.hpp>
#include <mapnik/wkt/wkt_factory.hpp> #include <mapnik/wkt/wkt_factory.hpp>
#include <mapnik/json/geometry_parser.hpp> #include <mapnik/json/geometry_parser.hpp>
#include <mapnik/util/conversions.hpp> #include <mapnik/util/conversions.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_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/geojson/geojson_index_featureset.cpp
View file

@ -27,7 +27,7 @@
#include <mapnik/json/feature_grammar.hpp> #include <mapnik/json/feature_grammar.hpp>
#include <mapnik/util/utf_conv_win.hpp> #include <mapnik/util/utf_conv_win.hpp>
#include <mapnik/util/spatial_index.hpp> #include <mapnik/util/spatial_index.hpp>
#include <mapnik/geometry_is_empty.hpp> #include <mapnik/geometry/is_empty.hpp>
// stl // stl
#include <string> #include <string>
#include <vector> #include <vector>

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

@ -25,7 +25,7 @@
#include <mapnik/feature_factory.hpp> #include <mapnik/feature_factory.hpp>
#include <mapnik/json/feature_grammar.hpp> #include <mapnik/json/feature_grammar.hpp>
#include <mapnik/util/utf_conv_win.hpp> #include <mapnik/util/utf_conv_win.hpp>
#include <mapnik/geometry_is_empty.hpp> #include <mapnik/geometry/is_empty.hpp>
// stl // stl
#include <string> #include <string>
#include <vector> #include <vector>

2
plugins/input/ogr/ogr_featureset.cpp
View file

@ -31,7 +31,7 @@
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>
#include <mapnik/value_types.hpp> #include <mapnik/value_types.hpp>
#include <mapnik/feature_factory.hpp> #include <mapnik/feature_factory.hpp>
#include <mapnik/geometry_correct.hpp> #include <mapnik/geometry/correct.hpp>
// ogr // ogr
#include "ogr_featureset.hpp" #include "ogr_featureset.hpp"

2
plugins/input/ogr/ogr_index_featureset.cpp
View file

@ -30,7 +30,7 @@
#include <mapnik/wkb.hpp> #include <mapnik/wkb.hpp>
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>
#include <mapnik/feature_factory.hpp> #include <mapnik/feature_factory.hpp>
#include <mapnik/geometry_correct.hpp> #include <mapnik/geometry/correct.hpp>
// boost // boost
#if defined(MAPNIK_MEMORY_MAPPED_FILE) #if defined(MAPNIK_MEMORY_MAPPED_FILE)

2
plugins/input/shape/shape_io.cpp
View file

@ -27,7 +27,7 @@
#include <mapnik/make_unique.hpp> #include <mapnik/make_unique.hpp>
#include <mapnik/datasource.hpp> #include <mapnik/datasource.hpp>
#include <mapnik/util/is_clockwise.hpp> #include <mapnik/util/is_clockwise.hpp>
#include <mapnik/geometry_correct.hpp> #include <mapnik/geometry/correct.hpp>
using mapnik::datasource_exception; using mapnik::datasource_exception;
const std::string shape_io::SHP = ".shp"; const std::string shape_io::SHP = ".shp";

2
plugins/input/sqlite/sqlite_datasource.cpp
View file

@ -34,7 +34,7 @@
#include <mapnik/wkb.hpp> #include <mapnik/wkb.hpp>
#include <mapnik/util/trim.hpp> #include <mapnik/util/trim.hpp>
#include <mapnik/util/fs.hpp> #include <mapnik/util/fs.hpp>
#include <mapnik/geometry_is_empty.hpp> #include <mapnik/geometry/is_empty.hpp>
// boost // boost
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>

4
plugins/input/sqlite/sqlite_featureset.cpp
View file

@ -30,8 +30,8 @@
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>
#include <mapnik/value_types.hpp> #include <mapnik/value_types.hpp>
#include <mapnik/feature_factory.hpp> #include <mapnik/feature_factory.hpp>
#include <mapnik/geometry_is_empty.hpp> #include <mapnik/geometry/is_empty.hpp>
#include <mapnik/geometry_envelope.hpp> #include <mapnik/geometry/envelope.hpp>
// ogr // ogr
#include "sqlite_featureset.hpp" #include "sqlite_featureset.hpp"

4
plugins/input/sqlite/sqlite_utils.hpp
View file

@ -35,8 +35,8 @@
#include <mapnik/params.hpp> #include <mapnik/params.hpp>
#include <mapnik/sql_utils.hpp> #include <mapnik/sql_utils.hpp>
#include <mapnik/util/fs.hpp> #include <mapnik/util/fs.hpp>
#include <mapnik/geometry_is_empty.hpp> #include <mapnik/geometry/is_empty.hpp>
#include <mapnik/geometry_envelope.hpp> #include <mapnik/geometry/envelope.hpp>
#pragma GCC diagnostic push #pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.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_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
src/agg/process_line_symbolizer.cpp
View file

@ -31,7 +31,7 @@
#include <mapnik/vertex_processor.hpp> #include <mapnik/vertex_processor.hpp>
#include <mapnik/renderer_common/clipping_extent.hpp> #include <mapnik/renderer_common/clipping_extent.hpp>
#include <mapnik/renderer_common/apply_vertex_converter.hpp> #include <mapnik/renderer_common/apply_vertex_converter.hpp>
#include <mapnik/geometry_type.hpp> #include <mapnik/geometry/geometry_type.hpp>
#pragma GCC diagnostic push #pragma GCC diagnostic push
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>

4
src/build.py
View file

@ -168,7 +168,8 @@ source = Split(
datasource_cache.cpp datasource_cache.cpp
datasource_cache_static.cpp datasource_cache_static.cpp
debug.cpp debug.cpp
geometry_reprojection.cpp geometry/reprojection.cpp
geometry/envelope.cpp
expression_node.cpp expression_node.cpp
expression_string.cpp expression_string.cpp
expression.cpp expression.cpp
@ -200,7 +201,6 @@ source = Split(
palette.cpp palette.cpp
marker_helpers.cpp marker_helpers.cpp
transform_expression_grammar.cpp transform_expression_grammar.cpp
geometry_envelope.cpp
plugin.cpp plugin.cpp
rule.cpp rule.cpp
save_map.cpp save_map.cpp

2
src/cairo/process_line_symbolizer.cpp
View file

@ -29,7 +29,7 @@
#include <mapnik/vertex_converters.hpp> #include <mapnik/vertex_converters.hpp>
#include <mapnik/vertex_processor.hpp> #include <mapnik/vertex_processor.hpp>
#include <mapnik/renderer_common/apply_vertex_converter.hpp> #include <mapnik/renderer_common/apply_vertex_converter.hpp>
#include <mapnik/geometry_type.hpp> #include <mapnik/geometry/geometry_type.hpp>
namespace mapnik namespace mapnik
{ {

4
src/geometry_envelope.cpp → src/geometry/envelope.cpp
View file

@ -20,8 +20,8 @@
* *
*****************************************************************************/ *****************************************************************************/
#include <mapnik/geometry_envelope.hpp> #include <mapnik/geometry/envelope.hpp>
#include <mapnik/geometry_envelope_impl.hpp> #include <mapnik/geometry/envelope_impl.hpp>
#include <mapnik/text/symbolizer_helpers.hpp> #include <mapnik/text/symbolizer_helpers.hpp>
namespace mapnik { namespace geometry { namespace mapnik { namespace geometry {

4
src/geometry_reprojection.cpp → src/geometry/reprojection.cpp
View file

@ -21,8 +21,8 @@
*****************************************************************************/ *****************************************************************************/
// mapnik // mapnik
#include <mapnik/geometry_reprojection.hpp> #include <mapnik/geometry/reprojection.hpp>
#include <mapnik/geometry_reprojection_impl.hpp> #include <mapnik/geometry/reprojection_impl.hpp>
namespace mapnik { namespace mapnik {

2
src/grid/process_line_symbolizer.cpp
View file

@ -31,7 +31,7 @@
#include <mapnik/vertex_converters.hpp> #include <mapnik/vertex_converters.hpp>
#include <mapnik/vertex_processor.hpp> #include <mapnik/vertex_processor.hpp>
#include <mapnik/renderer_common/apply_vertex_converter.hpp> #include <mapnik/renderer_common/apply_vertex_converter.hpp>
#include <mapnik/geometry_type.hpp> #include <mapnik/geometry/geometry_type.hpp>
#pragma GCC diagnostic push #pragma GCC diagnostic push
#include <mapnik/warning_ignore_agg.hpp> #include <mapnik/warning_ignore_agg.hpp>

4
src/memory_datasource.cpp
View file

@ -27,7 +27,7 @@
#include <mapnik/memory_datasource.hpp> #include <mapnik/memory_datasource.hpp>
#include <mapnik/memory_featureset.hpp> #include <mapnik/memory_featureset.hpp>
#include <mapnik/boolean.hpp> #include <mapnik/boolean.hpp>
#include <mapnik/geometry_envelope.hpp> #include <mapnik/geometry/envelope.hpp>
// stl // stl
#include <algorithm> #include <algorithm>
@ -95,7 +95,7 @@ void memory_datasource::push(feature_ptr feature)
throw std::runtime_error("Can not add a raster feature to a memory datasource that contains vectors"); throw std::runtime_error("Can not add a raster feature to a memory datasource that contains vectors");
} }
} }
else else
{ {
if (!type_set_) if (!type_set_)
{ {

2
src/renderer_common/render_markers_symbolizer.cpp
View file

@ -25,7 +25,7 @@
#include <mapnik/svg/svg_path_adapter.hpp> #include <mapnik/svg/svg_path_adapter.hpp>
#include <mapnik/marker_cache.hpp> #include <mapnik/marker_cache.hpp>
#include <mapnik/marker_helpers.hpp> #include <mapnik/marker_helpers.hpp>
#include <mapnik/geometry_type.hpp> #include <mapnik/geometry/geometry_type.hpp>
#include <mapnik/renderer_common/render_markers_symbolizer.hpp> #include <mapnik/renderer_common/render_markers_symbolizer.hpp>
#include <mapnik/symbolizer.hpp> #include <mapnik/symbolizer.hpp>

2
src/svg/output/process_symbolizers.cpp
View file

@ -32,7 +32,7 @@
#include <mapnik/svg/output/svg_output_attributes.hpp> #include <mapnik/svg/output/svg_output_attributes.hpp>
#include <mapnik/symbolizer_dispatch.hpp> #include <mapnik/symbolizer_dispatch.hpp>
#include <mapnik/vertex_processor.hpp> #include <mapnik/vertex_processor.hpp>
#include <mapnik/geometry_transform.hpp> #include <mapnik/geometry/transform.hpp>
#include <mapnik/geometry_to_path.hpp> #include <mapnik/geometry_to_path.hpp>
#include <mapnik/util/geometry_to_ds_type.hpp> #include <mapnik/util/geometry_to_ds_type.hpp>
#include <mapnik/safe_cast.hpp> #include <mapnik/safe_cast.hpp>

4
src/text/symbolizer_helpers.cpp
View file

@ -29,8 +29,8 @@
#include <mapnik/marker.hpp> #include <mapnik/marker.hpp>
#include <mapnik/marker_cache.hpp> #include <mapnik/marker_cache.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_type.hpp> #include <mapnik/geometry/geometry_type.hpp>
#include <mapnik/geometry_centroid.hpp> #include <mapnik/geometry/centroid.hpp>
#include <mapnik/vertex_processor.hpp> #include <mapnik/vertex_processor.hpp>
#include <mapnik/geom_util.hpp> #include <mapnik/geom_util.hpp>
#include <mapnik/parse_path.hpp> #include <mapnik/parse_path.hpp>

2
src/twkb.cpp
View file

@ -26,7 +26,7 @@
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/geom_util.hpp> #include <mapnik/geom_util.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#include <mapnik/geometry_correct.hpp> #include <mapnik/geometry/correct.hpp>
#include <cmath> #include <cmath>
namespace mapnik { namespace detail { namespace mapnik { namespace detail {

2
src/vertex_adapters.cpp
View file

@ -22,7 +22,7 @@
#include <mapnik/vertex_adapters.hpp> #include <mapnik/vertex_adapters.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_types.hpp> #include <mapnik/geometry/geometry_types.hpp>
#include <mapnik/vertex.hpp> #include <mapnik/vertex.hpp>
namespace mapnik { namespace geometry { namespace mapnik { namespace geometry {

2
src/wkb.cpp
View file

@ -27,7 +27,7 @@
#include <mapnik/wkb.hpp> #include <mapnik/wkb.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#include <mapnik/geometry_correct.hpp> #include <mapnik/geometry/correct.hpp>
namespace mapnik namespace mapnik
{ {

4
test/unit/datasource/csv.cpp
View file

@ -28,8 +28,8 @@
#include <mapnik/datasource.hpp> #include <mapnik/datasource.hpp>
#include <mapnik/datasource_cache.hpp> #include <mapnik/datasource_cache.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_types.hpp> #include <mapnik/geometry/geometry_types.hpp>
#include <mapnik/geometry_type.hpp> #include <mapnik/geometry/geometry_type.hpp>
#include <mapnik/expression.hpp> #include <mapnik/expression.hpp>
#include <mapnik/expression_evaluator.hpp> #include <mapnik/expression_evaluator.hpp>
#include <mapnik/debug.hpp> #include <mapnik/debug.hpp>

4
test/unit/datasource/ds_test_util.hpp
View file

@ -29,8 +29,8 @@
#include <mapnik/datasource.hpp> #include <mapnik/datasource.hpp>
#include <mapnik/datasource_cache.hpp> #include <mapnik/datasource_cache.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_types.hpp> #include <mapnik/geometry/geometry_types.hpp>
#include <mapnik/geometry_type.hpp> #include <mapnik/geometry/geometry_type.hpp>
namespace { namespace {

2
test/unit/datasource/geojson.cpp
View file

@ -27,7 +27,7 @@
#include <mapnik/datasource.hpp> #include <mapnik/datasource.hpp>
#include <mapnik/datasource_cache.hpp> #include <mapnik/datasource_cache.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_type.hpp> #include <mapnik/geometry/geometry_type.hpp>
#include <mapnik/util/fs.hpp> #include <mapnik/util/fs.hpp>
#include <cstdlib> #include <cstdlib>

2
test/unit/datasource/postgis.cpp
View file

@ -25,7 +25,7 @@
#include <mapnik/datasource.hpp> #include <mapnik/datasource.hpp>
#include <mapnik/datasource_cache.hpp> #include <mapnik/datasource_cache.hpp>
#include <mapnik/geometry_type.hpp> #include <mapnik/geometry/geometry_type.hpp>
#include <mapnik/util/fs.hpp> #include <mapnik/util/fs.hpp>
/* /*

3
test/unit/geometry/centroid.cpp
View file

@ -1,7 +1,6 @@
#include "catch.hpp" #include "catch.hpp"
#include <mapnik/geometry_centroid.hpp> #include <mapnik/geometry/centroid.hpp>
TEST_CASE("geometry centroid") { TEST_CASE("geometry centroid") {

2
test/unit/geometry/geometry_envelope_test.cpp
View file

@ -1,7 +1,7 @@
#include "catch.hpp" #include "catch.hpp"
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_envelope.hpp> #include <mapnik/geometry/envelope.hpp>
namespace { namespace {

3
test/unit/geometry/geometry_hit_test.cpp
View file

@ -1,9 +1,8 @@
#include "catch.hpp" #include "catch.hpp"
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/hit_test_filter.hpp> #include <mapnik/hit_test_filter.hpp>
#include <mapnik/geometry_correct.hpp> #include <mapnik/geometry/correct.hpp>
TEST_CASE("geometry ops") { TEST_CASE("geometry ops") {

45
test/unit/geometry/geometry_is_simple.cpp
View file

@ -1,9 +1,8 @@
#include "catch.hpp" #include "catch.hpp"
#include <boost/version.hpp> #include <boost/version.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_is_simple.hpp> #include <mapnik/geometry/is_simple.hpp>
TEST_CASE("geometry is_simple") { TEST_CASE("geometry is_simple") {
@ -53,7 +52,7 @@ SECTION("point Infinity") {
SECTION("multi point") { SECTION("multi point") {
mapnik::geometry::multi_point<double> mpt; mapnik::geometry::multi_point<double> mpt;
mpt.add_coord(0,0); mpt.add_coord(0,0);
mpt.add_coord(1,1); mpt.add_coord(1,1);
CHECK( mapnik::geometry::is_simple(mpt) ); CHECK( mapnik::geometry::is_simple(mpt) );
} }
@ -65,7 +64,7 @@ SECTION("multi point empty") {
SECTION("line_string") { SECTION("line_string") {
mapnik::geometry::line_string<double> line; mapnik::geometry::line_string<double> line;
line.add_coord(0,0); line.add_coord(0,0);
line.add_coord(1,1); line.add_coord(1,1);
CHECK( mapnik::geometry::is_simple(line) ); CHECK( mapnik::geometry::is_simple(line) );
} }
@ -73,7 +72,7 @@ SECTION("line_string") {
// This fails while is_valid will not fail! // This fails while is_valid will not fail!
SECTION("line_string repeated points") { SECTION("line_string repeated points") {
mapnik::geometry::line_string<double> line; mapnik::geometry::line_string<double> line;
line.add_coord(0,0); line.add_coord(0,0);
line.add_coord(1,1); line.add_coord(1,1);
line.add_coord(1,1); line.add_coord(1,1);
line.add_coord(2,2); line.add_coord(2,2);
@ -87,10 +86,10 @@ SECTION("line_string empty") {
SECTION("multi_line_string") { SECTION("multi_line_string") {
mapnik::geometry::line_string<double> line1; mapnik::geometry::line_string<double> line1;
line1.add_coord(0,0); line1.add_coord(0,0);
line1.add_coord(1,1); line1.add_coord(1,1);
mapnik::geometry::line_string<double> line2; mapnik::geometry::line_string<double> line2;
line2.add_coord(0,1); line2.add_coord(0,1);
line2.add_coord(1,2); line2.add_coord(1,2);
mapnik::geometry::multi_line_string<double> lines; mapnik::geometry::multi_line_string<double> lines;
lines.emplace_back(line1); lines.emplace_back(line1);
@ -113,7 +112,7 @@ SECTION("multi_line_string empty") {
SECTION("polygon") { SECTION("polygon") {
mapnik::geometry::polygon<double> poly; mapnik::geometry::polygon<double> poly;
mapnik::geometry::linear_ring<double> ring; mapnik::geometry::linear_ring<double> ring;
ring.add_coord(0,0); ring.add_coord(0,0);
ring.add_coord(1,0); ring.add_coord(1,0);
ring.add_coord(1,1); ring.add_coord(1,1);
ring.add_coord(0,1); ring.add_coord(0,1);
@ -125,7 +124,7 @@ SECTION("polygon") {
SECTION("polygon invalid winding order") { SECTION("polygon invalid winding order") {
mapnik::geometry::polygon<double> poly; mapnik::geometry::polygon<double> poly;
mapnik::geometry::linear_ring<double> ring; mapnik::geometry::linear_ring<double> ring;
ring.add_coord(0,0); ring.add_coord(0,0);
ring.add_coord(0,1); ring.add_coord(0,1);
ring.add_coord(1,1); ring.add_coord(1,1);
ring.add_coord(1,0); ring.add_coord(1,0);
@ -139,7 +138,7 @@ SECTION("polygon invalid winding order") {
SECTION("polygon 2 repeated points") { SECTION("polygon 2 repeated points") {
mapnik::geometry::polygon<double> poly; mapnik::geometry::polygon<double> poly;
mapnik::geometry::linear_ring<double> ring; mapnik::geometry::linear_ring<double> ring;
ring.add_coord(0,0); ring.add_coord(0,0);
ring.add_coord(1,0); ring.add_coord(1,0);
ring.add_coord(1,1); ring.add_coord(1,1);
ring.add_coord(1,1); ring.add_coord(1,1);
@ -153,7 +152,7 @@ SECTION("polygon 2 repeated points") {
SECTION("polygon 3 repeated points") { SECTION("polygon 3 repeated points") {
mapnik::geometry::polygon<double> poly; mapnik::geometry::polygon<double> poly;
mapnik::geometry::linear_ring<double> ring; mapnik::geometry::linear_ring<double> ring;
ring.add_coord(0,0); ring.add_coord(0,0);
ring.add_coord(1,0); ring.add_coord(1,0);
ring.add_coord(1,1); ring.add_coord(1,1);
ring.add_coord(1,1); ring.add_coord(1,1);
@ -181,7 +180,7 @@ SECTION("polygon that has empty exterior ring") {
SECTION("polygon that has empty interior ring") { SECTION("polygon that has empty interior ring") {
mapnik::geometry::polygon<double> poly; mapnik::geometry::polygon<double> poly;
mapnik::geometry::linear_ring<double> ring; mapnik::geometry::linear_ring<double> ring;
ring.add_coord(0,0); ring.add_coord(0,0);
ring.add_coord(1,0); ring.add_coord(1,0);
ring.add_coord(1,1); ring.add_coord(1,1);
ring.add_coord(0,1); ring.add_coord(0,1);
@ -209,7 +208,7 @@ SECTION("polygon that has empty exterior ring") {
SECTION("polygon that has empty interior ring") { SECTION("polygon that has empty interior ring") {
mapnik::geometry::polygon<double> poly; mapnik::geometry::polygon<double> poly;
mapnik::geometry::linear_ring<double> ring; mapnik::geometry::linear_ring<double> ring;
ring.add_coord(0,0); ring.add_coord(0,0);
ring.add_coord(1,0); ring.add_coord(1,0);
ring.add_coord(1,1); ring.add_coord(1,1);
ring.add_coord(0,1); ring.add_coord(0,1);
@ -226,7 +225,7 @@ SECTION("polygon that has empty interior ring") {
SECTION("polygon with spike") { SECTION("polygon with spike") {
mapnik::geometry::polygon<double> poly; mapnik::geometry::polygon<double> poly;
mapnik::geometry::linear_ring<double> ring; mapnik::geometry::linear_ring<double> ring;
ring.add_coord(0,0); ring.add_coord(0,0);
ring.add_coord(1,0); ring.add_coord(1,0);
ring.add_coord(1,1); ring.add_coord(1,1);
ring.add_coord(2,2); ring.add_coord(2,2);
@ -240,14 +239,14 @@ SECTION("polygon with spike") {
SECTION("polygon with hole") { SECTION("polygon with hole") {
mapnik::geometry::polygon<double> poly; mapnik::geometry::polygon<double> poly;
mapnik::geometry::linear_ring<double> ring; mapnik::geometry::linear_ring<double> ring;
ring.add_coord(0,0); ring.add_coord(0,0);
ring.add_coord(3,0); ring.add_coord(3,0);
ring.add_coord(3,3); ring.add_coord(3,3);
ring.add_coord(0,3); ring.add_coord(0,3);
ring.add_coord(0,0); ring.add_coord(0,0);
poly.set_exterior_ring(std::move(ring)); poly.set_exterior_ring(std::move(ring));
mapnik::geometry::linear_ring<double> hole; mapnik::geometry::linear_ring<double> hole;
hole.add_coord(1,1); hole.add_coord(1,1);
hole.add_coord(1,2); hole.add_coord(1,2);
hole.add_coord(2,2); hole.add_coord(2,2);
hole.add_coord(2,1); hole.add_coord(2,1);
@ -260,14 +259,14 @@ SECTION("polygon with hole") {
SECTION("polygon with hole with invalid winding order") { SECTION("polygon with hole with invalid winding order") {
mapnik::geometry::polygon<double> poly; mapnik::geometry::polygon<double> poly;
mapnik::geometry::linear_ring<double> ring; mapnik::geometry::linear_ring<double> ring;
ring.add_coord(0,0); ring.add_coord(0,0);
ring.add_coord(3,0); ring.add_coord(3,0);
ring.add_coord(3,3); ring.add_coord(3,3);
ring.add_coord(0,3); ring.add_coord(0,3);
ring.add_coord(0,0); ring.add_coord(0,0);
poly.set_exterior_ring(std::move(ring)); poly.set_exterior_ring(std::move(ring));
mapnik::geometry::linear_ring<double> hole; mapnik::geometry::linear_ring<double> hole;
hole.add_coord(1,1); hole.add_coord(1,1);
hole.add_coord(2,1); hole.add_coord(2,1);
hole.add_coord(2,2); hole.add_coord(2,2);
hole.add_coord(1,2); hole.add_coord(1,2);
@ -280,7 +279,7 @@ SECTION("multi polygon") {
mapnik::geometry::multi_polygon<double> mp; mapnik::geometry::multi_polygon<double> mp;
mapnik::geometry::polygon<double> poly; mapnik::geometry::polygon<double> poly;
mapnik::geometry::linear_ring<double> ring; mapnik::geometry::linear_ring<double> ring;
ring.add_coord(0,0); ring.add_coord(0,0);
ring.add_coord(1,0); ring.add_coord(1,0);
ring.add_coord(1,1); ring.add_coord(1,1);
ring.add_coord(0,1); ring.add_coord(0,1);
@ -288,7 +287,7 @@ SECTION("multi polygon") {
poly.set_exterior_ring(std::move(ring)); poly.set_exterior_ring(std::move(ring));
mapnik::geometry::polygon<double> poly2; mapnik::geometry::polygon<double> poly2;
mapnik::geometry::linear_ring<double> ring2; mapnik::geometry::linear_ring<double> ring2;
ring2.add_coord(0,0); ring2.add_coord(0,0);
ring2.add_coord(-1,0); ring2.add_coord(-1,0);
ring2.add_coord(-1,-1); ring2.add_coord(-1,-1);
ring2.add_coord(0,-1); ring2.add_coord(0,-1);
@ -303,7 +302,7 @@ SECTION("multi polygon with hole") {
mapnik::geometry::multi_polygon<double> mp; mapnik::geometry::multi_polygon<double> mp;
mapnik::geometry::polygon<double> poly; mapnik::geometry::polygon<double> poly;
mapnik::geometry::linear_ring<double> ring; mapnik::geometry::linear_ring<double> ring;
ring.add_coord(0,0); ring.add_coord(0,0);
ring.add_coord(3,0); ring.add_coord(3,0);
ring.add_coord(3,3); ring.add_coord(3,3);
ring.add_coord(0,3); ring.add_coord(0,3);
@ -318,14 +317,14 @@ SECTION("multi polygon with hole") {
poly.add_hole(std::move(hole)); poly.add_hole(std::move(hole));
mapnik::geometry::polygon<double> poly2; mapnik::geometry::polygon<double> poly2;
mapnik::geometry::linear_ring<double> ring2; mapnik::geometry::linear_ring<double> ring2;
ring2.add_coord(0,0); ring2.add_coord(0,0);
ring2.add_coord(-3,0); ring2.add_coord(-3,0);
ring2.add_coord(-3,-3); ring2.add_coord(-3,-3);
ring2.add_coord(0,-3); ring2.add_coord(0,-3);
ring2.add_coord(0,0); ring2.add_coord(0,0);
poly2.set_exterior_ring(std::move(ring2)); poly2.set_exterior_ring(std::move(ring2));
mapnik::geometry::linear_ring<double> hole2; mapnik::geometry::linear_ring<double> hole2;
hole2.add_coord(-1,-1); hole2.add_coord(-1,-1);
hole2.add_coord(-1,-2); hole2.add_coord(-1,-2);
hole2.add_coord(-2,-2); hole2.add_coord(-2,-2);
hole2.add_coord(-2,-1); hole2.add_coord(-2,-1);

3
test/unit/geometry/geometry_is_valid.cpp
View file

@ -1,8 +1,7 @@
#include "catch.hpp" #include "catch.hpp"
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_is_valid.hpp> #include <mapnik/geometry/is_valid.hpp>
TEST_CASE("geometry is_valid") { TEST_CASE("geometry is_valid") {

3
test/unit/geometry/geometry_reprojection.cpp
View file

@ -1,4 +1,3 @@
#include "catch.hpp" #include "catch.hpp"
#include "geometry_equal.hpp" #include "geometry_equal.hpp"
@ -6,7 +5,7 @@
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/projection.hpp> #include <mapnik/projection.hpp>
#include <mapnik/proj_transform.hpp> #include <mapnik/proj_transform.hpp>
#include <mapnik/geometry_reprojection.hpp> #include <mapnik/geometry/reprojection.hpp>
TEST_CASE("geometry reprojection") { TEST_CASE("geometry reprojection") {

5
test/unit/geometry/geometry_strategy_test.cpp
View file

@ -1,4 +1,3 @@
#include "catch.hpp" #include "catch.hpp"
#include "geometry_equal.hpp" #include "geometry_equal.hpp"
@ -6,8 +5,8 @@
#include <mapnik/projection.hpp> #include <mapnik/projection.hpp>
#include <mapnik/proj_transform.hpp> #include <mapnik/proj_transform.hpp>
#include <mapnik/view_transform.hpp> #include <mapnik/view_transform.hpp>
#include <mapnik/geometry_transform.hpp> #include <mapnik/geometry/transform.hpp>
#include <mapnik/geometry_strategy.hpp> #include <mapnik/geometry/strategy.hpp>
#include <mapnik/proj_strategy.hpp> #include <mapnik/proj_strategy.hpp>
#include <mapnik/view_strategy.hpp> #include <mapnik/view_strategy.hpp>

4
test/unit/geometry/geometry_test_helper.cpp
View file

@ -1,6 +1,6 @@
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry_envelope.hpp> #include <mapnik/geometry/envelope.hpp>
#include <mapnik/geometry_envelope_impl.hpp> #include <mapnik/geometry/envelope_impl.hpp>
namespace mapnik { namespace geometry { namespace mapnik { namespace geometry {

3
test/unit/geometry/has_empty.cpp
View file

@ -1,7 +1,6 @@
#include "catch.hpp" #include "catch.hpp"
#include <mapnik/geometry_is_empty.hpp> #include <mapnik/geometry/is_empty.hpp>
TEST_CASE("geometry has_empty") { TEST_CASE("geometry has_empty") {

3
test/unit/geometry/is_empty.cpp
View file

@ -1,7 +1,6 @@
#include "catch.hpp" #include "catch.hpp"
#include <mapnik/geometry_is_empty.hpp> #include <mapnik/geometry/is_empty.hpp>
TEST_CASE("geometry is_empty") { TEST_CASE("geometry is_empty") {

3
test/unit/geometry/remove_empty.cpp
View file

@ -1,7 +1,6 @@
#include "catch.hpp" #include "catch.hpp"
#include <mapnik/geometry_remove_empty.hpp> #include <mapnik/geometry/remove_empty.hpp>
TEST_CASE("geometry remove_empty") { TEST_CASE("geometry remove_empty") {

6
test/unit/serialization/wkb_formats_test.cpp
View file

@ -2,9 +2,9 @@
#include <iostream> #include <iostream>
#include <mapnik/wkb.hpp> #include <mapnik/wkb.hpp>
#include <mapnik/geometry_is_valid.hpp> #include <mapnik/geometry/is_valid.hpp>
#include <mapnik/geometry_is_simple.hpp> #include <mapnik/geometry/is_simple.hpp>
#include <mapnik/geometry_correct.hpp> #include <mapnik/geometry/correct.hpp>
#include <boost/version.hpp> #include <boost/version.hpp>
TEST_CASE("geometry formats") { TEST_CASE("geometry formats") {

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

@ -2,8 +2,8 @@
// 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_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
#include <boost/version.hpp> #include <boost/version.hpp>

3
test/unit/vertex_adapter/vertex_adapter.cpp
View file

@ -1,8 +1,7 @@
#include "catch.hpp" #include "catch.hpp"
#include <mapnik/vertex_adapters.hpp> #include <mapnik/vertex_adapters.hpp>
#include <mapnik/geometry_correct.hpp> #include <mapnik/geometry/correct.hpp>
TEST_CASE("vertex_adapters") { TEST_CASE("vertex_adapters") {

2
utils/mapnik-index/process_csv_file.cpp
View file

@ -24,7 +24,7 @@
#include "../../plugins/input/csv/csv_getline.hpp" #include "../../plugins/input/csv/csv_getline.hpp"
#include "../../plugins/input/csv/csv_utils.hpp" #include "../../plugins/input/csv/csv_utils.hpp"
#include <mapnik/datasource.hpp> #include <mapnik/datasource.hpp>
#include <mapnik/geometry_envelope.hpp> #include <mapnik/geometry/envelope.hpp>
#include <mapnik/util/utf_conv_win.hpp> #include <mapnik/util/utf_conv_win.hpp>
#if defined(MAPNIK_MEMORY_MAPPED_FILE) #if defined(MAPNIK_MEMORY_MAPPED_FILE)

4
utils/pgsql2sqlite/pgsql2sqlite.hpp
View file

@ -29,8 +29,8 @@
#include <mapnik/global.hpp> #include <mapnik/global.hpp>
#include <mapnik/sql_utils.hpp> #include <mapnik/sql_utils.hpp>
#include <mapnik/util/conversions.hpp> #include <mapnik/util/conversions.hpp>
#include <mapnik/geometry_is_empty.hpp> #include <mapnik/geometry/is_empty.hpp>
#include <mapnik/geometry_envelope.hpp> #include <mapnik/geometry/envelope.hpp>
#include "connection_manager.hpp" #include "connection_manager.hpp"
#include "cursorresultset.hpp" #include "cursorresultset.hpp"

3
utils/shapeindex/shapeindex.cpp
View file

@ -20,13 +20,12 @@
* *
*****************************************************************************/ *****************************************************************************/
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <string> #include <string>
#include <mapnik/util/fs.hpp> #include <mapnik/util/fs.hpp>
#include <mapnik/quad_tree.hpp> #include <mapnik/quad_tree.hpp>
#include <mapnik/geometry_envelope.hpp> #include <mapnik/geometry/envelope.hpp>
#include "shapefile.hpp" #include "shapefile.hpp"
#include "shape_io.hpp" #include "shape_io.hpp"
#include "shape_index_featureset.hpp" #include "shape_index_featureset.hpp"