boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-09 23:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Boost.Geometry:

Browse Source 
* Catch up with r75977 changes with new layout of IO formats in geometry/io/<FORMAT>/ 
* General maintenance in tests and examples.

[SVN r75979]
This commit is contained in:
Mateusz Loskot 2011-12-16 01:45:22 +00:00
parent ae3de0b902
commit 8fbb9b3655
152 changed files with 928 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/doxy/doxygen_input/sourcecode/doxygen_1.cpp
View File

@ -21,8 +21,7 @@ OBSOLETE
#include <boost/geometry/geometries/register/point.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
// All functions below are referred to in the documentation of Boost.Geometry
// Don't rename them.
@ -428,8 +427,6 @@ void example_point_ll_construct()
*/
}
int main(void)
{
example_area_polygon();

2
doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp
View File

@ -17,7 +17,7 @@ OBSOLETE
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/extensions/io/svg/write_svg_multi.hpp>
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>

2
doc/src/docutils/tools/implementation_status/implementation_status.hpp
View File

@ -10,5 +10,5 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/multi/geometries/multi_point.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>

2
doc/src/examples/algorithms/area.cpp
View File

@ -15,7 +15,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
namespace bg = boost::geometry; /*< Convenient namespace alias >*/

2
doc/src/examples/algorithms/area_with_strategy.cpp
View File

@ -15,7 +15,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
namespace bg = boost::geometry; /*< Convenient namespace alias >*/

2
doc/src/examples/algorithms/centroid.cpp
View File

@ -17,7 +17,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
/*<-*/ #include "create_svg_two.hpp" /*->*/
int main()

2
doc/src/examples/algorithms/difference.cpp
View File

@ -16,7 +16,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/foreach.hpp>
/*<-*/ #include "create_svg_overlay.hpp" /*->*/

2
doc/src/examples/algorithms/difference_inserter.cpp
View File

@ -16,7 +16,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/foreach.hpp>
/*<-*/ #include "create_svg_overlay.hpp" /*->*/

2
doc/src/examples/algorithms/distance.cpp
View File

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

2
doc/src/examples/algorithms/envelope.cpp
View File

@ -16,7 +16,7 @@
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
/*<-*/ #include "create_svg_two.hpp" /*->*/

2
doc/src/examples/algorithms/for_each_point.cpp
View File

@ -15,7 +15,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>

2
doc/src/examples/algorithms/for_each_point_const.cpp
View File

@ -15,7 +15,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
template <typename Point>

2
doc/src/examples/algorithms/intersection_ls_ls_point.cpp
View File

@ -14,7 +14,7 @@
#include <deque>
#include <boost/geometry.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/register/linestring.hpp>

2
doc/src/examples/algorithms/intersection_poly_poly.cpp
View File

@ -16,7 +16,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/foreach.hpp>
/*<-*/ #include "create_svg_overlay.hpp" /*->*/

2
doc/src/examples/algorithms/intersection_segment.cpp
View File

@ -14,7 +14,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/foreach.hpp>

2
doc/src/examples/algorithms/intersects_linestring.cpp
View File

@ -15,7 +15,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/linestring.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
int main()
{

2
doc/src/examples/algorithms/intersects_segment.cpp
View File

@ -15,7 +15,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/linestring.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
int main()
{

2
doc/src/examples/algorithms/length.cpp
View File

@ -14,7 +14,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/linestring.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
int main()

2
doc/src/examples/algorithms/num_geometries.cpp
View File

@ -16,7 +16,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
int main()

2
doc/src/examples/algorithms/num_interior_rings.cpp
View File

@ -16,7 +16,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
int main()

2
doc/src/examples/algorithms/num_points.cpp
View File

@ -17,7 +17,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
int main()

5
doc/src/examples/algorithms/simplify_insert_with_strategy.cpp
View File

@ -15,10 +15,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/linestring.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
int main()
{

2
doc/src/examples/algorithms/sym_difference.cpp
View File

@ -16,7 +16,7 @@
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/foreach.hpp>
/*<-*/ #include "create_svg_overlay.hpp" /*->*/

2
doc/src/examples/algorithms/union.cpp
View File

@ -16,7 +16,7 @@
#include <boost/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/foreach.hpp>
/*<-*/ #include "create_svg_overlay.hpp" /*->*/

2
doc/src/examples/algorithms/within.cpp
View File

@ -17,7 +17,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
/*<-*/ #include "create_svg_two.hpp" /*->*/
int main()

2
example/06_b_transformation_example.cpp
View File

@ -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.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#if defined(HAVE_SVG)
# include <boost/geometry/extensions/io/svg/write_svg.hpp>

2
example/07_a_graph_route_example.cpp
View File

@ -25,7 +25,7 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/linestring.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/read.hpp>
// Yes, this example currently uses some extensions:

2
example/07_b_graph_route_example.cpp
View File

@ -29,7 +29,7 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/linestring.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/read.hpp>
// Yes, this example currently uses some extensions:

2
example/with_external_libs/x02_gd_example.cpp
View File

@ -33,7 +33,7 @@
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
#include <boost/geometry/extensions/gis/geographic/strategies/area_huiller_earth.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <gd.h>

2
example/with_external_libs/x03_a_soci_example.cpp
View File

@ -36,7 +36,7 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian);

2
example/with_external_libs/x03_b_soci_example.cpp
View File

@ -30,7 +30,7 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
struct city

2
example/with_external_libs/x03_c_soci_example.cpp
View File

@ -32,7 +32,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/extensions/gis/io/wkb/read_wkb.hpp>
#include <boost/geometry/extensions/gis/io/wkb/utility.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
// user-defined type with GGL geometry
struct tree

2
example/with_external_libs/x03_d_soci_example.cpp
View File

@ -33,7 +33,7 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/extensions/gis/io/wkb/read_wkb.hpp>
#include <boost/geometry/extensions/gis/io/wkb/utility.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
int main()
{

4
example/with_external_libs/x04_wxwidgets_world_mapper.cpp
View File

@ -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.hpp>
#include <boost/geometry/domains/gis/io/wkt/read_multi.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/multi/io/wkt/read.hpp>
// wxWidgets, if these headers are NOT found, adapt include path (and lib path)

2
example/with_external_libs/x05_shapelib_example.cpp
View File

@ -21,7 +21,7 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
#include <boost/geometry/io/wkt/iomanip.hpp>
using namespace boost::geometry;

2
example/with_external_libs/x06_qt_world_mapper.cpp
View File

@ -29,7 +29,7 @@
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/extensions/algorithms/selected.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>

2
example_extensions/experimental/geometry_of.cpp
View File

@ -22,7 +22,7 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
namespace bg = boost::geometry;
namespace proto = boost::proto;

2
example_extensions/gis/io/shapelib/shapelib.cpp
View File

@ -17,7 +17,7 @@
#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/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
// Writing shapefiles has never been easier.

2
example_extensions/gis/projections/p01_projection_example.cpp
View File

@ -11,7 +11,7 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/extensions/algorithms/parse.hpp>
#include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
#include <boost/geometry/io/wkt/iomanip.hpp>
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
#include <boost/geometry/extensions/gis/projections/proj/robin.hpp>

2
example_extensions/gis/projections/p02_projfactory_example.cpp
View File

@ -10,7 +10,7 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
#include <boost/geometry/io/wkt/iomanip.hpp>
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
#include <boost/geometry/extensions/gis/projections/factory.hpp>

2
example_extensions/gis/projections/p03_projmap_example.cpp
View File

@ -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_multi.hpp>
#include <boost/geometry/multi/io/wkt/read.hpp>
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
#include <boost/geometry/extensions/gis/projections/project_transformer.hpp>

4
test/Jamfile.v2
View File

@ -17,7 +17,6 @@ project boost-geometry-test
<include>../../../boost/geometry/extensions/contrib/ttmath
<toolset>msvc:<asynch-exceptions>on
;
build-project core ;
build-project point_concept ;
@ -27,7 +26,8 @@ build-project algorithms ;
build-project iterators ;
build-project strategies ;
build-project policies ;
build-project io ;
build-project util ;
build-project views ;
build-project multi ;
build-project domains ;
build-project domains ;

4
test/algorithms/correct.cpp
View File

@ -21,8 +21,8 @@
#include <boost/geometry/io/dsv/write.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/domains/gis/io/wkt/write.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/write.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/geometries/box.hpp>

2
test/algorithms/detail/partition.cpp
View File

@ -17,7 +17,7 @@
#include <boost/geometry/algorithms/detail/partition.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#if defined(TEST_WITH_SVG)
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>

2
test/algorithms/detail/sections/range_by_section.cpp
View File

@ -18,7 +18,7 @@
#include <boost/geometry/views/detail/range_type.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>

4
test/algorithms/detail/sections/sectionalize.cpp
View File

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

2
test/algorithms/disjoint.cpp
View File

@ -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.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/strategies/strategies.hpp>
#include <test_common/test_point.hpp>

2
test/algorithms/make.cpp
View File

@ -17,7 +17,7 @@
#include <boost/geometry/algorithms/make.hpp>
#include <boost/geometry/domains/gis/io/wkt/write.hpp>
#include <boost/geometry/io/wkt/write.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array.hpp>

4
test/algorithms/overlay/assemble.cpp
View File

@ -28,8 +28,8 @@
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/domains/gis/io/wkt/write.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/write.hpp>

2
test/algorithms/overlay/ccw_traverse.cpp
View File

@ -17,7 +17,7 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#if defined(TEST_WITH_SVG)
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>

2
test/algorithms/overlay/dissolver.cpp
View File

@ -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_multi.hpp>
#include <boost/geometry/multi/io/wkt/read.hpp>
#include <boost/geometry/extensions/io/svg/write_svg_multi.hpp>

4
test/algorithms/overlay/get_turns.cpp
View File

@ -29,8 +29,8 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/domains/gis/io/wkt/write.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/write.hpp>
#if defined(TEST_WITH_SVG)
# include <boost/geometry/extensions/io/svg/svg_mapper.hpp>

4
test/algorithms/overlay/overlay_common.hpp
View File

@ -25,8 +25,8 @@
#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/domains/gis/io/wkt/write.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/write.hpp>
#if defined(TEST_WITH_SVG)

2
test/algorithms/overlay/robustness/interior_triangles.cpp
View File

@ -30,7 +30,7 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>

2
test/algorithms/overlay/robustness/intersects.cpp
View File

@ -30,7 +30,7 @@
#include <boost/geometry/geometry.hpp>
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>

2
test/algorithms/overlay/robustness/recursive_polygons.cpp
View File

@ -30,7 +30,7 @@
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>

2
test/algorithms/overlay/robustness/star_comb.cpp
View File

@ -32,7 +32,7 @@
#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>

2
test/algorithms/overlay/robustness/test_overlay_p_q.hpp
View File

@ -29,7 +29,7 @@
#include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/extensions/io/svg/svg_mapper.hpp>
#include <geometry_test_common.hpp>

2
test/algorithms/overlay/select_rings.cpp
View File

@ -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.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/foreach.hpp>

4
test/algorithms/overlay/self_intersection_points.cpp
View File

@ -28,8 +28,8 @@
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/domains/gis/io/wkt/write.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/write.hpp>

4
test/algorithms/overlay/split_rings.cpp
View File

@ -25,8 +25,8 @@
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/domains/gis/io/wkt/write.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/write.hpp>
#if defined(TEST_WITH_SVG)

4
test/algorithms/overlay/traverse.cpp
View File

@ -51,8 +51,8 @@
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/domains/gis/io/wkt/write.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/write.hpp>
#if defined(TEST_WITH_SVG)

2
test/algorithms/overlay/traverse_gmp.cpp
View File

@ -42,7 +42,7 @@
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#define TEST_WITH_SVG

2
test/algorithms/test_area.hpp
View File

@ -17,7 +17,7 @@
#include <boost/geometry/algorithms/correct.hpp>
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/read.hpp>
template <typename Geometry>

2
test/algorithms/test_centroid.hpp
View File

@ -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.hpp>
#include <boost/geometry/io/wkt/read.hpp>
template <std::size_t D>

2
test/algorithms/test_convert.hpp
View File

@ -15,7 +15,7 @@
#include <boost/geometry/algorithms/make.hpp>
#include <boost/geometry/algorithms/num_points.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/adapted/c_array.hpp>

4
test/algorithms/test_convex_hull.hpp
View File

@ -17,8 +17,8 @@
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/domains/gis/io/wkt/write.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/write.hpp>
#include <boost/geometry/geometries/polygon.hpp>

2
test/algorithms/test_covered_by.hpp
View File

@ -19,7 +19,7 @@
#include <boost/geometry/geometries/ring.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/read.hpp>
template <typename Geometry1, typename Geometry2>

2
test/algorithms/test_difference.hpp
View File

@ -34,7 +34,7 @@
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#if defined(TEST_WITH_SVG)

2
test/algorithms/test_distance.hpp
View File

@ -12,7 +12,7 @@
#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/distance.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/strategies/strategies.hpp>

2
test/algorithms/test_envelope.hpp
View File

@ -16,7 +16,7 @@
#include <boost/geometry/geometries/box.hpp>
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/read.hpp>
template<typename Box, std::size_t DimensionCount>

2
test/algorithms/test_equals.hpp
View File

@ -16,7 +16,7 @@
#include <boost/geometry/algorithms/equals.hpp>
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/read.hpp>
template <typename Geometry1, typename Geometry2>

2
test/algorithms/test_expand.hpp
View File

@ -14,7 +14,7 @@
#include <boost/geometry/algorithms/expand.hpp>
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/algorithms/assign.hpp>
#include <boost/geometry/io/dsv/write.hpp>

2
test/algorithms/test_for_each.hpp
View File

@ -15,7 +15,7 @@
#include <boost/geometry/algorithms/distance.hpp>
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/io/dsv/write.hpp>

2
test/algorithms/test_intersection.hpp
View File

@ -24,7 +24,7 @@
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#if defined(TEST_WITH_SVG)

2
test/algorithms/test_intersects.hpp
View File

@ -18,7 +18,7 @@
#include <boost/geometry/geometries/ring.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/read.hpp>
template <typename Geometry1, typename Geometry2>

2
test/algorithms/test_length.hpp
View File

@ -12,7 +12,7 @@
#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/length.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/strategies/strategies.hpp>

2
test/algorithms/test_overlaps.hpp
View File

@ -18,7 +18,7 @@
#include <boost/geometry/geometries/ring.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/read.hpp>
template <typename Geometry1, typename Geometry2>

2
test/algorithms/test_perimeter.hpp
View File

@ -16,7 +16,7 @@
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/read.hpp>
template <typename Geometry>

2
test/algorithms/test_reverse.hpp
View File

@ -14,7 +14,7 @@
#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/reverse.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
template <typename Geometry>

2
test/algorithms/test_simplify.hpp
View File

@ -16,7 +16,7 @@
#include <boost/geometry/algorithms/distance.hpp>
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
template <typename Tag, typename Geometry>
struct test_inserter

2
test/algorithms/test_union.hpp
View File

@ -26,7 +26,7 @@
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#if defined(TEST_WITH_SVG)

2
test/algorithms/test_unique.hpp
View File

@ -15,7 +15,7 @@
#include <geometry_test_common.hpp>
#include <boost/geometry/algorithms/unique.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
template <typename Geometry>

2
test/algorithms/test_within.hpp
View File

@ -19,7 +19,7 @@
#include <boost/geometry/geometries/ring.hpp>
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/strategies/cartesian/point_in_box.hpp>
#include <boost/geometry/strategies/cartesian/box_in_box.hpp>

2
test/algorithms/transform.cpp
View File

@ -25,7 +25,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/io/dsv/write.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <test_common/test_point.hpp>

2
test/core/ring.cpp
View File

@ -27,7 +27,7 @@
#include <boost/geometry/geometries/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/read.hpp>

2
test/geometries/boost_polygon.cpp
View File

@ -22,7 +22,7 @@
#include <boost/geometry/geometries/adapted/boost_polygon/ring.hpp>
#include <boost/geometry/geometries/adapted/boost_polygon/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <iostream>

2
test/geometries/boost_polygon_overlay.cpp
View File

@ -16,7 +16,7 @@
#include <boost/geometry/geometries/adapted/boost_polygon/box.hpp>
#include <boost/geometry/geometries/adapted/boost_polygon/ring.hpp>
#include <boost/geometry/geometries/adapted/boost_polygon/polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include<iostream>

2
test/geometries/boost_range.cpp
View File

@ -21,7 +21,7 @@
#include <boost/geometry/geometries/adapted/boost_range/sliced.hpp>
#include <boost/geometry/geometries/adapted/boost_range/uniqued.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <sstream>

11
test/io/Jamfile.v2 Normal file
View File

@ -0,0 +1,11 @@
# 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.
#
# 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)
build-project wkt ;

15
test/io/wkt/Jamfile.v2 Normal file
View File

@ -0,0 +1,15 @@
# 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.
#
# 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)
test-suite boost-geometry-io-wkt
:
[ run wkt.cpp ]
;

29
test/io/wkt/io_wkt_tests.sln Normal file
View File

@ -0,0 +1,29 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C++ Express 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wkt", "wkt.vcproj", "{1FA2ADE2-F649-4245-951E-A8F5935E7127}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multi_wkt", "multi_wkt.vcproj", "{CA8D5E44-7D8F-44A1-900C-35C28890299B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1FA2ADE2-F649-4245-951E-A8F5935E7127}.Debug|Win32.ActiveCfg = Debug|Win32
{1FA2ADE2-F649-4245-951E-A8F5935E7127}.Debug|Win32.Build.0 = Debug|Win32
{1FA2ADE2-F649-4245-951E-A8F5935E7127}.Release|Win32.ActiveCfg = Release|Win32
{1FA2ADE2-F649-4245-951E-A8F5935E7127}.Release|Win32.Build.0 = Release|Win32
{F2A680B0-F6FC-479E-9988-24CF6851C13C}.Debug|Win32.ActiveCfg = Debug|Win32
{F2A680B0-F6FC-479E-9988-24CF6851C13C}.Debug|Win32.Build.0 = Debug|Win32
{F2A680B0-F6FC-479E-9988-24CF6851C13C}.Release|Win32.ActiveCfg = Release|Win32
{F2A680B0-F6FC-479E-9988-24CF6851C13C}.Release|Win32.Build.0 = Release|Win32
{CA8D5E44-7D8F-44A1-900C-35C28890299B}.Debug|Win32.ActiveCfg = Debug|Win32
{CA8D5E44-7D8F-44A1-900C-35C28890299B}.Debug|Win32.Build.0 = Debug|Win32
{CA8D5E44-7D8F-44A1-900C-35C28890299B}.Release|Win32.ActiveCfg = Release|Win32
{CA8D5E44-7D8F-44A1-900C-35C28890299B}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

230
test/io/wkt/wkt.cpp Normal file
View File

@ -0,0 +1,230 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
// Unit Test
// 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)
//#include <iostream>
#include <sstream>
#include <string>
#include <boost/algorithm/string.hpp>
#include <geometry_test_common.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/algorithms/area.hpp>
#include <boost/geometry/algorithms/length.hpp>
#include <boost/geometry/algorithms/num_points.hpp>
#include <boost/geometry/algorithms/perimeter.hpp>
#include <boost/geometry/strategies/strategies.hpp>
#include <boost/geometry/core/point_type.hpp>
#include <boost/geometry/core/topological_dimension.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/io/wkt/write.hpp>
template <typename G>
void test_wkt(std::string const& wkt, std::size_t n, double len = 0,
double ar = 0, double peri = 0)
{
G geometry;
bg::read_wkt(wkt, geometry);
/*
std::cout << "n=" << bg::num_points(geometry)
<< " dim=" << bg::topological_dimension<G>::value
<< " length=" << bg::length(geometry)
<< " area=" << bg::area(geometry)
<< " perimeter=" << bg::perimeter(geometry)
<< std::endl << "\t\tgeometry=" << dsv(geometry)
<< std::endl;
*/
BOOST_CHECK_EQUAL(bg::num_points(geometry), n);
BOOST_CHECK_CLOSE(double(bg::length(geometry)), len, 0.0001);
BOOST_CHECK_CLOSE(double(bg::area(geometry)), ar, 0.0001);
BOOST_CHECK_CLOSE(double(bg::perimeter(geometry)), peri, 0.0001);
// String comparison: only for int/double/float etc
// GMP/CLN add +e01, L0, etc
if (boost::is_fundamental
<
typename bg::coordinate_type<G>::type
>::type::value)
{
std::ostringstream out;
out << bg::wkt(geometry);
BOOST_CHECK_EQUAL(boost::to_upper_copy(out.str()),
boost::to_upper_copy(wkt));
}
}
template <typename G>
void test_relaxed_wkt(std::string const& wkt, std::string const& expected)
{
if (boost::is_fundamental
<
typename bg::coordinate_type<G>::type
>::type::value)
{
std::string e;
G geometry;
bg::read_wkt(wkt, geometry);
std::ostringstream out;
out << bg::wkt(geometry);
BOOST_CHECK_EQUAL(boost::to_upper_copy(out.str()), boost::to_upper_copy(expected));
}
}
template <typename G>
void test_wrong_wkt(std::string const& wkt, std::string const& start)
{
std::string e("no exception");
G geometry;
try
{
bg::read_wkt(wkt, geometry);
}
catch(bg::read_wkt_exception const& ex)
{
e = ex.what();
boost::to_lower(e);
}
BOOST_CHECK_MESSAGE(boost::starts_with(e, start), " Expected:"
<< start << " Got:" << e << " with WKT: " << wkt);
}
template <typename G>
void test_wkt_output_iterator(std::string const& wkt)
{
G geometry;
bg::read_wkt<G>(wkt, std::back_inserter(geometry));
}
#ifndef GEOMETRY_TEST_MULTI
template <typename T>
void test_all()
{
using namespace boost::geometry;
typedef bg::model::point<T, 2, bg::cs::cartesian> P;
test_wkt<P >("POINT(1 2)", 1);
test_wkt<bg::model::linestring<P> >("LINESTRING(1 1,2 2,3 3)", 3, 2 * sqrt(2.0));
test_wkt<bg::model::polygon<P> >("POLYGON((0 0,0 4,4 4,4 0,0 0)"
",(1 1,1 2,2 2,2 1,1 1),(1 1,1 2,2 2,2 1,1 1))", 15, 0, 18, 24);
// Non OGC: a box defined by a polygon
//test_wkt<box<P> >("POLYGON((0 0,0 1,1 1,1 0,0 0))", 4, 0, 1, 4);
test_wkt<bg::model::ring<P> >("POLYGON((0 0,0 1,1 1,1 0,0 0))", 5, 0, 1, 4);
// We accept empty sequences as well (much better than EMPTY)...
// ...or even POINT() (see below)
test_wkt<bg::model::linestring<P> >("LINESTRING()", 0, 0);
test_wkt<bg::model::polygon<P> >("POLYGON(())", 0);
// ... or even with empty holes
test_wkt<bg::model::polygon<P> >("POLYGON((),(),())", 0);
// which all make no valid geometries, but they can exist.
// These WKT's are incomplete or abnormal but they are considered OK
test_relaxed_wkt<P>("POINT(1)", "POINT(1 0)");
test_relaxed_wkt<P>("POINT()", "POINT(0 0)");
test_relaxed_wkt<bg::model::linestring<P> >("LINESTRING(1,2,3)",
"LINESTRING(1 0,2 0,3 0)");
test_relaxed_wkt<P>("POINT ( 1 2) ", "POINT(1 2)");
test_relaxed_wkt<P>("POINT M ( 1 2)", "POINT(1 2)");
test_relaxed_wkt<bg::model::box<P> >("BOX(1 1,2 2)", "POLYGON((1 1,1 2,2 2,2 1,1 1))");
test_relaxed_wkt<bg::model::linestring<P> >("LINESTRING EMPTY", "LINESTRING()");
test_relaxed_wkt<bg::model::polygon<P> >("POLYGON( ( ) , ( ) , ( ) )",
"POLYGON((),(),())");
// Wrong WKT's
test_wrong_wkt<P>("POINT(1 2", "expected ')'");
test_wrong_wkt<P>("POINT 1 2)", "expected '('");
test_wrong_wkt<P>("POINT(1 2,)", "expected ')'");
test_wrong_wkt<P>("POINT(1 2)foo", "too much tokens at 'foo'");
test_wrong_wkt<P>("POINT(1 2 3)", "expected ')'");
test_wrong_wkt<P>("POINT(a 2 3)", "bad lexical cast");
test_wrong_wkt<P>("POINT 2 3", "expected '('");
test_wrong_wkt<P>("POINT Z (1 2 3)", "z only allowed");
test_wrong_wkt<P>("PIONT (1 2)", "should start with 'point'");
test_wrong_wkt<bg::model::linestring<P> >("LINESTRING())", "too much tokens");
test_wrong_wkt<bg::model::polygon<P> >("POLYGON((1 1,1 4,4 4,4 1,1 1)"
",((2 2,2 3,3 3,3 2,2 2))", "bad lexical cast");
test_wrong_wkt<bg::model::box<P> >("BOX(1 1,2 2,3 3)", "box should have 2");
test_wrong_wkt<bg::model::box<P> >("BOX(1 1,2 2) )", "too much tokens");
if (boost::is_floating_point<T>::type::value
|| ! boost::is_fundamental<T>::type::value)
{
test_wkt<P>("POINT(1.1 2.1)", 1);
}
// Deprecated:
// test_wkt_output_iterator<bg::model::linestring<P> >("LINESTRING(1 1,2 2,3 3)");
// test_wkt_output_iterator<bg::model::ring<P> >("POLYGON((1 1,2 2,3 3))");
}
#endif
int test_main(int, char* [])
{
test_all<double>();
test_all<int>();
#if defined(HAVE_TTMATH)
test_all<ttmath_big>();
#endif
return 0;
}
/*
Results can be checked in PostGIS by query below,
or by MySQL (but replace length by glength and remove the perimeter)
Note:
- PostGIS gives "3" for a numpoints of a multi-linestring of 6 points in total (!)
--> "npoints" should be taken for all geometries
- SQL Server 2008 gives "6"
select geometry::STGeomFromText('MULTILINESTRING((1 1,2 2,3 3),(4 4,5 5,6 6))',0).STNumPoints()
- MySQL gives "NULL"
select 1 as code,'np p' as header,npoints(geomfromtext('POINT(1 2)')) as contents
union select 2,'length point', length(geomfromtext('POINT(1 2)'))
union select 3,'peri point', perimeter(geomfromtext('POINT(1 2)'))
union select 4,'area point',area(geomfromtext('POINT(1 2)'))
union select 5,'# ls',npoints(geomfromtext('LINESTRING(1 1,2 2,3 3)'))
union select 6,'length ls',length(geomfromtext('LINESTRING(1 1,2 2,3 3)'))
union select 7,'peri ls',perimeter(geomfromtext('LINESTRING(1 1,2 2,3 3)'))
union select 8,'aera ls',area(geomfromtext('LINESTRING(1 1,2 2,3 3)'))
union select 9,'# poly',npoints(geomfromtext('POLYGON((0 0,0 4,4 4,4 0,0 0),(1 1,1 2,2 2,2 1,1 1),(1 1,1 2,2 2,2 1,1 1))'))
union select 10,'length poly',length(geomfromtext('POLYGON((0 0,0 4,4 4,4 0,0 0),(1 1,1 2,2 2,2 1,1 1),(1 1,1 2,2 2,2 1,1 1))'))
union select 11,'peri poly',perimeter(geomfromtext('POLYGON((0 0,0 4,4 4,4 0,0 0),(1 1,1 2,2 2,2 1,1 1),(1 1,1 2,2 2,2 1,1 1))'))
union select 12,'area poly',area(geomfromtext('POLYGON((0 0,0 4,4 4,4 0,0 0),(1 1,1 2,2 2,2 1,1 1),(1 1,1 2,2 2,2 1,1 1))'))
*/

174
test/io/wkt/wkt.vcproj Normal file
View File

@ -0,0 +1,174 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="wkt"
ProjectGUID="{1FA2ADE2-F649-4245-951E-A8F5935E7127}"
RootNamespace="wkt"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\wkt"
ConfigurationType="1"
InheritedPropertySheets="..\..\..\..\boost.vsprops"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../../../../..;../../../.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
ExceptionHandling="2"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
DebugInformationFormat="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\wkt"
ConfigurationType="1"
InheritedPropertySheets="..\..\..\..\boost.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../../../../..;../../../.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
ExceptionHandling="2"
UsePrecompiledHeader="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<File
RelativePath=".\wkt.cpp"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

2
test/iterators/closing_iterator.cpp
View File

@ -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.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>

2
test/iterators/ever_circling_iterator.cpp
View File

@ -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.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/geometries/geometries.hpp>
#include <boost/geometry/geometries/point_xy.hpp>

3
test/multi/Jamfile.v2
View File

@ -8,4 +8,5 @@
# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
build-project algorithms ;
build-project algorithms ;
build-project io ;

2
test/multi/algorithms/multi_area.cpp
View File

@ -14,7 +14,7 @@
#include <boost/geometry/geometries/point_xy.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>

2
test/multi/algorithms/multi_centroid.cpp
View File

@ -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_multi.hpp>
#include <boost/geometry/multi/io/wkt/read.hpp>
// #define REPORT_RESULTS

4
test/multi/algorithms/multi_convex_hull.cpp
View File

@ -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.hpp>
#include <boost/geometry/io/wkt/read.hpp>
#include <boost/geometry/multi/core/point_order.hpp>
#include <boost/geometry/multi/core/point_type.hpp>
@ -31,7 +31,7 @@
#include <boost/geometry/multi/algorithms/num_points.hpp>
#include <boost/geometry/multi/algorithms/detail/for_each_range.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
#include <boost/geometry/io/wkt/wkt.hpp>
#include <boost/geometry/multi/geometries/multi_point.hpp>
#include <boost/geometry/multi/geometries/multi_linestring.hpp>

Some files were not shown because too many files have changed in this diff Show More