sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cxx tests - update geometry test

Browse source
This commit is contained in:
artemp 2015-03-18 12:43:05 +01:00
parent 1bb06d89fa
commit 236c21ffbd
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/cxx/geometry.cpp
View file

@ -1,13 +1,10 @@
#include "catch.hpp"
#include <mapnik/geometry_impl.hpp>
#include <mapnik/util/fs.hpp>
#include <mapnik/util/file_io.hpp>
#include <mapnik/json/geometry_parser.hpp>
//#include <mapnik/util/geometry_to_geojson.hpp>
#include <mapnik/json/geometry_generator_grammar.hpp>
#include <mapnik/json/geometry_generator_grammar_impl.hpp>
#include <mapnik/util/geometry_to_geojson.hpp>
TEST_CASE("geometry") {
@ -16,22 +13,13 @@ SECTION("json point") {
auto json = input.data();
mapnik::new_geometry::geometry geom;
std::string json_string(json.get());
REQUIRE( mapnik::json::from_geojson(json_string,geom) );
REQUIRE( mapnik::json::from_geojson(json_string, geom) );
REQUIRE( geom.is<mapnik::new_geometry::point>() );
auto const& point = mapnik::util::get<mapnik::new_geometry::point>(geom);
REQUIRE( point.x == 30 );
REQUIRE( point.y == 10 );
using adapter_type = mapnik::new_geometry::point_vertex_adapter;
adapter_type va(point);
std::string new_json;
using sink_type = std::back_insert_iterator<std::string>;
// TODO: need to round trip, but does not compile yet
/*
static const mapnik::json::geometry_generator_grammar<sink_type, adapter_type> grammar;
sink_type sink(new_json);
REQUIRE( boost::spirit::karma::generate(sink, grammar, va) );
*/
//REQUIRE( mapnik::util::to_geojson(new_json,va) );
REQUIRE( mapnik::util::to_geojson(new_json, geom) );
}
SECTION("json point reversed") {