Subject: [Boost-commit] svn:boost r69908 - in trunk/boost/geometry: algorithms algorithms/detail/overlay domains/gis/io extensions/algorithms extensions/algorithms/detail/overlay extensions/gis/io/shapelib extensions/gis/io/wkt
From: barend.gehrels_at_[hidden]
Date: 2011-03-12 19:18:25
Author: barendgehrels
Date: 2011-03-12 19:18:21 EST (Sat, 12 Mar 2011)
New Revision: 69908
URL: http://svn.boost.org/trac/boost/changeset/69908
Log:
Moved wkt, phase 3, in debug-defines
Moved parse to extensions
Added:
trunk/boost/geometry/extensions/algorithms/parse.hpp
- copied, changed from r69889, /trunk/boost/geometry/algorithms/parse.hpp
Removed:
trunk/boost/geometry/algorithms/parse.hpp
Text files modified:
trunk/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp | 2 +-
trunk/boost/geometry/algorithms/detail/overlay/traverse.hpp | 8 ++++----
trunk/boost/geometry/domains/gis/io/io.hpp | 8 ++++----
trunk/boost/geometry/extensions/algorithms/detail/overlay/split_rings.hpp | 2 +-
trunk/boost/geometry/extensions/algorithms/parse.hpp | 7 +++----
trunk/boost/geometry/extensions/gis/io/shapelib/shape_creator.hpp | 7 ++++---
trunk/boost/geometry/extensions/gis/io/wkt/stream_wkt.hpp | 2 +-
trunk/boost/geometry/extensions/gis/io/wkt/wkt.hpp | 2 +-
8 files changed, 19 insertions(+), 19 deletions(-)
Modified: trunk/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp (original)
+++ trunk/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp 2011-03-12 19:18:21 EST (Sat, 12 Mar 2011)
@@ -18,7 +18,7 @@
#ifdef BOOST_GEOMETRY_DEBUG_ENRICH
# include <iostream>
# include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
-# include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+# include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
# define BOOST_GEOMETRY_DEBUG_IDENTIFIER
#endif
Modified: trunk/boost/geometry/algorithms/detail/overlay/traverse.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/overlay/traverse.hpp (original)
+++ trunk/boost/geometry/algorithms/detail/overlay/traverse.hpp 2011-03-12 19:18:21 EST (Sat, 12 Mar 2011)
@@ -23,7 +23,7 @@
#if defined(BOOST_GEOMETRY_DEBUG_INTERSECTION) || defined(BOOST_GEOMETRY_OVERLAY_REPORT_WKT)
# include <string>
# include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
-# include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+# include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#endif
@@ -40,8 +40,8 @@
inline void debug_traverse(Turn const& turn, Operation op, std::string const& header)
{
#ifdef BOOST_GEOMETRY_DEBUG_TRAVERSE
- std::cout << header
- << " at " << op.seg_id
+ std::cout << header
+ << " at " << op.seg_id
<< " op: " << operation_char(op.operation)
<< " vis: " << visited_char(op.visited)
<< " of: " << operation_char(turn.operations[0].operation)
@@ -220,7 +220,7 @@
debug_traverse(turn, *selected, " Accepted");
}
-
+
return has_tp;
}
Deleted: trunk/boost/geometry/algorithms/parse.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/parse.hpp 2011-03-12 19:18:21 EST (Sat, 12 Mar 2011)
+++ (empty file)
@@ -1,119 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Bruno Lalande 2008, 2009
-// Copyright Barend Gehrels 2007-2009, 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_ALGORITHMS_PARSE_HPP
-#define BOOST_GEOMETRY_ALGORITHMS_PARSE_HPP
-
-#include <string>
-
-
-#include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/strategies/parse.hpp>
-
-#include <boost/geometry/geometries/concepts/check.hpp>
-
-// TODO: remove used EXTENSION here (result should be part of parsing strategy)
-#include <boost/geometry/extensions/gis/geographic/strategies/dms_parser.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail
-{
-
-} // namespace detail
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-template <typename Tag, typename G>
-struct parsing
-{
-};
-
-template <typename Point>
-struct parsing<point_tag, Point>
-{
- template <typename S>
- static inline void parse(Point& point, std::string const& c1, std::string const& c2, S const& strategy)
- {
- assert_dimension<Point, 2>();
- dms_result r1 = strategy(c1.c_str());
- dms_result r2 = strategy(c2.c_str());
-
- if (0 == r1.axis())
- set<0>(point, r1);
- else
- set<1>(point, r1);
-
- if (0 == r2.axis())
- set<0>(point, r2);
- else
- set<1>(point, r2);
- }
-
- static inline void parse(Point& point, std::string const& c1, std::string const& c2)
- {
- // strategy-parser corresponding to degree/radian
- typename strategy_parse
- <
- typename cs_tag<Point>::type,
- typename coordinate_system<Point>::type
- >::type strategy;
-
- parse(point, c1, c2, strategy);
- }
-};
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-/*!
- \brief parse two strings to a spherical/geographic point, using W/E/N/S
- \ingroup parse
- */
-template <typename Geometry>
-inline void parse(Geometry& geometry, std::string const& c1, std::string const& c2)
-{
- concept::check<Geometry>();
- dispatch::parsing<typename tag<Geometry>::type, Geometry>::parse(geometry, c1, c2);
-}
-
-/*!
- \brief parse two strings to a spherical/geographic point, using a specified strategy
- \details user can use N/E/S/O or N/O/Z/W or other formats
- \ingroup parse
- */
-template <typename Geometry, typename S>
-inline void parse(Geometry& geometry, std::string const& c1,
- std::string const& c2, S const& strategy)
-{
- concept::check<Geometry>();
- dispatch::parsing<typename tag<Geometry>::type, Geometry>::parse(geometry, c1, c2, strategy);
-}
-
-// There will be a parsing function with three arguments (ANGLE,ANGLE,RADIUS)
-
-template <typename Geometry>
-inline Geometry parse(std::string const& c1, std::string const& c2)
-{
- concept::check<Geometry>();
-
- Geometry geometry;
- dispatch::parsing<typename tag<Geometry>::type, Geometry>::parse(geometry, c1, c2);
- return geometry;
-}
-
-}} // namespace boost::geometry
-
-#endif // BOOST_GEOMETRY_ALGORITHMS_PARSE_HPP
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-03-12 19:18:21 EST (Sat, 12 Mar 2011)
@@ -9,11 +9,11 @@
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_HPP
-#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/write_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/extensions/gis/io/wkt/read_wkt_multi.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/write_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/read_wkt_multi.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write_wkt_multi.hpp>
namespace boost { namespace geometry
{
Modified: trunk/boost/geometry/extensions/algorithms/detail/overlay/split_rings.hpp
==============================================================================
--- trunk/boost/geometry/extensions/algorithms/detail/overlay/split_rings.hpp (original)
+++ trunk/boost/geometry/extensions/algorithms/detail/overlay/split_rings.hpp 2011-03-12 19:18:21 EST (Sat, 12 Mar 2011)
@@ -31,7 +31,7 @@
#if defined(BOOST_GEOMETRY_DEBUG_SPLIT_RINGS) || defined(BOOST_GEOMETRY_CHECK_SPLIT_RINGS)
-# include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+# include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#endif
Copied: trunk/boost/geometry/extensions/algorithms/parse.hpp (from r69889, /trunk/boost/geometry/algorithms/parse.hpp)
==============================================================================
--- /trunk/boost/geometry/algorithms/parse.hpp (original)
+++ trunk/boost/geometry/extensions/algorithms/parse.hpp 2011-03-12 19:18:21 EST (Sat, 12 Mar 2011)
@@ -6,8 +6,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_ALGORITHMS_PARSE_HPP
-#define BOOST_GEOMETRY_ALGORITHMS_PARSE_HPP
+#ifndef BOOST_GEOMETRY_EXTENSIONS_ALGORITHMS_PARSE_HPP
+#define BOOST_GEOMETRY_EXTENSIONS_ALGORITHMS_PARSE_HPP
#include <string>
@@ -17,7 +17,6 @@
#include <boost/geometry/geometries/concepts/check.hpp>
-// TODO: remove used EXTENSION here (result should be part of parsing strategy)
#include <boost/geometry/extensions/gis/geographic/strategies/dms_parser.hpp>
@@ -116,4 +115,4 @@
}} // namespace boost::geometry
-#endif // BOOST_GEOMETRY_ALGORITHMS_PARSE_HPP
+#endif // BOOST_GEOMETRY_EXTENSIONS_ALGORITHMS_PARSE_HPP
Modified: trunk/boost/geometry/extensions/gis/io/shapelib/shape_creator.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/io/shapelib/shape_creator.hpp (original)
+++ trunk/boost/geometry/extensions/gis/io/shapelib/shape_creator.hpp 2011-03-12 19:18:21 EST (Sat, 12 Mar 2011)
@@ -15,7 +15,8 @@
#include <boost/noncopyable.hpp>
#include <boost/type_traits/promote.hpp>
-#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
+
#include <boost/geometry/extensions/gis/io/shapelib/shp_create_object.hpp>
#include <boost/geometry/extensions/gis/io/shapelib/shp_create_object_multi.hpp>
#include <boost/geometry/extensions/gis/io/shapelib/dbf_write_attribute.hpp>
@@ -30,7 +31,7 @@
{
public:
- inline shapelib_file_create_exception(std::string const& filename)
+ inline shapelib_file_create_exception(std::string const& filename)
: m_filename(filename)
{}
@@ -107,7 +108,7 @@
template <typename T>
inline void AddField(std::string const& name, int width = 16, int decimals = 0)
{
- ::DBFAddField(m_dbf, name.c_str(),
+ ::DBFAddField(m_dbf, name.c_str(),
detail::DBFFieldType
<
typename boost::promote<T>::type
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-03-12 19:18:21 EST (Sat, 12 Mar 2011)
@@ -8,7 +8,7 @@
#ifndef BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_STREAM_WKT_HPP
#define BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_STREAM_WKT_HPP
-#include <boost/geometry/extensions/gis/io/wkt/write_wkt.hpp>
+#include <boost/geometry/domains/gis/io/wkt/write_wkt.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-03-12 19:18:21 EST (Sat, 12 Mar 2011)
@@ -1,6 +1,6 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
//
-// Copyright Barend Gehrels 2008-2009, Geodan, Amsterdam, the Netherlands.
+// Copyright Barend Gehrels 2011, 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)