From 6a2d0b9ebfb2d9238ee95e2934e327213b4ee607 Mon Sep 17 00:00:00 2001 From: artemp Date: Mon, 20 Jul 2015 15:41:35 +0200 Subject: [PATCH] started adding svg parsing tests to increase test coverage (work-in-progress) --- test/data | 2 +- test/unit/svg/svg_parser_test.cpp | 172 ++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+), 1 deletion(-) create mode 100644 test/unit/svg/svg_parser_test.cpp diff --git a/test/data b/test/data index fa2bac087..a04e0bb1f 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit fa2bac0878b329362ad8647674b5496dd5e60f46 +Subproject commit a04e0bb1fc7e6eef0bd9cc67dc0c8c04fd3f8c52 diff --git a/test/unit/svg/svg_parser_test.cpp b/test/unit/svg/svg_parser_test.cpp new file mode 100644 index 000000000..0cfd3e56b --- /dev/null +++ b/test/unit/svg/svg_parser_test.cpp @@ -0,0 +1,172 @@ +/***************************************************************************** + * + * This file is part of Mapnik (c++ mapping toolkit) + * + * Copyright (C) 2015 Artem Pavlenko + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + *****************************************************************************/ + +#include "catch.hpp" + +#include +#include +#include +#include +#include +#include +#include +#include +#include // for xmlInitParser(), xmlCleanupParser() +#include + +namespace detail { + +template +struct vertex_equal +{ + template + bool operator() (T const& lhs, T const& rhs) const + { + static const double eps = 1.0 / std::pow(10,N); + return (std::fabs(std::get<0>(lhs) - std::get<0>(rhs)) < eps) + && (std::fabs(std::get<1>(lhs) - std::get<1>(rhs)) < eps) + && std::get<2>(lhs) == std::get<2>(rhs); + } +}; +} + +TEST_CASE("SVG parser") { + + xmlInitParser(); + SECTION("SVG ") + { + // + std::string svg_name("./test/data/svg/rect.svg"); + std::shared_ptr marker = mapnik::marker_cache::instance().find(svg_name, false); + REQUIRE(marker); + REQUIRE(marker->is()); + mapnik::marker_svg const& svg = mapnik::util::get(*marker); + auto bbox = svg.bounding_box(); + REQUIRE(bbox == mapnik::box2d(0, 0, 20, 15)); + auto storage = svg.get_data(); + REQUIRE(storage); + mapnik::svg::vertex_stl_adapter stl_storage(storage->source()); + mapnik::svg::svg_path_adapter path(stl_storage); + double x,y; + unsigned cmd; + std::vector> vec; + while ((cmd = path.vertex(&x,&y)) != mapnik::SEG_END) + { + vec.emplace_back(x, y, cmd); + //std::cerr << x << "," << y << " cmd=" << cmd << std::endl; + } + std::vector> expected = { {0, 0, 1}, {20, 0, 2}, {20, 15, 2}, {0, 15, 2}, {0, 0, 79} }; + REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin())); + } + SECTION("SVG rounded ") + { + // + std::string svg_name("./test/data/svg/rounded_rect.svg"); + std::shared_ptr marker = mapnik::marker_cache::instance().find(svg_name, false); + REQUIRE(marker); + REQUIRE(marker->is()); + mapnik::marker_svg const& svg = mapnik::util::get(*marker); + auto bbox = svg.bounding_box(); + REQUIRE(bbox == mapnik::box2d(0, 0, 20, 15)); + auto storage = svg.get_data(); + REQUIRE(storage); + mapnik::svg::vertex_stl_adapter stl_storage(storage->source()); + mapnik::svg::svg_path_adapter path(stl_storage); + double x,y; + unsigned cmd; + std::vector> vec; + + while ((cmd = path.vertex(&x,&y)) != mapnik::SEG_END) + { + vec.emplace_back(x, y, cmd); + } + + std::vector> expected = {{0, 5,1},{0.481856, 2.85842,2},{1.83455, 1.12961,2},{3.79736, 0.146789,2},{5, 0,2},{15, 0,2},{17.1416, 0.481856,2},{18.8704, 1.83455,2},{19.8532, 3.79736,2},{20, 5,2},{20, 10,2},{19.5181, 12.1416,2},{18.1654, 13.8704,2},{16.2026, 14.8532,2},{15, 15,2},{5, 15,2},{2.85842, 14.5181,2},{1.12961, 13.1654,2},{0.146789, 11.2026,2},{0, 10,2},{0, 10,95}}; + + REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin(),detail::vertex_equal<3>())); + } + + SECTION("SVG ") + { + // + std::string svg_name("./test/data/svg/polyline.svg"); + std::shared_ptr marker = mapnik::marker_cache::instance().find(svg_name, false); + REQUIRE(marker); + REQUIRE(marker->is()); + mapnik::marker_svg const& svg = mapnik::util::get(*marker); + auto bbox = svg.bounding_box(); + REQUIRE(bbox == mapnik::box2d(1.0,1.0,1199.0,399.0)); + auto storage = svg.get_data(); + REQUIRE(storage); + mapnik::svg::vertex_stl_adapter stl_storage(storage->source()); + mapnik::svg::svg_path_adapter path(stl_storage); + double x,y; + unsigned cmd; + std::vector> vec; + std::size_t num_vertices = path.total_vertices(); + for (std::size_t i = 0; i < num_vertices; ++i) + { + cmd = path.vertex(&x,&y); + vec.emplace_back(x, y, cmd); + } + + std::vector> expected = {{1, 1, 1},{1199, 1, 2},{1199, 399, 2},{1, 399, 2},{1, 1, 79},{0, 0, 0},{50, 375, 1},{150, 375, 2},{150, 325, 2},{250, 325, 2},{250, 375, 2},{350, 375, 2},{350, 250, 2},{450, 250, 2},{450, 375, 2},{550, 375, 2},{550, 175, 2},{650, 175, 2},{650, 375, 2},{750, 375, 2},{750, 100, 2},{850, 100, 2},{850, 375, 2},{950, 375, 2},{950, 25, 2},{1050, 25, 2},{1050, 375, 2},{1150, 375, 2}}; + + REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin())); + } + + SECTION("SVG ") + { + // + std::string svg_name("./test/data/svg/polygon.svg"); + std::shared_ptr marker = mapnik::marker_cache::instance().find(svg_name, false); + REQUIRE(marker); + REQUIRE(marker->is()); + mapnik::marker_svg const& svg = mapnik::util::get(*marker); + auto bbox = svg.bounding_box(); + REQUIRE(bbox == mapnik::box2d(1.0,1.0,1199.0,399.0)); + auto storage = svg.get_data(); + REQUIRE(storage); + mapnik::svg::vertex_stl_adapter stl_storage(storage->source()); + mapnik::svg::svg_path_adapter path(stl_storage); + double x,y; + unsigned cmd; + std::vector> vec; + std::size_t num_vertices = path.total_vertices(); + //std::cerr << "Num vertices = " << num_vertices << std::endl; + //std::cerr << "{"; + for (std::size_t i = 0; i < num_vertices; ++i) + { + cmd = path.vertex(&x,&y); + vec.emplace_back(x, y, cmd); + //if (vec.size() > 1) std::cerr << ","; + //std::cerr << std::setprecision(6) << "{" << x << ", " << y << ", " << cmd << "}"; + } + //std::cerr << "}" << std::endl; + + std::vector> expected = {{1, 1, 1},{1199, 1, 2},{1199, 399, 2},{1, 399, 2},{1, 1, 79},{0, 0, 0},{350, 75, 1},{379, 161, 2},{469, 161, 2},{397, 215, 2},{423, 301, 2},{350, 250, 2},{277, 301, 2},{303, 215, 2},{231, 161, 2},{321, 161, 2},{350, 75, 79},{0, 0, 0},{850, 75, 1},{958, 137.5, 2},{958, 262.5, 2},{850, 325, 2},{742, 262.6, 2},{742, 137.5, 2},{850, 75, 79}}; + + REQUIRE(std::equal(expected.begin(),expected.end(), vec.begin())); + } + + xmlCleanupParser(); +}