mirror of
https://github.com/boostorg/geometry.git
synced 2025-05-11 05:24:02 +00:00
[geometry] Moved util/write_dsv.hpp to io/dsv/write.hpp. This introduces refinement of new io structure: geometry/io/<FORMAT>/<read|write>.hpp
[SVN r75073]
This commit is contained in:
parent
da33eb8050
commit
90ce0fa3d1
@ -16,7 +16,7 @@
|
|||||||
#include <boost/geometry/algorithms/make.hpp>
|
#include <boost/geometry/algorithms/make.hpp>
|
||||||
#include <boost/geometry/geometries/register/point.hpp>
|
#include <boost/geometry/geometries/register/point.hpp>
|
||||||
#include <boost/geometry/strategies/strategies.hpp>
|
#include <boost/geometry/strategies/strategies.hpp>
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
|
|
||||||
// Sample point, defining three color values
|
// Sample point, defining three color values
|
||||||
struct my_color_point
|
struct my_color_point
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include <boost/geometry/geometries/register/point.hpp>
|
#include <boost/geometry/geometries/register/point.hpp>
|
||||||
#include <boost/geometry/geometries/register/box.hpp>
|
#include <boost/geometry/geometries/register/box.hpp>
|
||||||
#include <boost/geometry/strategies/strategies.hpp>
|
#include <boost/geometry/strategies/strategies.hpp>
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
|
|
||||||
struct my_point
|
struct my_point
|
||||||
{
|
{
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include <boost/geometry/geometries/point_xy.hpp>
|
#include <boost/geometry/geometries/point_xy.hpp>
|
||||||
#include <boost/geometry/geometries/register/ring.hpp>
|
#include <boost/geometry/geometries/register/ring.hpp>
|
||||||
#include <boost/geometry/strategies/strategies.hpp>
|
#include <boost/geometry/strategies/strategies.hpp>
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
|
|
||||||
|
|
||||||
struct triangle : public boost::array<boost::geometry::model::d2::point_xy<double>, 4>
|
struct triangle : public boost::array<boost::geometry::model::d2::point_xy<double>, 4>
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
|
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
|
||||||
#include <boost/geometry/geometries/register/ring.hpp>
|
#include <boost/geometry/geometries/register/ring.hpp>
|
||||||
#include <boost/geometry/strategies/strategies.hpp>
|
#include <boost/geometry/strategies/strategies.hpp>
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
|
|
||||||
BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
|
BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#include <boost/geometry/geometries/adapted/boost_fusion.hpp>
|
#include <boost/geometry/geometries/adapted/boost_fusion.hpp>
|
||||||
|
|
||||||
#include <boost/geometry/strategies/strategies.hpp>
|
#include <boost/geometry/strategies/strategies.hpp>
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
|
|
||||||
BOOST_GEOMETRY_REGISTER_BOOST_FUSION_CS(cs::cartesian);
|
BOOST_GEOMETRY_REGISTER_BOOST_FUSION_CS(cs::cartesian);
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
#ifdef BOOST_GEOMETRY_DEBUG_HAS_SELF_INTERSECTIONS
|
#ifdef BOOST_GEOMETRY_DEBUG_HAS_SELF_INTERSECTIONS
|
||||||
# include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
|
# include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
|
||||||
# include <boost/geometry/util/write_dsv.hpp>
|
# include <boost/geometry/io/dsv/write.hpp>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@
|
|||||||
|
|
||||||
#ifdef BOOST_GEOMETRY_DEBUG_INTERSECTION
|
#ifdef BOOST_GEOMETRY_DEBUG_INTERSECTION
|
||||||
# include <sstream>
|
# include <sstream>
|
||||||
# include <boost/geometry/util/write_dsv.hpp>
|
# include <boost/geometry/io/dsv/write.hpp>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
|
|
||||||
|
|
||||||
#ifdef BOOST_GEOMETRY_DEBUG_ASSEMBLE
|
#ifdef BOOST_GEOMETRY_DEBUG_ASSEMBLE
|
||||||
# include <boost/geometry/util/write_dsv.hpp>
|
# include <boost/geometry/io/dsv/write.hpp>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
#include <boost/geometry/geometries/concepts/check.hpp>
|
#include <boost/geometry/geometries/concepts/check.hpp>
|
||||||
|
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@
|
|||||||
#include <boost/geometry/util/math.hpp>
|
#include <boost/geometry/util/math.hpp>
|
||||||
#include <boost/geometry/util/select_most_precise.hpp>
|
#include <boost/geometry/util/select_most_precise.hpp>
|
||||||
#include <boost/geometry/util/select_coordinate_type.hpp>
|
#include <boost/geometry/util/select_coordinate_type.hpp>
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
|
|
||||||
#include <boost/geometry/views/box_view.hpp>
|
#include <boost/geometry/views/box_view.hpp>
|
||||||
#include <boost/geometry/views/segment_view.hpp>
|
#include <boost/geometry/views/segment_view.hpp>
|
||||||
|
@ -11,8 +11,8 @@
|
|||||||
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
|
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
|
||||||
// http://www.boost.org/LICENSE_1_0.txt)
|
// http://www.boost.org/LICENSE_1_0.txt)
|
||||||
|
|
||||||
#ifndef BOOST_GEOMETRY_UTIL_WRITE_DSV_HPP
|
#ifndef BOOST_GEOMETRY_IO_WRITE_DSV_HPP
|
||||||
#define BOOST_GEOMETRY_UTIL_WRITE_DSV_HPP
|
#define BOOST_GEOMETRY_IO_WRITE_DSV_HPP
|
||||||
|
|
||||||
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
@ -393,4 +393,4 @@ inline detail::dsv::dsv_manipulator<Geometry> dsv(Geometry const& geometry
|
|||||||
}} // namespace boost::geometry
|
}} // namespace boost::geometry
|
||||||
|
|
||||||
|
|
||||||
#endif // BOOST_GEOMETRY_UTIL_WRITE_DSV_HPP
|
#endif // BOOST_GEOMETRY_IO_WRITE_DSV_HPP
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
#include <boost/range.hpp>
|
#include <boost/range.hpp>
|
||||||
|
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
|
|
||||||
namespace boost { namespace geometry
|
namespace boost { namespace geometry
|
||||||
{
|
{
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
//#define GL_DEBUG_DOUGLAS_PEUCKER
|
//#define GL_DEBUG_DOUGLAS_PEUCKER
|
||||||
|
|
||||||
#ifdef GL_DEBUG_DOUGLAS_PEUCKER
|
#ifdef GL_DEBUG_DOUGLAS_PEUCKER
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
#include <boost/geometry/util/math.hpp>
|
#include <boost/geometry/util/math.hpp>
|
||||||
|
|
||||||
#ifdef BOOST_GEOMETRY_DEBUG_CROSS_TRACK
|
#ifdef BOOST_GEOMETRY_DEBUG_CROSS_TRACK
|
||||||
# include <boost/geometry/util/write_dsv.hpp>
|
# include <boost/geometry/io/dsv/write.hpp>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include <boost/geometry/algorithms/correct.hpp>
|
#include <boost/geometry/algorithms/correct.hpp>
|
||||||
#include <boost/geometry/strategies/strategies.hpp>
|
#include <boost/geometry/strategies/strategies.hpp>
|
||||||
|
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
|
|
||||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||||
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
|
#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
#include <boost/geometry/strategies/strategies.hpp>
|
#include <boost/geometry/strategies/strategies.hpp>
|
||||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||||
#include <boost/geometry/algorithms/assign.hpp>
|
#include <boost/geometry/algorithms/assign.hpp>
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
|
|
||||||
|
|
||||||
template <typename Geometry, typename Box>
|
template <typename Geometry, typename Box>
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
#include <boost/geometry/algorithms/distance.hpp>
|
#include <boost/geometry/algorithms/distance.hpp>
|
||||||
#include <boost/geometry/strategies/strategies.hpp>
|
#include <boost/geometry/strategies/strategies.hpp>
|
||||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
|
|
||||||
|
|
||||||
template<typename Point>
|
template<typename Point>
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
#include <boost/geometry/geometries/geometries.hpp>
|
#include <boost/geometry/geometries/geometries.hpp>
|
||||||
#include <boost/geometry/geometries/point_xy.hpp>
|
#include <boost/geometry/geometries/point_xy.hpp>
|
||||||
|
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||||
|
|
||||||
#include <test_common/test_point.hpp>
|
#include <test_common/test_point.hpp>
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include <boost/geometry/geometries/geometries.hpp>
|
#include <boost/geometry/geometries/geometries.hpp>
|
||||||
#include <boost/geometry/geometries/concepts/linestring_concept.hpp>
|
#include <boost/geometry/geometries/concepts/linestring_concept.hpp>
|
||||||
|
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
|
|
||||||
|
|
||||||
#include <test_common/test_point.hpp>
|
#include <test_common/test_point.hpp>
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
#include <boost/geometry/geometries/adapted/c_array.hpp>
|
#include <boost/geometry/geometries/adapted/c_array.hpp>
|
||||||
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
|
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
|
||||||
|
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
|
|
||||||
|
|
||||||
#include <test_common/test_point.hpp>
|
#include <test_common/test_point.hpp>
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
#include <boost/geometry/algorithms/make.hpp>
|
#include <boost/geometry/algorithms/make.hpp>
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
|
|
||||||
#include <boost/geometry/policies/compare.hpp>
|
#include <boost/geometry/policies/compare.hpp>
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
#include <geometry_test_common.hpp>
|
#include <geometry_test_common.hpp>
|
||||||
|
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
|
|
||||||
|
|
||||||
#include <boost/geometry/geometries/geometries.hpp>
|
#include <boost/geometry/geometries/geometries.hpp>
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include <boost/geometry/views/closeable_view.hpp>
|
#include <boost/geometry/views/closeable_view.hpp>
|
||||||
|
|
||||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
#include <boost/geometry/geometries/geometries.hpp>
|
#include <boost/geometry/geometries/geometries.hpp>
|
||||||
#include <boost/geometry/geometries/point_xy.hpp>
|
#include <boost/geometry/geometries/point_xy.hpp>
|
||||||
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
|
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include <boost/geometry/views/reversible_view.hpp>
|
#include <boost/geometry/views/reversible_view.hpp>
|
||||||
|
|
||||||
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
#include <boost/geometry/geometries/geometries.hpp>
|
#include <boost/geometry/geometries/geometries.hpp>
|
||||||
#include <boost/geometry/geometries/point_xy.hpp>
|
#include <boost/geometry/geometries/point_xy.hpp>
|
||||||
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
|
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
#include <boost/geometry/views/reversible_view.hpp>
|
#include <boost/geometry/views/reversible_view.hpp>
|
||||||
|
|
||||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
#include <boost/geometry/geometries/geometries.hpp>
|
#include <boost/geometry/geometries/geometries.hpp>
|
||||||
#include <boost/geometry/geometries/point_xy.hpp>
|
#include <boost/geometry/geometries/point_xy.hpp>
|
||||||
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
|
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
#include <boost/geometry/geometries/geometries.hpp>
|
#include <boost/geometry/geometries/geometries.hpp>
|
||||||
#include <boost/geometry/geometries/point_xy.hpp>
|
#include <boost/geometry/geometries/point_xy.hpp>
|
||||||
|
|
||||||
#include <boost/geometry/util/write_dsv.hpp>
|
#include <boost/geometry/io/dsv/write.hpp>
|
||||||
|
|
||||||
|
|
||||||
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user