boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-11 21:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved wkt, phase 3, in debug-defines

Browse Source 
Moved parse to extensions

[SVN r69908]
This commit is contained in:
Barend Gehrels 2011-03-13 00:18:21 +00:00
parent d7bc400caf
commit 571790def4
8 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp
View File

@ -18,7 +18,7 @@
#ifdef BOOST_GEOMETRY_DEBUG_ENRICH #ifdef BOOST_GEOMETRY_DEBUG_ENRICH
# include <iostream> # include <iostream>
# include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp> # 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 # define BOOST_GEOMETRY_DEBUG_IDENTIFIER
#endif #endif

8
include/boost/geometry/algorithms/detail/overlay/traverse.hpp
View File

@ -23,7 +23,7 @@
#if defined(BOOST_GEOMETRY_DEBUG_INTERSECTION) || defined(BOOST_GEOMETRY_OVERLAY_REPORT_WKT) #if defined(BOOST_GEOMETRY_DEBUG_INTERSECTION) || defined(BOOST_GEOMETRY_OVERLAY_REPORT_WKT)
# include <string> # include <string>
# include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp> # 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 #endif
@ -40,8 +40,8 @@ template <typename Turn, typename Operation>
inline void debug_traverse(Turn const& turn, Operation op, std::string const& header) inline void debug_traverse(Turn const& turn, Operation op, std::string const& header)
{ {
#ifdef BOOST_GEOMETRY_DEBUG_TRAVERSE #ifdef BOOST_GEOMETRY_DEBUG_TRAVERSE
std::cout << header std::cout << header
<< " at " << op.seg_id << " at " << op.seg_id
<< " op: " << operation_char(op.operation) << " op: " << operation_char(op.operation)
<< " vis: " << visited_char(op.visited) << " vis: " << visited_char(op.visited)
<< " of: " << operation_char(turn.operations[0].operation) << " of: " << operation_char(turn.operations[0].operation)
@ -220,7 +220,7 @@ inline bool select_next_ip(operation_type operation,
debug_traverse(turn, *selected, " Accepted"); debug_traverse(turn, *selected, " Accepted");
} }
return has_tp; return has_tp;
} }

8
include/boost/geometry/domains/gis/io/io.hpp
View File

@ -9,11 +9,11 @@
#define BOOST_GEOMETRY_DOMAINS_GIS_IO_HPP #define BOOST_GEOMETRY_DOMAINS_GIS_IO_HPP
#include <boost/geometry/extensions/gis/io/wkt/read_wkt.hpp> #include <boost/geometry/domains/gis/io/wkt/read_wkt.hpp>
#include <boost/geometry/extensions/gis/io/wkt/write_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/domains/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/write_wkt_multi.hpp>
namespace boost { namespace geometry namespace boost { namespace geometry
{ {

2
include/boost/geometry/extensions/algorithms/detail/overlay/split_rings.hpp
View File

@ -31,7 +31,7 @@
#if defined(BOOST_GEOMETRY_DEBUG_SPLIT_RINGS) || defined(BOOST_GEOMETRY_CHECK_SPLIT_RINGS) #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 #endif

7
include/boost/geometry/algorithms/parse.hpp → include/boost/geometry/extensions/algorithms/parse.hpp
View File

@ -6,8 +6,8 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#ifndef BOOST_GEOMETRY_ALGORITHMS_PARSE_HPP #ifndef BOOST_GEOMETRY_EXTENSIONS_ALGORITHMS_PARSE_HPP
#define BOOST_GEOMETRY_ALGORITHMS_PARSE_HPP #define BOOST_GEOMETRY_EXTENSIONS_ALGORITHMS_PARSE_HPP
#include <string> #include <string>
@ -17,7 +17,6 @@
#include <boost/geometry/geometries/concepts/check.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> #include <boost/geometry/extensions/gis/geographic/strategies/dms_parser.hpp>
@ -116,4 +115,4 @@ inline Geometry parse(std::string const& c1, std::string const& c2)
}} // namespace boost::geometry }} // namespace boost::geometry
#endif // BOOST_GEOMETRY_ALGORITHMS_PARSE_HPP #endif // BOOST_GEOMETRY_EXTENSIONS_ALGORITHMS_PARSE_HPP

7
include/boost/geometry/extensions/gis/io/shapelib/shape_creator.hpp
View File

@ -15,7 +15,8 @@
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/type_traits/promote.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.hpp>
#include <boost/geometry/extensions/gis/io/shapelib/shp_create_object_multi.hpp> #include <boost/geometry/extensions/gis/io/shapelib/shp_create_object_multi.hpp>
#include <boost/geometry/extensions/gis/io/shapelib/dbf_write_attribute.hpp> #include <boost/geometry/extensions/gis/io/shapelib/dbf_write_attribute.hpp>
@ -30,7 +31,7 @@ class shapelib_file_create_exception : public geometry::exception
{ {
public: public:
inline shapelib_file_create_exception(std::string const& filename) inline shapelib_file_create_exception(std::string const& filename)
: m_filename(filename) : m_filename(filename)
{} {}
@ -107,7 +108,7 @@ public :
template <typename T> template <typename T>
inline void AddField(std::string const& name, int width = 16, int decimals = 0) 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 detail::DBFFieldType
< <
typename boost::promote<T>::type typename boost::promote<T>::type

2
include/boost/geometry/extensions/gis/io/wkt/stream_wkt.hpp
View File

@ -8,7 +8,7 @@
#ifndef BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_STREAM_WKT_HPP #ifndef BOOST_GEOMETRY_EXTENSIONS_GIS_IO_WKT_STREAM_WKT_HPP
#define 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 // 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 // Don't move contents to as_wkt, developers must be able to choose how to stream

2
include/boost/geometry/extensions/gis/io/wkt/wkt.hpp
View File

@ -1,6 +1,6 @@
// Boost.Geometry (aka GGL, Generic Geometry Library) // 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, // Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)