Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r75076 - in trunk: boost/geometry/domains/gis/io boost/geometry/domains/gis/io/wkt boost/geometry/domains/gis/io/wkt/detail boost/geometry/extensions/gis/io/wkt libs/geometry/example libs/geometry/example/with_external_libs libs/geometry/example_extensions/gis/projections libs/geometry/test/algorithms libs/geometry/test/algorithms/detail/sections libs/geometry/test/algorithms/overlay libs/geometry/test/core libs/geometry/test/domains/gis/io/wkt libs/geometry/test/iterators libs/geometry/test/multi/algorithms libs/geometry/test/multi/algorithms/overlay libs/geometry/test/strategies libs/geometry/test/util libs/geometry/test/views libs/geometry/test_extensions/algorithms libs/geometry/test_extensions/gis/io/wkb libs/geometry/test_extensions/iterators libs/geometry/test_extensions/nsphere
From: mateusz_at_[hidden]
Date: 2011-10-20 19:20:14

Next message: eric_at_[hidden]: "[Boost-commit] svn:boost r75077 - in trunk: boost libs/foreach/test"
Previous message: mateusz_at_[hidden]: "[Boost-commit] svn:boost r75075 - trunk/boost/geometry/io/dsv"

Author: mloskot
Date: 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
New Revision: 75076
URL: http://svn.boost.org/trac/boost/changeset/75076

Log:
[geometry] Restructured WKT io files to follow structure of: geometry/domains/<DOMAIN>/io/<FORMAT>/<read|write>.hpp
Added:
   trunk/boost/geometry/domains/gis/io/wkt/read.hpp
      - copied, changed from r75072, /trunk/boost/geometry/domains/gis/io/wkt/read_wkt.hpp
   trunk/boost/geometry/domains/gis/io/wkt/read_multi.hpp
      - copied, changed from r75072, /trunk/boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp
   trunk/boost/geometry/domains/gis/io/wkt/write.hpp
      - copied, changed from r75072, /trunk/boost/geometry/domains/gis/io/wkt/write_wkt.hpp
   trunk/boost/geometry/domains/gis/io/wkt/write_multi.hpp
      - copied, changed from r75072, /trunk/boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp
Removed:
   trunk/boost/geometry/domains/gis/io/wkt/read_wkt.hpp
   trunk/boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp
   trunk/boost/geometry/domains/gis/io/wkt/write_wkt.hpp
   trunk/boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp
Text files modified:
   trunk/boost/geometry/domains/gis/io/io.hpp | 8 ++++----
   trunk/boost/geometry/domains/gis/io/wkt/detail/wkt_multi.hpp | 2 +-
   trunk/boost/geometry/domains/gis/io/wkt/read.hpp | 6 +++---
   trunk/boost/geometry/domains/gis/io/wkt/read_multi.hpp | 8 ++++----
   trunk/boost/geometry/domains/gis/io/wkt/wkt.hpp | 10 ++++------
   trunk/boost/geometry/domains/gis/io/wkt/write.hpp | 6 +++---
   trunk/boost/geometry/domains/gis/io/wkt/write_multi.hpp | 10 ++++------
   trunk/boost/geometry/extensions/gis/io/wkt/read_wkt.hpp | 2 +-
   trunk/boost/geometry/extensions/gis/io/wkt/stream_wkt.hpp | 2 +-
   trunk/boost/geometry/extensions/gis/io/wkt/wkt.hpp | 8 ++++----
   trunk/boost/geometry/extensions/gis/io/wkt/write_wkt.hpp | 2 +-
   trunk/libs/geometry/example/06_b_transformation_example.cpp | 2 +-
   trunk/libs/geometry/example/07_a_graph_route_example.cpp | 2 +-
   trunk/libs/geometry/example/07_b_graph_route_example.cpp | 2 +-
   trunk/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp | 4 ++--
   trunk/libs/geometry/example_extensions/gis/projections/p03_projmap_example.cpp | 2 +-
   trunk/libs/geometry/test/algorithms/correct.cpp | 4 ++--
   trunk/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp | 4 ++--
   trunk/libs/geometry/test/algorithms/disjoint.cpp | 2 +-
   trunk/libs/geometry/test/algorithms/make.cpp | 2 +-
   trunk/libs/geometry/test/algorithms/overlay/assemble.cpp | 4 ++--
   trunk/libs/geometry/test/algorithms/overlay/dissolver.cpp | 2 +-
   trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp | 4 ++--
   trunk/libs/geometry/test/algorithms/overlay/overlay_common.hpp | 4 ++--
   trunk/libs/geometry/test/algorithms/overlay/select_rings.cpp | 2 +-
   trunk/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp | 4 ++--
   trunk/libs/geometry/test/algorithms/overlay/split_rings.cpp | 4 ++--
   trunk/libs/geometry/test/algorithms/overlay/traverse.cpp | 4 ++--
   trunk/libs/geometry/test/algorithms/test_area.hpp | 2 +-
   trunk/libs/geometry/test/algorithms/test_centroid.hpp | 2 +-
   trunk/libs/geometry/test/algorithms/test_convex_hull.hpp | 4 ++--
   trunk/libs/geometry/test/algorithms/test_covered_by.hpp | 2 +-
   trunk/libs/geometry/test/algorithms/test_distance.hpp | 2 +-
   trunk/libs/geometry/test/algorithms/test_envelope.hpp | 2 +-
   trunk/libs/geometry/test/algorithms/test_equals.hpp | 2 +-
   trunk/libs/geometry/test/algorithms/test_expand.hpp | 2 +-
   trunk/libs/geometry/test/algorithms/test_intersects.hpp | 2 +-
   trunk/libs/geometry/test/algorithms/test_length.hpp | 2 +-
   trunk/libs/geometry/test/algorithms/test_overlaps.hpp | 2 +-
   trunk/libs/geometry/test/algorithms/test_perimeter.hpp | 2 +-
   trunk/libs/geometry/test/algorithms/test_within.hpp | 2 +-
   trunk/libs/geometry/test/core/ring.cpp | 2 +-
   trunk/libs/geometry/test/domains/gis/io/wkt/multi_wkt.cpp | 4 ++--
   trunk/libs/geometry/test/domains/gis/io/wkt/wkt.cpp | 4 ++--
   trunk/libs/geometry/test/iterators/closing_iterator.cpp | 2 +-
   trunk/libs/geometry/test/iterators/ever_circling_iterator.cpp | 2 +-
   trunk/libs/geometry/test/multi/algorithms/multi_centroid.cpp | 2 +-
   trunk/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp | 2 +-
   trunk/libs/geometry/test/multi/algorithms/multi_difference.cpp | 2 +-
   trunk/libs/geometry/test/multi/algorithms/multi_distance.cpp | 4 ++--
   trunk/libs/geometry/test/multi/algorithms/multi_envelope.cpp | 2 +-
   trunk/libs/geometry/test/multi/algorithms/multi_equals.cpp | 2 +-
   trunk/libs/geometry/test/multi/algorithms/multi_intersection.cpp | 2 +-
   trunk/libs/geometry/test/multi/algorithms/multi_transform.cpp | 2 +-
   trunk/libs/geometry/test/multi/algorithms/multi_union.cpp | 2 +-
   trunk/libs/geometry/test/multi/algorithms/overlay/multi_overlay_common.hpp | 2 +-
   trunk/libs/geometry/test/multi/algorithms/overlay/multi_traverse.cpp | 2 +-
   trunk/libs/geometry/test/strategies/projected_point.cpp | 2 +-
   trunk/libs/geometry/test/util/as_range.cpp | 2 +-
   trunk/libs/geometry/test/util/write_dsv.cpp | 2 +-
   trunk/libs/geometry/test/views/box_view.cpp | 2 +-
   trunk/libs/geometry/test/views/closeable_view.cpp | 2 +-
   trunk/libs/geometry/test/views/reversible_closeable.cpp | 2 +-
   trunk/libs/geometry/test/views/segment_view.cpp | 2 +-
   trunk/libs/geometry/test_extensions/algorithms/connect.cpp | 2 +-
   trunk/libs/geometry/test_extensions/algorithms/is_convex.cpp | 4 ++--
   trunk/libs/geometry/test_extensions/algorithms/offset.cpp | 2 +-
   trunk/libs/geometry/test_extensions/algorithms/remove_holes_if.cpp | 2 +-
   trunk/libs/geometry/test_extensions/algorithms/selected.cpp | 2 +-
   trunk/libs/geometry/test_extensions/gis/io/wkb/read_wkb.cpp | 2 +-
   trunk/libs/geometry/test_extensions/iterators/segment_returning_iterator.cpp | 2 +-
   trunk/libs/geometry/test_extensions/nsphere/within.cpp | 2 +-
   72 files changed, 105 insertions(+), 109 deletions(-)

