mirror of
https://github.com/boostorg/geometry.git
synced 2025-05-09 15:14:02 +00:00
[geometry] Moved SVG from extensions to main tree, to release it
[SVN r84233]
This commit is contained in:
parent
f2bc495f53
commit
edca638dfc
@ -18,9 +18,9 @@ OBSOLETE
|
||||
#include <boost/geometry/multi/multi.hpp>
|
||||
|
||||
#include <boost/geometry/io/wkt/wkt.hpp>
|
||||
#include <boost/geometry/extensions/io/svg/write_svg_multi.hpp>
|
||||
#include <boost/geometry/io/svg/write_svg_multi.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
#include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
|
||||
|
||||
static const int wkt_countries_count = 1;
|
||||
|
@ -17,7 +17,7 @@
|
||||
#include <boost/algorithm/string.hpp>
|
||||
|
||||
#if defined(HAVE_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
template <typename Geometry, typename Range>
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include <boost/algorithm/string.hpp>
|
||||
|
||||
#if defined(HAVE_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
template <typename Geometry1, typename Geometry2>
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include <boost/geometry/geometries/adapted/c_array.hpp>
|
||||
|
||||
#if defined(HAVE_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
|
||||
|
@ -29,7 +29,7 @@
|
||||
#include <boost/geometry/geometries/adapted/c_array.hpp>
|
||||
|
||||
#if defined(HAVE_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian);
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include <boost/geometry/io/wkt/read.hpp>
|
||||
|
||||
#if defined(HAVE_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/write_svg.hpp>
|
||||
# include <boost/geometry/io/svg/write_svg.hpp>
|
||||
#endif
|
||||
|
||||
#include <boost/bind.hpp>
|
||||
|
@ -28,17 +28,15 @@
|
||||
#include <boost/geometry/io/wkt/read.hpp>
|
||||
|
||||
|
||||
// For output:
|
||||
#include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
|
||||
// Yes, this example currently uses an extension:
|
||||
|
||||
// For distance-calculations over the Earth:
|
||||
//#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
|
||||
// Yes, this example currently uses some extensions:
|
||||
|
||||
// For output:
|
||||
#if defined(HAVE_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
// For distance-calculations over the Earth:
|
||||
//#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
|
||||
|
||||
|
||||
|
||||
// Read an ASCII file containing WKT's, fill a vector of tuples
|
||||
// The tuples consist of at least <0> a geometry and <1> an identifying string
|
||||
|
@ -31,16 +31,13 @@
|
||||
#include <boost/geometry/geometries/linestring.hpp>
|
||||
#include <boost/geometry/io/wkt/read.hpp>
|
||||
|
||||
// For output:
|
||||
#include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
|
||||
// Yes, this example currently uses some extensions:
|
||||
// Yes, this example currently uses an extension:
|
||||
|
||||
// For output:
|
||||
#if defined(HAVE_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
// For distance-calculations over the Earth:
|
||||
//#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
|
||||
// For distance-calculations over the Earth:
|
||||
//#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
|
||||
|
||||
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include <boost/geometry/geometries/register/point.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/io/svg/write_svg.hpp>
|
||||
#include <boost/geometry/io/svg/write_svg.hpp>
|
||||
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
|
||||
#include <boost/geometry/extensions/gis/projections/project_transformer.hpp>
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
#include <boost/geometry/geometries/register/point.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
#include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include <boost/geometry/geometries/register/point.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
#include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
|
||||
|
@ -87,5 +87,6 @@
|
||||
#include <boost/geometry/views/segment_view.hpp>
|
||||
|
||||
#include <boost/geometry/io/io.hpp>
|
||||
#include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
|
||||
#endif // BOOST_GEOMETRY_GEOMETRY_HPP
|
||||
|
@ -41,7 +41,7 @@
|
||||
#include <boost/geometry/multi/algorithms/envelope.hpp>
|
||||
#include <boost/geometry/multi/algorithms/num_points.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/io/svg/write_svg.hpp>
|
||||
#include <boost/geometry/io/svg/write_svg.hpp>
|
||||
|
||||
// Helper geometries (all points are transformed to integer-points)
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
@ -13,7 +13,7 @@
|
||||
#define BOOST_GEOMETRY_IO_SVG_WRITE_SVG_MULTI_HPP
|
||||
|
||||
|
||||
#include <boost/geometry/extensions/io/svg/write_svg.hpp>
|
||||
#include <boost/geometry/io/svg/write_svg.hpp>
|
||||
|
||||
|
||||
namespace boost { namespace geometry
|
@ -21,7 +21,7 @@
|
||||
#include <boost/geometry/multi/io/wkt/wkt.hpp>
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
#include <boost/random/linear_congruential.hpp>
|
||||
|
@ -30,7 +30,7 @@
|
||||
#include <test_common/test_point.hpp>
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/algorithms/buffer.hpp>
|
||||
# include <boost/geometry/algorithms/centroid.hpp>
|
||||
#endif
|
||||
|
@ -34,7 +34,7 @@
|
||||
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
template <typename Geometry>
|
||||
|
@ -21,7 +21,7 @@
|
||||
#include <boost/geometry/io/wkt/wkt.hpp>
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
#include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
|
||||
|
@ -20,7 +20,6 @@
|
||||
#include <boost/geometry/multi/multi.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
|
||||
#include <boost/geometry/multi/io/wkt/read.hpp>
|
||||
#include <boost/geometry/extensions/io/svg/write_svg_multi.hpp>
|
||||
|
||||
|
||||
#include <test_common/test_point.hpp>
|
||||
@ -28,7 +27,8 @@
|
||||
|
||||
//#define TEST_WITH_SVG
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/write_svg_multi.hpp>
|
||||
#endif
|
||||
|
||||
// Collection might be a multi-geometry, or std::vector<ring>
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
struct test_enrich_intersection_points
|
||||
|
@ -21,7 +21,7 @@
|
||||
#include <boost/geometry/geometries/point_xy.hpp>
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
|
||||
|
@ -33,7 +33,7 @@
|
||||
#include <boost/geometry/io/wkt/write.hpp>
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
#include <algorithms/overlay/overlay_cases.hpp>
|
||||
|
@ -30,7 +30,7 @@
|
||||
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);
|
||||
|
@ -23,7 +23,7 @@
|
||||
#include <boost/geometry/geometries/point_xy.hpp>
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
|
||||
|
@ -28,7 +28,7 @@
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/geometries/point_xy.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
|
||||
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
#include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
|
||||
#include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
|
||||
#include <boost/geometry/algorithms/intersects.hpp>
|
||||
|
@ -36,7 +36,7 @@
|
||||
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
|
||||
|
@ -30,7 +30,7 @@
|
||||
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
#include <boost/type_traits/is_same.hpp>
|
||||
|
||||
#ifdef HAVE_TTMATH
|
||||
# include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
|
||||
# include <boost/geometry/contrib/ttmath_stub.hpp>
|
||||
#endif
|
||||
|
||||
#include <geometry_test_common.hpp>
|
||||
@ -62,7 +62,7 @@
|
||||
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
#include <boost/geometry/strategies/strategies.hpp>
|
||||
|
@ -48,7 +48,7 @@
|
||||
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
|
||||
|
@ -40,7 +40,7 @@
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
|
||||
# define BOOST_GEOMETRY_DEBUG_IDENTIFIER
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
|
||||
#endif
|
||||
|
||||
|
@ -28,7 +28,7 @@
|
||||
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
#include <geometry_test_common.hpp>
|
||||
|
@ -30,7 +30,7 @@
|
||||
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include <boost/geometry/geometries/geometries.hpp>
|
||||
#include <boost/geometry/geometries/point_xy.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_geometries.hpp>
|
||||
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
#include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
|
||||
struct settings_type
|
||||
{
|
||||
|
@ -28,7 +28,7 @@
|
||||
#include <boost/geometry/geometries/point_xy.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_geometries.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
#include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#include <boost/geometry/extensions/algorithms/midpoints.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/algorithms/buffer/buffer_inserter.hpp>
|
||||
|
@ -28,7 +28,7 @@
|
||||
#include <boost/geometry/geometries/point_xy.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_geometries.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
#include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#include <boost/geometry/extensions/algorithms/midpoints.hpp>
|
||||
|
||||
#include <common/common_settings.hpp>
|
||||
|
@ -48,7 +48,7 @@
|
||||
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
|
||||
|
@ -30,7 +30,7 @@
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/multi/algorithms/envelope.hpp>
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
|
||||
|
@ -34,15 +34,10 @@
|
||||
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
|
||||
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
|
||||
|
||||
#include <boost/geometry/extensions/io/svg/write_svg_multi.hpp>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/write_svg_multi.hpp>
|
||||
#endif
|
||||
|
||||
template <typename Mapper>
|
||||
|
@ -29,7 +29,7 @@
|
||||
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
// BSG 2011/08/05
|
||||
|
@ -30,7 +30,7 @@
|
||||
|
||||
#if defined(TEST_WITH_SVG)
|
||||
# include <boost/geometry/multi/algorithms/envelope.hpp>
|
||||
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
|
||||
# include <boost/geometry/io/svg/svg_mapper.hpp>
|
||||
#endif
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user