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

topojson: add test with empty "objects" and "arcs"

Browse source
This commit is contained in:
Mickey Rose 2018-08-10 20:53:20 +02:00
parent 74b2886036
commit ee28954786
1 changed files with 52 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
test/unit/datasource/topojson.cpp
View file

@ -29,8 +29,12 @@
#include <mapnik/json/topojson_grammar_x3.hpp>
#include <mapnik/json/topojson_utils.hpp>
#define HEREDOC(...) #__VA_ARGS__
namespace {
bool parse_topology_string(std::string const& buffer, mapnik::topojson::topology & topo);
bool parse_topology(std::string const& filename, mapnik::topojson::topology & topo)
{
mapnik::util::file file(filename);
@ -38,6 +42,17 @@ bool parse_topology(std::string const& filename, mapnik::topojson::topology & to
buffer.resize(file.size());
std::fread(&buffer[0], buffer.size(), 1, file.get());
if (!file) return false;
return parse_topology_string(buffer, topo);
}
bool parse_topology_string(std::string const& buffer)
{
mapnik::topojson::topology topo;
return parse_topology_string(buffer, topo);
}
bool parse_topology_string(std::string const& buffer, mapnik::topojson::topology & topo)
{
using space_type = boost::spirit::x3::standard::space_type;
char const* itr = buffer.c_str();
char const* end = itr + buffer.length();
@ -58,8 +73,44 @@ bool parse_topology(std::string const& filename, mapnik::topojson::topology & to
}
TEST_CASE("topojson")
TEST_CASE("TopoJSON")
{
SECTION("Minimal Topology")
{
// + A topology must have a member with the name “objects” whose value is another object.
// + A topology must have a member with the name “arcs” whose value is an array of arcs.
CHECK(parse_topology_string(HEREDOC(
{
"type": "Topology", "objects": {}, "arcs": []
}
)));
CHECK(parse_topology_string(HEREDOC(
{
"type": "Topology", "arcs": [], "objects": {}
}
)));
CHECK(parse_topology_string(HEREDOC(
{
"objects": {}, "type": "Topology", "arcs": []
}
)));
CHECK(parse_topology_string(HEREDOC(
{
"objects": {}, "arcs": [], "type": "Topology"
}
)));
CHECK(parse_topology_string(HEREDOC(
{
"arcs": [], "type": "Topology", "objects": {}
}
)));
CHECK(parse_topology_string(HEREDOC(
{
"arcs": [], "objects": {}, "type": "Topology"
}
)));
}
SECTION("geometry parsing")
{
mapnik::value_integer feature_id = 0;