Modified: trunk/boost/geometry/domains/gis/io/io.hpp
==============================================================================
--- trunk/boost/geometry/domains/gis/io/io.hpp (original)
+++ trunk/boost/geometry/domains/gis/io/io.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -15,11 +15,11 @@
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_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/read.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
-#include <boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write_multi.hpp>

namespace boost { namespace geometry
{

Modified: trunk/boost/geometry/domains/gis/io/wkt/detail/wkt_multi.hpp
==============================================================================
--- trunk/boost/geometry/domains/gis/io/wkt/detail/wkt_multi.hpp (original)
+++ trunk/boost/geometry/domains/gis/io/wkt/detail/wkt_multi.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -15,7 +15,7 @@
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_DETAIL_WKT_MULTI_HPP

-#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>
#include <boost/geometry/multi/core/tags.hpp>

Copied: trunk/boost/geometry/domains/gis/io/wkt/read.hpp (from r75072, /trunk/boost/geometry/domains/gis/io/wkt/read_wkt.hpp)
==============================================================================
--- /trunk/boost/geometry/domains/gis/io/wkt/read_wkt.hpp (original)
+++ trunk/boost/geometry/domains/gis/io/wkt/read.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -11,8 +11,8 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_HPP
-#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_HPP
+#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_HPP
+#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_HPP

#include <string>

@@ -689,4 +689,4 @@
}} // namespace boost::geometry

-#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_HPP
+#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_HPP

Copied: trunk/boost/geometry/domains/gis/io/wkt/read_multi.hpp (from r75072, /trunk/boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp)
==============================================================================
--- /trunk/boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp (original)
+++ trunk/boost/geometry/domains/gis/io/wkt/read_multi.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -11,8 +11,8 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_MULTI_HPP
-#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_MULTI_HPP
+#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_MULTI_HPP
+#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_MULTI_HPP

#include <string>

@@ -20,7 +20,7 @@
#include <boost/geometry/multi/core/tags.hpp>
#include <boost/geometry/multi/core/point_type.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/domains/gis/io/wkt/detail/wkt_multi.hpp>

@@ -109,4 +109,4 @@

}} // namespace boost::geometry

-#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_MULTI_HPP
+#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_MULTI_HPP

