diff --git a/test/algorithms/test_intersection.hpp b/test/algorithms/test_intersection.hpp index 36c4c1154..4a7cc645c 100644 --- a/test/algorithms/test_intersection.hpp +++ b/test/algorithms/test_intersection.hpp @@ -12,7 +12,6 @@ #include #include -#include #include #include @@ -47,10 +46,6 @@ check_result( { bool const is_line = bg::geometry_id::type::value == 2; - typedef typename bg::coordinate_type::type coordinate_type; - typedef typename bg::point_type::type point_type; - boost::ignore_unused(); - typename bg::default_area_result::type length_or_area = 0; int n = 0; for (typename std::vector::const_iterator it = intersection_output.begin(); @@ -100,50 +95,6 @@ check_result( BOOST_CHECK_CLOSE(detected_length_or_area, expected_length_or_area, percentage); #endif -#if defined(TEST_WITH_SVG) - { - bool const ccw = - bg::point_order::value == bg::counterclockwise - || bg::point_order::value == bg::counterclockwise; - bool const open = - bg::closure::value == bg::open - || bg::closure::value == bg::open; - - std::ostringstream filename; - filename << "intersection_" - << caseid << "_" - << string_from_type::name() - << string_from_type::name() - << (ccw ? "_ccw" : "") - << (open ? "_open" : "") -#if defined(BOOST_GEOMETRY_NO_ROBUSTNESS) - << "_no_rob" -#endif - << ".svg"; - - std::ofstream svg(filename.str().c_str()); - - bg::svg_mapper mapper(svg, 500, 500); - - mapper.add(g1); - mapper.add(g2); - - mapper.map(g1, is_line - ? "opacity:0.6;stroke:rgb(0,255,0);stroke-width:5" - : "fill-opacity:0.5;fill:rgb(153,204,0);" - "stroke:rgb(153,204,0);stroke-width:3"); - mapper.map(g2, "fill-opacity:0.3;fill:rgb(51,51,153);" - "stroke:rgb(51,51,153);stroke-width:3"); - - for (typename std::vector::const_iterator it = intersection_output.begin(); - it != intersection_output.end(); ++it) - { - mapper.map(*it, "fill-opacity:0.2;stroke-opacity:0.4;fill:rgb(255,0,0);" - "stroke:rgb(255,0,255);stroke-width:8"); - } - } -#endif - return length_or_area; } @@ -207,6 +158,54 @@ typename bg::default_area_result::type test_intersection(std::string const& check_result(intersection_output, caseid, expected_count, expected_point_count, expected_length_or_area, percentage, debug); +#if defined(TEST_WITH_SVG) + { + bool const is_line = bg::geometry_id::type::value == 2; + typedef typename bg::coordinate_type::type coordinate_type; + + bool const ccw = + bg::point_order::value == bg::counterclockwise + || bg::point_order::value == bg::counterclockwise; + bool const open = + bg::closure::value == bg::open + || bg::closure::value == bg::open; + + std::ostringstream filename; + filename << "intersection_" + << caseid << "_" + << string_from_type::name() + << string_from_type::name() + << (ccw ? "_ccw" : "") + << (open ? "_open" : "") +#if defined(BOOST_GEOMETRY_NO_ROBUSTNESS) + << "_no_rob" +#endif + << ".svg"; + + std::ofstream svg(filename.str().c_str()); + + bg::svg_mapper mapper(svg, 500, 500); + + mapper.add(g1); + mapper.add(g2); + + mapper.map(g1, is_line + ? "opacity:0.6;stroke:rgb(0,255,0);stroke-width:5" + : "fill-opacity:0.5;fill:rgb(153,204,0);" + "stroke:rgb(153,204,0);stroke-width:3"); + mapper.map(g2, "fill-opacity:0.3;fill:rgb(51,51,153);" + "stroke:rgb(51,51,153);stroke-width:3"); + + for (typename std::vector::const_iterator it = intersection_output.begin(); + it != intersection_output.end(); ++it) + { + mapper.map(*it, "fill-opacity:0.2;stroke-opacity:0.4;fill:rgb(255,0,0);" + "stroke:rgb(255,0,255);stroke-width:8"); + } + } +#endif + + if (debug) { std::cout << "end case " << caseid << std::endl;