Deleted: trunk/boost/geometry/domains/gis/io/wkt/read_wkt.hpp
==============================================================================
--- trunk/boost/geometry/domains/gis/io/wkt/read_wkt.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
+++ (empty file)
@@ -1,692 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
-
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
-// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_HPP
-#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_HPP
-
-#include <string>
-
-#include <boost/lexical_cast.hpp>
-#include <boost/tokenizer.hpp>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/range.hpp>
-
-
-#include <boost/type_traits.hpp>
-
-
-#include <boost/geometry/algorithms/assign.hpp>
-#include <boost/geometry/algorithms/append.hpp>
-#include <boost/geometry/algorithms/clear.hpp>
-
-#include <boost/geometry/core/access.hpp>
-#include <boost/geometry/core/coordinate_dimension.hpp>
-#include <boost/geometry/core/exception.hpp>
-#include <boost/geometry/core/exterior_ring.hpp>
-#include <boost/geometry/core/geometry_id.hpp>
-#include <boost/geometry/core/interior_rings.hpp>
-#include <boost/geometry/core/mutable_range.hpp>
-
-#include <boost/geometry/geometries/concepts/check.hpp>
-
-#include <boost/geometry/util/coordinate_cast.hpp>
-
-#include <boost/geometry/domains/gis/io/wkt/detail/wkt.hpp>
-
-namespace boost { namespace geometry
-{
-
-
-
-/*!
-\brief Exception showing things wrong with WKT parsing
-\ingroup wkt
-*/
-struct read_wkt_exception : public geometry::exception
-{
- template <typename Iterator>
- read_wkt_exception(std::string const& msg,
- Iterator const& it, Iterator const& end, std::string const& wkt)
- : message(msg)
- , wkt(wkt)
- {
- if (it != end)
- {
- source = " at '";
- source += it->c_str();
- source += "'";
- }
- complete = message + source + " in '" + wkt.substr(0, 100) + "'";
- }
-
- read_wkt_exception(std::string const& msg, std::string const& wkt)
- : message(msg)
- , wkt(wkt)
- {
- complete = message + "' in (" + wkt.substr(0, 100) + ")";
- }
-
- virtual ~read_wkt_exception() throw() {}
-
- virtual const char* what() const throw()
- {
- return complete.c_str();
- }
-private :
- std::string source;
- std::string message;
- std::string wkt;
- std::string complete;
-};
-
-
-
-#ifndef DOXYGEN_NO_DETAIL
-// (wkt: Well Known Text, defined by OGC for all geometries and implemented by e.g. databases (MySQL, PostGIS))
-namespace detail { namespace wkt {
-
-typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-
-template <typename Point, std::size_t Dimension, std::size_t DimensionCount>
-struct parsing_assigner
-{
- static inline void apply(tokenizer::iterator& it, tokenizer::iterator end,
- Point& point, std::string const& wkt)
- {
- typedef typename coordinate_type<Point>::type coordinate_type;
-
- // Stop at end of tokens, or at "," ot ")"
- bool finished = (it == end || *it == "," || *it == ")");
-
- try
- {
- // Initialize missing coordinates to default constructor (zero)
- // OR
- // Use lexical_cast for conversion to double/int
- // Note that it is much slower than atof. However, it is more standard
- // and in parsing the change in performance falls probably away against
- // the tokenizing
- set<Dimension>(point, finished
- ? coordinate_type()
- : coordinate_cast<coordinate_type>::apply(*it));
- }
- catch(boost::bad_lexical_cast const& blc)
- {
- throw read_wkt_exception(blc.what(), it, end, wkt);
- }
- catch(std::exception const& e)
- {
- throw read_wkt_exception(e.what(), it, end, wkt);
- }
- catch(...)
- {
- throw read_wkt_exception("", it, end, wkt);
- }
-
- parsing_assigner<Point, Dimension + 1, DimensionCount>::apply(
- (finished ? it : ++it), end, point, wkt);
- }
-};
-
-template <typename Point, std::size_t DimensionCount>
-struct parsing_assigner<Point, DimensionCount, DimensionCount>
-{
- static inline void apply(tokenizer::iterator&, tokenizer::iterator, Point&,
- std::string const&)
- {
- }
-};
-
-
-
-template <typename Iterator>
-inline void handle_open_parenthesis(Iterator& it,
- Iterator const& end, std::string const& wkt)
-{
- if (it == end || *it != "(")
- {
- throw read_wkt_exception("Expected '('", it, end, wkt);
- }
- ++it;
-}
-
-
-template <typename Iterator>
-inline void handle_close_parenthesis(Iterator& it,
- Iterator const& end, std::string const& wkt)
-{
- if (it != end && *it == ")")
- {
- ++it;
- }
- else
- {
- throw read_wkt_exception("Expected ')'", it, end, wkt);
- }
-}
-
-template <typename Iterator>
-inline void check_end(Iterator& it,
- Iterator const& end, std::string const& wkt)
-{
- if (it != end)
- {
- throw read_wkt_exception("Too much tokens", it, end, wkt);
- }
-}
-
-/*!
-\brief Internal, parses coordinate sequences, strings are formated like "(1 2,3 4,...)"
-\param it token-iterator, should be pre-positioned at "(", is post-positions after last ")"
-\param end end-token-iterator
-\param out Output itererator receiving coordinates
-*/
-template <typename Point>
-struct container_inserter
-{
- // Version with output iterator
- template <typename OutputIterator>
- static inline void apply(tokenizer::iterator& it, tokenizer::iterator end,
- std::string const& wkt, OutputIterator out)
- {
- handle_open_parenthesis(it, end, wkt);
-
- Point point;
-
- // Parse points until closing parenthesis
-
- while (it != end && *it != ")")
- {
- parsing_assigner
- <
- Point,
- 0,
- dimension<Point>::value
- >::apply(it, end, point, wkt);
- out = point;
- ++out;
- if (it != end && *it == ",")
- {
- ++it;
- }
- }
-
- handle_close_parenthesis(it, end, wkt);
- }
-};
-
-
-// Geometry is a value-type or reference-type
-template <typename Geometry>
-struct container_appender
-{
- typedef typename geometry::point_type
- <
- typename boost::remove_reference<Geometry>::type
- >::type point_type;
-
- static inline void apply(tokenizer::iterator& it, tokenizer::iterator end,
- std::string const& wkt, Geometry out)
- {
- handle_open_parenthesis(it, end, wkt);
-
- point_type point;
-
- // Parse points until closing parenthesis
-
- while (it != end && *it != ")")
- {
- parsing_assigner
- <
- point_type,
- 0,
- dimension<point_type>::value
- >::apply(it, end, point, wkt);
-
- geometry::append(out, point);
- if (it != end && *it == ",")
- {
- ++it;
- }
- }
-
- handle_close_parenthesis(it, end, wkt);
- }
-};
-
-/*!
-\brief Internal, parses a point from a string like this "(x y)"
-\note used for parsing points and multi-points
-*/
-template <typename P>
-struct point_parser
-{
- static inline void apply(tokenizer::iterator& it, tokenizer::iterator end,
- std::string const& wkt, P& point)
- {
- handle_open_parenthesis(it, end, wkt);
- parsing_assigner<P, 0, dimension<P>::value>::apply(it, end, point, wkt);
- handle_close_parenthesis(it, end, wkt);
- }
-};
-
-
-template <typename Geometry>
-struct linestring_parser
-{
- static inline void apply(tokenizer::iterator& it, tokenizer::iterator end,
- std::string const& wkt, Geometry& geometry)
- {
- container_appender<Geometry&>::apply(it, end, wkt, geometry);
- }
-};
-
-
-template <typename Ring>
-struct ring_parser
-{
- static inline void apply(tokenizer::iterator& it, tokenizer::iterator end,
- std::string const& wkt, Ring& ring)
- {
- // A ring should look like polygon((x y,x y,x y...))
- // So handle the extra opening/closing parentheses
- // and in between parse using the container-inserter
- handle_open_parenthesis(it, end, wkt);
- container_appender<Ring&>::apply(it, end, wkt, ring);
- handle_close_parenthesis(it, end, wkt);
- }
-};
-
-
-
-
-/*!
-\brief Internal, parses a polygon from a string like this "((x y,x y),(x y,x y))"
-\note used for parsing polygons and multi-polygons
-*/
-template <typename Polygon>
-struct polygon_parser
-{
- typedef typename ring_return_type<Polygon>::type ring_return_type;
- typedef container_appender<ring_return_type> appender;
-
- static inline void apply(tokenizer::iterator& it, tokenizer::iterator end,
- std::string const& wkt, Polygon& poly)
- {
-
- handle_open_parenthesis(it, end, wkt);
-
- int n = -1;
-
- // Stop at ")"
- while (it != end && *it != ")")
- {
- // Parse ring
- if (++n == 0)
- {
- appender::apply(it, end, wkt, exterior_ring(poly));
- }
- else
- {
- typename ring_type<Polygon>::type ring;
- appender::apply(it, end, wkt, ring);
- traits::push_back
- <
- typename boost::remove_reference
- <
- typename traits::interior_mutable_type<Polygon>::type
- >::type
- >::apply(interior_rings(poly), ring);
- }
-
- if (it != end && *it == ",")
- {
- // Skip "," after ring is parsed
- ++it;
- }
- }
-
- handle_close_parenthesis(it, end, wkt);
- }
-};
-
-inline bool one_of(tokenizer::iterator const& it, std::string const& value,
- bool& is_present)
-{
- if (boost::iequals(*it, value))
- {
- is_present = true;
- return true;
- }
- return false;
-}
-
-inline bool one_of(tokenizer::iterator const& it, std::string const& value,
- bool& present1, bool& present2)
-{
- if (boost::iequals(*it, value))
- {
- present1 = true;
- present2 = true;
- return true;
- }
- return false;
-}
-
-
-inline void handle_empty_z_m(tokenizer::iterator& it, tokenizer::iterator end,
- bool& has_empty, bool& has_z, bool& has_m)
-{
- has_empty = false;
- has_z = false;
- has_m = false;
-
- // WKT can optionally have Z and M (measured) values as in
- // POINT ZM (1 1 5 60), POINT M (1 1 80), POINT Z (1 1 5)
- // GGL supports any of them as coordinate values, but is not aware
- // of any Measured value.
- while (it != end
- && (one_of(it, "M", has_m)
- || one_of(it, "Z", has_z)
- || one_of(it, "EMPTY", has_empty)
- || one_of(it, "MZ", has_m, has_z)
- || one_of(it, "ZM", has_z, has_m)
- )
- )
- {
- ++it;
- }
-}
-
-/*!
-\brief Internal, starts parsing
-\param tokens boost tokens, parsed with separator " " and keeping separator "()"
-\param geometry string to compare with first token
-*/
-template <typename Geometry>
-inline bool initialize(tokenizer const& tokens,
- std::string const& geometry_name, std::string const& wkt,
- tokenizer::iterator& it)
-{
- it = tokens.begin();
- if (it != tokens.end() && boost::iequals(*it++, geometry_name))
- {
- bool has_empty, has_z, has_m;
-
- handle_empty_z_m(it, tokens.end(), has_empty, has_z, has_m);
-
- if (has_z && dimension<Geometry>::type::value < 3)
- {
- throw read_wkt_exception("Z only allowed for 3 or more dimensions", wkt);
- }
- if (has_empty)
- {
- check_end(it, tokens.end(), wkt);
- return false;
- }
- // M is ignored at all.
-
- return true;
- }
- throw read_wkt_exception(std::string("Should start with '") + geometry_name + "'", wkt);
-}
-
-
-template <typename Geometry, template<typename> class Parser, typename PrefixPolicy>
-struct geometry_parser
-{
- static inline void apply(std::string const& wkt, Geometry& geometry)
- {
- geometry::clear(geometry);
-
- tokenizer tokens(wkt, boost::char_separator<char>(" ", ",()"));
- tokenizer::iterator it;
- if (initialize<Geometry>(tokens, PrefixPolicy::apply(), wkt, it))
- {
- Parser<Geometry>::apply(it, tokens.end(), wkt, geometry);
- check_end(it, tokens.end(), wkt);
- }
- }
-};
-
-
-
-
-
-/*!
-\brief Supports box parsing
-\note OGC does not define the box geometry, and WKT does not support boxes.
- However, to be generic GGL supports reading and writing from and to boxes.
- Boxes are outputted as a standard POLYGON. GGL can read boxes from
- a standard POLYGON, from a POLYGON with 2 points of from a BOX
-\tparam Box the box
-*/
-template <typename Box>
-struct box_parser
-{
- static inline void apply(std::string const& wkt, Box& box)
- {
- bool should_close = false;
- tokenizer tokens(wkt, boost::char_separator<char>(" ", ",()"));
- tokenizer::iterator it = tokens.begin();
- tokenizer::iterator end = tokens.end();
- if (it != end && boost::iequals(*it, "POLYGON"))
- {
- ++it;
- bool has_empty, has_z, has_m;
- handle_empty_z_m(it, end, has_empty, has_z, has_m);
- if (has_empty)
- {
- assign_zero(box);
- return;
- }
- handle_open_parenthesis(it, end, wkt);
- should_close = true;
- }
- else if (it != end && boost::iequals(*it, "BOX"))
- {
- ++it;
- }
- else
- {
- throw read_wkt_exception("Should start with 'POLYGON' or 'BOX'", wkt);
- }
-
- typedef typename point_type<Box>::type point_type;
- std::vector<point_type> points;
- container_inserter<point_type>::apply(it, end, wkt, std::back_inserter(points));
-
- if (should_close)
- {
- handle_close_parenthesis(it, end, wkt);
- }
- check_end(it, end, wkt);
-
- int index = 0;
- int n = boost::size(points);
- if (n == 2)
- {
- index = 1;
- }
- else if (n == 4 || n == 5)
- {
- // In case of 4 or 5 points, we do not check the other ones, just
- // take the opposite corner which is always 2
- index = 2;
- }
- else
- {
- throw read_wkt_exception("Box should have 2,4 or 5 points", wkt);
- }
-
- geometry::detail::assign_point_to_index<min_corner>(points.front(), box);
- geometry::detail::assign_point_to_index<max_corner>(points[index], box);
- }
-};
-
-
-/*!
-\brief Supports segment parsing
-\note OGC does not define the segment, and WKT does not support segmentes.
- However, it is useful to implement it, also for testing purposes
-\tparam Segment the segment
-*/
-template <typename Segment>
-struct segment_parser
-{
- static inline void apply(std::string const& wkt, Segment& segment)
- {
- tokenizer tokens(wkt, boost::char_separator<char>(" ", ",()"));
- tokenizer::iterator it = tokens.begin();
- tokenizer::iterator end = tokens.end();
- if (it != end &&
- (boost::iequals(*it, "SEGMENT")
- || boost::iequals(*it, "LINESTRING") ))
- {
- ++it;
- }
- else
- {
- throw read_wkt_exception("Should start with 'LINESTRING' or 'SEGMENT'", wkt);
- }
-
- typedef typename point_type<Segment>::type point_type;
- std::vector<point_type> points;
- container_inserter<point_type>::apply(it, end, wkt, std::back_inserter(points));
-
- check_end(it, end, wkt);
-
- if (boost::size(points) == 2)
- {
- geometry::detail::assign_point_to_index<0>(points.front(), segment);
- geometry::detail::assign_point_to_index<1>(points.back(), segment);
- }
- else
- {
- throw read_wkt_exception("Segment should have 2 points", wkt);
- }
-
- }
-};
-
-
-
-}} // namespace detail::wkt
-#endif // DOXYGEN_NO_DETAIL
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename Tag, typename Geometry>
-struct read_wkt {};
-
-
-template <typename Point>
-struct read_wkt<point_tag, Point>
- : detail::wkt::geometry_parser
- <
- Point,
- detail::wkt::point_parser,
- detail::wkt::prefix_point
- >
-{};
-
-
-template <typename L>
-struct read_wkt<linestring_tag, L>
- : detail::wkt::geometry_parser
- <
- L,
- detail::wkt::linestring_parser,
- detail::wkt::prefix_linestring
- >
-{};
-
-template <typename Ring>
-struct read_wkt<ring_tag, Ring>
- : detail::wkt::geometry_parser
- <
- Ring,
- detail::wkt::ring_parser,
- detail::wkt::prefix_polygon
- >
-{};
-
-template <typename Geometry>
-struct read_wkt<polygon_tag, Geometry>
- : detail::wkt::geometry_parser
- <
- Geometry,
- detail::wkt::polygon_parser,
- detail::wkt::prefix_polygon
- >
-{};
-
-
-// Box (Non-OGC)
-template <typename Box>
-struct read_wkt<box_tag, Box>
- : detail::wkt::box_parser<Box>
-{};
-
-// Segment (Non-OGC)
-template <typename Segment>
-struct read_wkt<segment_tag, Segment>
- : detail::wkt::segment_parser<Segment>
-{};
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-/*!
-\brief Parses OGC Well-Known Text (\ref WKT) into a geometry (any geometry)
-\ingroup wkt
-\param wkt string containing \ref WKT
-\param geometry output geometry
-\par Example:
-\note It is case insensitive and can have the WKT forms "point", "point m", "point z", "point zm", "point mz"
-\note Empty sequences can have forms as "LINESTRING ()" or "POLYGON(())"
-Small example showing how to use read_wkt to build a point
-\dontinclude doxygen_1.cpp
-\skip example_from_wkt_point
-\line {
-\until }
-\par Example:
-Small example showing how to use read_wkt to build a linestring
-\dontinclude doxygen_1.cpp
-\skip example_from_wkt_linestring
-\line {
-\until }
-\par Example:
-Small example showing how to use read_wkt to build a polygon
-\dontinclude doxygen_1.cpp
-\skip example_from_wkt_polygon
-\line {
-\until }
-*/
-template <typename Geometry>
-inline void read_wkt(std::string const& wkt, Geometry& geometry)
-{
- geometry::concept::check<Geometry>();
- dispatch::read_wkt<typename tag<Geometry>::type, Geometry>::apply(wkt, geometry);
-}
-
-}} // namespace boost::geometry
-
-
-#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_HPP

Deleted: trunk/boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp
==============================================================================
--- trunk/boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
+++ (empty file)
@@ -1,112 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
-
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
-// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_MULTI_HPP
-#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_MULTI_HPP
-
-#include <string>
-
-#include <boost/geometry/core/mutable_range.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
-
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
-#include <boost/geometry/domains/gis/io/wkt/detail/wkt_multi.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-namespace detail { namespace wkt {
-
-template <typename MultiGeometry, template<typename> class Parser, typename PrefixPolicy>
-struct multi_parser
-{
- static inline void apply(std::string const& wkt, MultiGeometry& geometry)
- {
- traits::clear<MultiGeometry>::apply(geometry);
-
- tokenizer tokens(wkt, boost::char_separator<char>(" ", ",()"));
- tokenizer::iterator it;
- if (initialize<MultiGeometry>(tokens, PrefixPolicy::apply(), wkt, it))
- {
- handle_open_parenthesis(it, tokens.end(), wkt);
-
- // Parse sub-geometries
- while(it != tokens.end() && *it != ")")
- {
- traits::resize<MultiGeometry>::apply(geometry, boost::size(geometry) + 1);
- Parser
- <
- typename boost::range_value<MultiGeometry>::type
- >::apply(it, tokens.end(), wkt, geometry.back());
- if (it != tokens.end() && *it == ",")
- {
- // Skip "," after multi-element is parsed
- ++it;
- }
- }
-
- handle_close_parenthesis(it, tokens.end(), wkt);
- }
- }
-};
-
-
-
-
-}} // namespace detail::wkt
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename MultiGeometry>
-struct read_wkt<multi_point_tag, MultiGeometry>
- : detail::wkt::multi_parser
- <
- MultiGeometry,
- detail::wkt::point_parser,
- detail::wkt::prefix_multipoint
- >
-{};
-
-
-template <typename MultiGeometry>
-struct read_wkt<multi_linestring_tag, MultiGeometry>
- : detail::wkt::multi_parser
- <
- MultiGeometry,
- detail::wkt::linestring_parser,
- detail::wkt::prefix_multilinestring
- >
-{};
-
-
-template <typename MultiGeometry>
-struct read_wkt<multi_polygon_tag, MultiGeometry>
- : detail::wkt::multi_parser
- <
- MultiGeometry,
- detail::wkt::polygon_parser,
- detail::wkt::prefix_multipolygon
- >
-{};
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-}} // namespace boost::geometry
-
-#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_READ_WKT_MULTI_HPP

Modified: trunk/boost/geometry/domains/gis/io/wkt/wkt.hpp
==============================================================================
--- trunk/boost/geometry/domains/gis/io/wkt/wkt.hpp (original)
+++ trunk/boost/geometry/domains/gis/io/wkt/wkt.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -14,12 +14,10 @@
#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WKT_HPP
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WKT_HPP

+#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.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/read_wkt_multi.hpp>
-#include <boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp>
-
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write_multi.hpp>

#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WKT_HPP

Copied: trunk/boost/geometry/domains/gis/io/wkt/write.hpp (from r75072, /trunk/boost/geometry/domains/gis/io/wkt/write_wkt.hpp)
==============================================================================
--- /trunk/boost/geometry/domains/gis/io/wkt/write_wkt.hpp (original)
+++ trunk/boost/geometry/domains/gis/io/wkt/write.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -11,8 +11,8 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_HPP
-#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_HPP
+#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_HPP
+#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_HPP

#include <ostream>
#include <string>
@@ -391,4 +391,4 @@

}} // namespace boost::geometry

-#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_HPP
+#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_HPP

Copied: trunk/boost/geometry/domains/gis/io/wkt/write_multi.hpp (from r75072, /trunk/boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp)
==============================================================================
--- /trunk/boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp (original)
+++ trunk/boost/geometry/domains/gis/io/wkt/write_multi.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -11,14 +11,12 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_MULTI_HPP
-#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_MULTI_HPP
-
-
+#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_MULTI_HPP
+#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_MULTI_HPP

#include <boost/geometry/multi/core/tags.hpp>

-#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>
#include <boost/geometry/domains/gis/io/wkt/detail/wkt_multi.hpp>

@@ -114,4 +112,4 @@

}} // namespace boost::geometry

-#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_MULTI_HPP
+#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_MULTI_HPP

Deleted: trunk/boost/geometry/domains/gis/io/wkt/write_wkt.hpp
==============================================================================
--- trunk/boost/geometry/domains/gis/io/wkt/write_wkt.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
+++ (empty file)
@@ -1,394 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
-
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
-// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_HPP
-#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_HPP
-
-#include <ostream>
-#include <string>
-
-#include <boost/array.hpp>
-#include <boost/concept/assert.hpp>
-#include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
-
-
-#include <boost/geometry/algorithms/assign.hpp>
-#include <boost/geometry/algorithms/convert.hpp>
-#include <boost/geometry/core/exterior_ring.hpp>
-#include <boost/geometry/core/interior_rings.hpp>
-#include <boost/geometry/core/ring_type.hpp>
-
-#include <boost/geometry/geometries/concepts/check.hpp>
-#include <boost/geometry/geometries/ring.hpp>
-
-#include <boost/geometry/domains/gis/io/wkt/detail/wkt.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace wkt
-{
-
-template <typename P, int I, int Count>
-struct stream_coordinate
-{
- template <typename Char, typename Traits>
- static inline void apply(std::basic_ostream<Char, Traits>& os, P const& p)
- {
- os << (I > 0 ? " " : "") << get<I>(p);
- stream_coordinate<P, I + 1, Count>::apply(os, p);
- }
-};
-
-template <typename P, int Count>
-struct stream_coordinate<P, Count, Count>
-{
- template <typename Char, typename Traits>
- static inline void apply(std::basic_ostream<Char, Traits>&, P const&)
- {}
-};
-
-struct prefix_linestring_par
-{
- static inline const char* apply() { return "LINESTRING("; }
-};
-
-struct prefix_ring_par_par
-{
- // Note, double parentheses are intentional, indicating WKT ring begin/end
- static inline const char* apply() { return "POLYGON(("; }
-};
-
-struct opening_parenthesis
-{
- static inline const char* apply() { return "("; }
-};
-
-struct closing_parenthesis
-{
- static inline const char* apply() { return ")"; }
-};
-
-struct double_closing_parenthesis
-{
- static inline const char* apply() { return "))"; }
-};
-
-
-
-
-/*!
-\brief Stream points as \ref WKT
-*/
-template <typename Point, typename Policy>
-struct wkt_point
-{
- template <typename Char, typename Traits>
- static inline void apply(std::basic_ostream<Char, Traits>& os, Point const& p)
- {
- os << Policy::apply() << "(";
- stream_coordinate<Point, 0, dimension<Point>::type::value>::apply(os, p);
- os << ")";
- }
-};
-
-/*!
-\brief Stream ranges as WKT
-\note policy is used to stream prefix/postfix, enabling derived classes to override this
-*/
-template <typename Range, typename PrefixPolicy, typename SuffixPolicy>
-struct wkt_range
-{
- template <typename Char, typename Traits>
- static inline void apply(std::basic_ostream<Char, Traits>& os,
- Range const& range)
- {
- typedef typename boost::range_iterator<Range const>::type iterator_type;
-
- bool first = true;
-
- os << PrefixPolicy::apply();
-
- // TODO: check EMPTY here
-
- for (iterator_type it = boost::begin(range);
- it != boost::end(range);
- ++it)
- {
- os << (first ? "" : ",");
- stream_coordinate
- <
- point_type, 0, dimension<point_type>::type::value
- >::apply(os, *it);
- first = false;
- }
-
- os << SuffixPolicy::apply();
- }
-
-private:
- typedef typename boost::range_value<Range>::type point_type;
-};
-
-/*!
-\brief Stream sequence of points as WKT-part, e.g. (1 2),(3 4)
-\note Used in polygon, all multi-geometries
-*/
-
-
-
-template <typename Range>
-struct wkt_sequence
- : wkt_range
- <
- Range,
- opening_parenthesis,
- closing_parenthesis
- >
-{};
-
-
-template <typename Polygon, typename PrefixPolicy>
-struct wkt_poly
-{
- template <typename Char, typename Traits>
- static inline void apply(std::basic_ostream<Char, Traits>& os,
- Polygon const& poly)
- {
- typedef typename ring_type<Polygon const>::type ring;
-
- os << PrefixPolicy::apply();
- // TODO: check EMPTY here
- os << "(";
- wkt_sequence<ring>::apply(os, exterior_ring(poly));
-
- typename interior_return_type<Polygon const>::type rings
- = interior_rings(poly);
- for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
- {
- os << ",";
- wkt_sequence<ring>::apply(os, *it);
- }
- os << ")";
- }
-};
-
-
-template <typename Box>
-struct wkt_box
-{
- typedef typename point_type<Box>::type point_type;
-
- template <typename Char, typename Traits>
- static inline void apply(std::basic_ostream<Char, Traits>& os,
- Box const& box)
- {
- // Convert to ring, then stream
- typedef model::ring<point_type> ring_type;
- ring_type ring;
- geometry::convert(box, ring);
- os << "POLYGON(";
- wkt_sequence<ring_type>::apply(os, ring);
- os << ")";
- }
-
- private:
-
- inline wkt_box()
- {
- // Only streaming of boxes with two dimensions is support, otherwise it is a polyhedron!
- //assert_dimension<B, 2>();
- }
-};
-
-
-template <typename Segment>
-struct wkt_segment
-{
- typedef typename point_type<Segment>::type point_type;
-
- template <typename Char, typename Traits>
- static inline void apply(std::basic_ostream<Char, Traits>& os,
- Segment const& segment)
- {
- // Convert to two points, then stream
- typedef boost::array<point_type, 2> sequence;
-
- sequence points;
- geometry::detail::assign_point_from_index<0>(segment, points[0]);
- geometry::detail::assign_point_from_index<1>(segment, points[1]);
-
- // In Boost.Geometry a segment is represented
- // in WKT-format like (for 2D): LINESTRING(x y,x y)
- os << "LINESTRING";
- wkt_sequence<sequence>::apply(os, points);
- }
-
- private:
-
- inline wkt_segment()
- {}
-};
-
-}} // namespace detail::wkt
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename Tag, typename Geometry>
-struct wkt
-{
- BOOST_MPL_ASSERT_MSG
- (
- false, NOT_YET_IMPLEMENTED_FOR_THIS_GEOMETRY_TYPE
- , (types<Geometry>)
- );
-};
-
-
-template <typename Point>
-struct wkt<point_tag, Point>
- : detail::wkt::wkt_point
- <
- Point,
- detail::wkt::prefix_point
- >
-{};
-
-
-template <typename Linestring>
-struct wkt<linestring_tag, Linestring>
- : detail::wkt::wkt_range
- <
- Linestring,
- detail::wkt::prefix_linestring_par,
- detail::wkt::closing_parenthesis
- >
-{};
-
-
-/*!
-\brief Specialization to stream a box as WKT
-\details A "box" does not exist in WKT.
-It is therefore streamed as a polygon
-*/
-template <typename Box>
-struct wkt<box_tag, Box>
- : detail::wkt::wkt_box<Box>
-{};
-
-template <typename Segment>
-struct wkt<segment_tag, Segment>
- : detail::wkt::wkt_segment<Segment>
-{};
-
-
-/*!
-\brief Specialization to stream a ring as WKT
-\details A ring or "linear_ring" does not exist in WKT.
-A ring is equivalent to a polygon without inner rings
-It is therefore streamed as a polygon
-*/
-template <typename Ring>
-struct wkt<ring_tag, Ring>
- : detail::wkt::wkt_range
- <
- Ring,
- detail::wkt::prefix_ring_par_par,
- detail::wkt::double_closing_parenthesis
- >
-{};
-
-
-/*!
-\brief Specialization to stream polygon as WKT
-*/
-template <typename Polygon>
-struct wkt<polygon_tag, Polygon>
- : detail::wkt::wkt_poly
- <
- Polygon,
- detail::wkt::prefix_polygon
- >
-{};
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-/*!
-\brief Generic geometry template manipulator class, takes corresponding output class from traits class
-\ingroup wkt
-\details Stream manipulator, streams geometry classes as \ref WKT streams
-\par Example:
-Small example showing how to use the wkt class
-\dontinclude doxygen_1.cpp
-\skip example_as_wkt_point
-\line {
-\until }
-*/
-template <typename Geometry>
-class wkt_manipulator
-{
-public:
-
- inline wkt_manipulator(Geometry const& g)
- : m_geometry(g)
- {}
-
- template <typename Char, typename Traits>
- inline friend std::basic_ostream<Char, Traits>& operator<<(
- std::basic_ostream<Char, Traits>& os,
- wkt_manipulator const& m)
- {
- dispatch::wkt
- <
- typename tag<Geometry>::type,
- Geometry
- >::apply(os, m.m_geometry);
- os.flush();
- return os;
- }
-
-private:
- Geometry const& m_geometry;
-};
-
-/*!
-\brief Main WKT-streaming function
-\ingroup wkt
-\par Example:
-Small example showing how to use the wkt helper function
-\dontinclude doxygen_1.cpp
-\skip example_as_wkt_vector
-\line {
-\until }
-*/
-template <typename Geometry>
-inline wkt_manipulator<Geometry> wkt(Geometry const& geometry)
-{
- concept::check<Geometry const>();
-
- return wkt_manipulator<Geometry>(geometry);
-}
-
-}} // namespace boost::geometry
-
-#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_HPP

Deleted: trunk/boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp
==============================================================================
--- trunk/boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
+++ (empty file)
@@ -1,117 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2007-2011 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2011 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2011 Mateusz Loskot, London, UK.
-
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
-// (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
-
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_MULTI_HPP
-#define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_MULTI_HPP
-
-
-
-#include <boost/geometry/multi/core/tags.hpp>
-
-#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
-#include <boost/geometry/domains/gis/io/wkt/detail/wkt_multi.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace wkt
-{
-
-
-template <typename Multi, typename StreamPolicy, typename PrefixPolicy>
-struct wkt_multi
-{
- template <typename Char, typename Traits>
- static inline void apply(std::basic_ostream<Char, Traits>& os,
- Multi const& geometry)
- {
- os << PrefixPolicy::apply();
- // TODO: check EMPTY here
- os << "(";
-
- for (typename boost::range_iterator<Multi const>::type
- it = boost::begin(geometry);
- it != boost::end(geometry);
- ++it)
- {
- if (it != boost::begin(geometry))
- {
- os << ",";
- }
- StreamPolicy::apply(os, *it);
- }
-
- os << ")";
- }
-};
-
-}} // namespace wkt::impl
-#endif
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-
-template <typename Multi>
-struct wkt<multi_point_tag, Multi>
- : detail::wkt::wkt_multi
- <
- Multi,
- detail::wkt::wkt_point
- <
- typename boost::range_value<Multi>::type,
- detail::wkt::prefix_null
- >,
- detail::wkt::prefix_multipoint
- >
-{};
-
-
-template <typename Multi>
-struct wkt<multi_linestring_tag, Multi>
- : detail::wkt::wkt_multi
- <
- Multi,
- detail::wkt::wkt_sequence
- <
- typename boost::range_value<Multi>::type
- >,
- detail::wkt::prefix_multilinestring
- >
-{};
-
-
-template <typename Multi>
-struct wkt<multi_polygon_tag, Multi>
- : detail::wkt::wkt_multi
- <
- Multi,
- detail::wkt::wkt_poly
- <
- typename boost::range_value<Multi>::type,
- detail::wkt::prefix_null
- >,
- detail::wkt::prefix_multipolygon
- >
-{};
-
-} // namespace dispatch
-#endif
-
-}} // namespace boost::geometry
-
-#endif // BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_WRITE_WKT_MULTI_HPP

Modified: trunk/boost/geometry/extensions/gis/io/wkt/read_wkt.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/io/wkt/read_wkt.hpp (original)
+++ trunk/boost/geometry/extensions/gis/io/wkt/read_wkt.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -22,7 +22,7 @@
#endif

-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

namespace boost { namespace geometry

Modified: trunk/boost/geometry/extensions/gis/io/wkt/stream_wkt.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/io/wkt/stream_wkt.hpp (original)
+++ trunk/boost/geometry/extensions/gis/io/wkt/stream_wkt.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -14,7 +14,7 @@
#ifndef BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_STREAM_WKT_HPP
#define BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_STREAM_WKT_HPP

-#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>

// This short file contains only one manipulator, streaming as WKT
// Don't move contents to as_wkt, developers must be able to choose how to stream

Modified: trunk/boost/geometry/extensions/gis/io/wkt/wkt.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/io/wkt/wkt.hpp (original)
+++ trunk/boost/geometry/extensions/gis/io/wkt/wkt.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -22,11 +22,11 @@
#endif

-#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/read.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
-#include <boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write_multi.hpp>

#endif // BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_WKT_HPP

Modified: trunk/boost/geometry/extensions/gis/io/wkt/write_wkt.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/io/wkt/write_wkt.hpp (original)
+++ trunk/boost/geometry/extensions/gis/io/wkt/write_wkt.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -22,7 +22,7 @@
#endif

-#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>

Modified: trunk/libs/geometry/example/06_b_transformation_example.cpp
==============================================================================
--- trunk/libs/geometry/example/06_b_transformation_example.cpp (original)
+++ trunk/libs/geometry/example/06_b_transformation_example.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -21,7 +21,7 @@
#include <boost/geometry/algorithms/centroid.hpp>
#include <boost/geometry/strategies/transform.hpp>
#include <boost/geometry/strategies/transform/matrix_transformers.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

#if defined(HAVE_SVG)
# include <boost/geometry/extensions/io/svg/write_svg.hpp>

Modified: trunk/libs/geometry/example/07_a_graph_route_example.cpp
==============================================================================
--- trunk/libs/geometry/example/07_a_graph_route_example.cpp (original)
+++ trunk/libs/geometry/example/07_a_graph_route_example.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -25,7 +25,7 @@

#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/linestring.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

// Yes, this example currently uses some extensions:

Modified: trunk/libs/geometry/example/07_b_graph_route_example.cpp
==============================================================================
--- trunk/libs/geometry/example/07_b_graph_route_example.cpp (original)
+++ trunk/libs/geometry/example/07_b_graph_route_example.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -29,7 +29,7 @@

#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/linestring.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

// Yes, this example currently uses some extensions:

Modified: trunk/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -23,8 +23,8 @@
#include <boost/geometry/geometries/register/ring.hpp>
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/extensions/algorithms/selected.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>

// wxWidgets, if these headers are NOT found, adapt include path (and lib path)

Modified: trunk/libs/geometry/example_extensions/gis/projections/p03_projmap_example.cpp
==============================================================================
--- trunk/libs/geometry/example_extensions/gis/projections/p03_projmap_example.cpp (original)
+++ trunk/libs/geometry/example_extensions/gis/projections/p03_projmap_example.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -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/domains/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
#include <boost/geometry/extensions/gis/projections/project_transformer.hpp>

Modified: trunk/libs/geometry/test/algorithms/correct.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/correct.cpp (original)
+++ trunk/libs/geometry/test/algorithms/correct.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -21,8 +21,8 @@

#include <boost/geometry/io/dsv/write.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/read.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>

#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/box.hpp>

Modified: trunk/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp (original)
+++ trunk/libs/geometry/test/algorithms/detail/sections/sectionalize.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -23,8 +23,8 @@
#include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.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/read.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>

#include <test_common/test_point.hpp>

Modified: trunk/libs/geometry/test/algorithms/disjoint.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/disjoint.cpp (original)
+++ trunk/libs/geometry/test/algorithms/disjoint.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -21,7 +21,7 @@
#include <boost/geometry/algorithms/disjoint.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/strategies/strategies.hpp>

#include <test_common/test_point.hpp>

Modified: trunk/libs/geometry/test/algorithms/make.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/make.cpp (original)
+++ trunk/libs/geometry/test/algorithms/make.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -17,7 +17,7 @@

#include <boost/geometry/algorithms/make.hpp>

-#include <boost/geometry/domains/gis/io/wkt/write_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>

#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array.hpp>

Modified: trunk/libs/geometry/test/algorithms/overlay/assemble.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/assemble.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/assemble.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -28,8 +28,8 @@

#include <boost/geometry/strategies/strategies.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/read.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>

Modified: trunk/libs/geometry/test/algorithms/overlay/dissolver.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/dissolver.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/dissolver.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -19,7 +19,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
#include <boost/geometry/extensions/io/svg/write_svg_multi.hpp>

Modified: trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/get_turns.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -29,8 +29,8 @@

#include <boost/geometry/geometries/geometries.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/read.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>

#if defined(TEST_WITH_SVG)
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>

Modified: trunk/libs/geometry/test/algorithms/overlay/overlay_common.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/overlay_common.hpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/overlay_common.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -25,8 +25,8 @@
#include <boost/geometry/geometries/adapted/boost_tuple.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/read.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>

#if defined(TEST_WITH_SVG)

Modified: trunk/libs/geometry/test/algorithms/overlay/select_rings.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/select_rings.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/select_rings.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -18,7 +18,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

#include <boost/assign/list_of.hpp>
#include <boost/foreach.hpp>

Modified: trunk/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/self_intersection_points.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -28,8 +28,8 @@

#include <boost/geometry/strategies/strategies.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/read.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>

Modified: trunk/libs/geometry/test/algorithms/overlay/split_rings.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/split_rings.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/split_rings.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -25,8 +25,8 @@

#include <boost/geometry/strategies/strategies.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/read.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>

#if defined(TEST_WITH_SVG)

Modified: trunk/libs/geometry/test/algorithms/overlay/traverse.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/traverse.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/traverse.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -51,8 +51,8 @@

#include <boost/geometry/geometries/geometries.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/read.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>

#if defined(TEST_WITH_SVG)

Modified: trunk/libs/geometry/test/algorithms/test_area.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_area.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_area.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -17,7 +17,7 @@
#include <boost/geometry/algorithms/correct.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.hpp>

template <typename Geometry>

Modified: trunk/libs/geometry/test/algorithms/test_centroid.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_centroid.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_centroid.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -18,7 +18,7 @@
#include <boost/geometry/algorithms/distance.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

template <std::size_t D>

Modified: trunk/libs/geometry/test/algorithms/test_convex_hull.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_convex_hull.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_convex_hull.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -17,8 +17,8 @@

#include <boost/geometry/strategies/strategies.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/read.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>

#include <boost/geometry/geometries/polygon.hpp>

Modified: trunk/libs/geometry/test/algorithms/test_covered_by.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_covered_by.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_covered_by.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -19,7 +19,7 @@
#include <boost/geometry/geometries/ring.hpp>
#include <boost/geometry/geometries/polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

template <typename Geometry1, typename Geometry2>

Modified: trunk/libs/geometry/test/algorithms/test_distance.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_distance.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_distance.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -12,7 +12,7 @@
#include <geometry_test_common.hpp>

#include <boost/geometry/algorithms/distance.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/strategies/strategies.hpp>

Modified: trunk/libs/geometry/test/algorithms/test_envelope.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_envelope.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_envelope.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/geometries/box.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.hpp>

template<typename Box, std::size_t DimensionCount>

Modified: trunk/libs/geometry/test/algorithms/test_equals.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_equals.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_equals.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/algorithms/equals.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.hpp>

template <typename Geometry1, typename Geometry2>

Modified: trunk/libs/geometry/test/algorithms/test_expand.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_expand.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_expand.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -14,7 +14,7 @@

#include <boost/geometry/algorithms/expand.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.hpp>
#include <boost/geometry/algorithms/assign.hpp>
#include <boost/geometry/io/dsv/write.hpp>

Modified: trunk/libs/geometry/test/algorithms/test_intersects.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_intersects.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_intersects.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -18,7 +18,7 @@
#include <boost/geometry/geometries/ring.hpp>
#include <boost/geometry/geometries/polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

template <typename Geometry1, typename Geometry2>

Modified: trunk/libs/geometry/test/algorithms/test_length.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_length.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_length.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -12,7 +12,7 @@
#include <geometry_test_common.hpp>

#include <boost/geometry/algorithms/length.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/strategies/strategies.hpp>

Modified: trunk/libs/geometry/test/algorithms/test_overlaps.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_overlaps.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_overlaps.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -18,7 +18,7 @@
#include <boost/geometry/geometries/ring.hpp>
#include <boost/geometry/geometries/polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

template <typename Geometry1, typename Geometry2>

Modified: trunk/libs/geometry/test/algorithms/test_perimeter.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_perimeter.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_perimeter.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -16,7 +16,7 @@
#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

template <typename Geometry>

Modified: trunk/libs/geometry/test/algorithms/test_within.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_within.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_within.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -19,7 +19,7 @@
#include <boost/geometry/geometries/ring.hpp>
#include <boost/geometry/geometries/polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

#include <boost/geometry/strategies/cartesian/point_in_box.hpp>
#include <boost/geometry/strategies/cartesian/box_in_box.hpp>

Modified: trunk/libs/geometry/test/core/ring.cpp
==============================================================================
--- trunk/libs/geometry/test/core/ring.cpp (original)
+++ trunk/libs/geometry/test/core/ring.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -27,7 +27,7 @@
#include <boost/geometry/geometries/polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

Modified: trunk/libs/geometry/test/domains/gis/io/wkt/multi_wkt.cpp
==============================================================================
--- trunk/libs/geometry/test/domains/gis/io/wkt/multi_wkt.cpp (original)
+++ trunk/libs/geometry/test/domains/gis/io/wkt/multi_wkt.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -35,8 +35,8 @@
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
-#include <boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write_multi.hpp>

template <typename T>

Modified: trunk/libs/geometry/test/domains/gis/io/wkt/wkt.cpp
==============================================================================
--- trunk/libs/geometry/test/domains/gis/io/wkt/wkt.cpp (original)
+++ trunk/libs/geometry/test/domains/gis/io/wkt/wkt.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -30,8 +30,8 @@
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/core/point_type.hpp>
#include <boost/geometry/core/topological_dimension.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/read.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>

template <typename G>

Modified: trunk/libs/geometry/test/iterators/closing_iterator.cpp
==============================================================================
--- trunk/libs/geometry/test/iterators/closing_iterator.cpp (original)
+++ trunk/libs/geometry/test/iterators/closing_iterator.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -22,7 +22,7 @@
#include <boost/geometry/iterators/closing_iterator.hpp>

#include <boost/geometry/core/coordinate_type.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>

Modified: trunk/libs/geometry/test/iterators/ever_circling_iterator.cpp
==============================================================================
--- trunk/libs/geometry/test/iterators/ever_circling_iterator.cpp (original)
+++ trunk/libs/geometry/test/iterators/ever_circling_iterator.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -20,7 +20,7 @@
#include <boost/geometry/iterators/ever_circling_iterator.hpp>

#include <boost/geometry/core/coordinate_type.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>

Modified: trunk/libs/geometry/test/multi/algorithms/multi_centroid.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_centroid.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_centroid.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -25,7 +25,7 @@
#include <boost/geometry/multi/geometries/multi_point.hpp>
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>

// #define REPORT_RESULTS

Modified: trunk/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -21,7 +21,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

#include <boost/geometry/multi/core/point_order.hpp>
#include <boost/geometry/multi/core/point_type.hpp>

Modified: trunk/libs/geometry/test/multi/algorithms/multi_difference.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_difference.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_difference.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -26,7 +26,7 @@
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>

template <typename Ring, typename Polygon, typename MultiPolygon>
void test_areal()

Modified: trunk/libs/geometry/test/multi/algorithms/multi_distance.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_distance.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_distance.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -11,7 +11,7 @@
#include <geometry_test_common.hpp>

#include <boost/geometry/algorithms/distance.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

#include <boost/geometry/strategies/strategies.hpp>

@@ -20,7 +20,7 @@
#include <boost/geometry/multi/geometries/multi_point.hpp>
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>

#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>

Modified: trunk/libs/geometry/test/multi/algorithms/multi_envelope.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_envelope.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_envelope.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -21,7 +21,7 @@
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>

#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>

Modified: trunk/libs/geometry/test/multi/algorithms/multi_equals.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_equals.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_equals.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -15,7 +15,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>

Modified: trunk/libs/geometry/test/multi/algorithms/multi_intersection.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_intersection.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_intersection.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -25,7 +25,7 @@
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>

template <typename Ring, typename Polygon, typename MultiPolygon>
void test_areal()

Modified: trunk/libs/geometry/test/multi/algorithms/multi_transform.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_transform.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_transform.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -29,7 +29,7 @@
#include <boost/geometry/multi/geometries/multi_polygon.hpp>

#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>

// This test is a little different from transform.cpp test.

Modified: trunk/libs/geometry/test/multi/algorithms/multi_union.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_union.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_union.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -23,7 +23,7 @@
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>

template <typename Ring, typename Polygon, typename MultiPolygon>

Modified: trunk/libs/geometry/test/multi/algorithms/overlay/multi_overlay_common.hpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/overlay/multi_overlay_common.hpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/overlay/multi_overlay_common.hpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -15,7 +15,7 @@
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
//#include <boost/geometry/multi/io/svg/write_svg.hpp>

Modified: trunk/libs/geometry/test/multi/algorithms/overlay/multi_traverse.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/overlay/multi_traverse.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/overlay/multi_traverse.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -34,7 +34,7 @@

#include <boost/geometry/multi/views/detail/range_type.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>

#include "multi_overlay_cases.hpp"

Modified: trunk/libs/geometry/test/strategies/projected_point.cpp
==============================================================================
--- trunk/libs/geometry/test/strategies/projected_point.cpp (original)
+++ trunk/libs/geometry/test/strategies/projected_point.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -18,7 +18,7 @@
#include <boost/geometry/strategies/cartesian/distance_projected_point.hpp>
#include <boost/geometry/strategies/concepts/distance_concept.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

#include <boost/geometry/geometries/point.hpp>

Modified: trunk/libs/geometry/test/util/as_range.cpp
==============================================================================
--- trunk/libs/geometry/test/util/as_range.cpp (original)
+++ trunk/libs/geometry/test/util/as_range.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -22,7 +22,7 @@
#include <boost/geometry/core/cs.hpp>
#include <boost/geometry/geometries/geometries.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

template <int D, typename Range>
double sum(Range const& range)

Modified: trunk/libs/geometry/test/util/write_dsv.cpp
==============================================================================
--- trunk/libs/geometry/test/util/write_dsv.cpp (original)
+++ trunk/libs/geometry/test/util/write_dsv.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -22,7 +22,7 @@

#include <boost/geometry/geometries/geometries.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

Modified: trunk/libs/geometry/test/views/box_view.cpp
==============================================================================
--- trunk/libs/geometry/test/views/box_view.cpp (original)
+++ trunk/libs/geometry/test/views/box_view.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -17,7 +17,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/views/box_view.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

Modified: trunk/libs/geometry/test/views/closeable_view.cpp
==============================================================================
--- trunk/libs/geometry/test/views/closeable_view.cpp (original)
+++ trunk/libs/geometry/test/views/closeable_view.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -16,7 +16,7 @@

#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.hpp>
#include <boost/geometry/io/dsv/write.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>

Modified: trunk/libs/geometry/test/views/reversible_closeable.cpp
==============================================================================
--- trunk/libs/geometry/test/views/reversible_closeable.cpp (original)
+++ trunk/libs/geometry/test/views/reversible_closeable.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -18,7 +18,7 @@
#include <boost/geometry/views/closeable_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.hpp>
#include <boost/geometry/io/dsv/write.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>

Modified: trunk/libs/geometry/test/views/segment_view.cpp
==============================================================================
--- trunk/libs/geometry/test/views/segment_view.cpp (original)
+++ trunk/libs/geometry/test/views/segment_view.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -17,7 +17,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/views/segment_view.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

Modified: trunk/libs/geometry/test_extensions/algorithms/connect.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/connect.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/connect.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -19,7 +19,7 @@
#include <boost/geometry/algorithms/num_points.hpp>
#include <boost/geometry/algorithms/unique.hpp>
#include <boost/geometry/extensions/algorithms/connect.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
#include <boost/geometry/multi/algorithms/area.hpp>
#include <boost/geometry/multi/algorithms/length.hpp>
#include <boost/geometry/multi/algorithms/num_points.hpp>

Modified: trunk/libs/geometry/test_extensions/algorithms/is_convex.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/is_convex.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/is_convex.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -24,8 +24,8 @@
#include <boost/geometry/algorithms/area.hpp>
#include <boost/geometry/algorithms/num_points.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/read.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write.hpp>

#include <boost/geometry/strategies/strategies.hpp>

Modified: trunk/libs/geometry/test_extensions/algorithms/offset.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/offset.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/offset.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -19,7 +19,7 @@
#include <boost/geometry/algorithms/num_points.hpp>
#include <boost/geometry/algorithms/unique.hpp>
#include <boost/geometry/extensions/algorithms/offset.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>

#include <boost/geometry/strategies/strategies.hpp>

Modified: trunk/libs/geometry/test_extensions/algorithms/remove_holes_if.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/remove_holes_if.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/remove_holes_if.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -24,7 +24,7 @@
#include <boost/geometry/algorithms/make.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

#include <boost/geometry/strategies/strategies.hpp>

Modified: trunk/libs/geometry/test_extensions/algorithms/selected.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/algorithms/selected.cpp (original)
+++ trunk/libs/geometry/test_extensions/algorithms/selected.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -24,7 +24,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/extensions/algorithms/selected.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

template <typename G, typename P>

Modified: trunk/libs/geometry/test_extensions/gis/io/wkb/read_wkb.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/gis/io/wkb/read_wkb.cpp (original)
+++ trunk/libs/geometry/test_extensions/gis/io/wkb/read_wkb.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -18,7 +18,7 @@

#include <boost/geometry/algorithms/equals.hpp>
#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/extensions/gis/io/wkb/read_wkb.hpp>
#include <boost/geometry/extensions/gis/io/wkb/utility.hpp>

Modified: trunk/libs/geometry/test_extensions/iterators/segment_returning_iterator.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/iterators/segment_returning_iterator.cpp (original)
+++ trunk/libs/geometry/test_extensions/iterators/segment_returning_iterator.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -21,7 +21,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/segment.hpp>
#include <boost/geometry/extensions/iterators/segment_returning_iterator.hpp>
-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

template <typename C>
void test_linestring(std::string const& wkt, std::string const& expected)

Modified: trunk/libs/geometry/test_extensions/nsphere/within.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/nsphere/within.cpp (original)
+++ trunk/libs/geometry/test_extensions/nsphere/within.cpp 2011-10-20 19:20:05 EDT (Thu, 20 Oct 2011)
@@ -14,7 +14,7 @@

#include <boost/geometry/strategies/strategies.hpp>

-#include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read.hpp>

template <typename Geometry>

Next message: eric_at_[hidden]: "[Boost-commit] svn:boost r75077 - in trunk: boost libs/foreach/test"
Previous message: mateusz_at_[hidden]: "[Boost-commit] svn:boost r75075 - trunk/boost/geometry/io/dsv"

Date view	Thread view	Subject view	Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk