cf89d56ac Release 1.1.0 6defc33ea Update changelog 8480ce447 Use basic_pbf_builder to make buffer type configurable 25fbe0caf Travis: Disable test that fails with out of memory error f6741c19a Travis: Test on different architectures 598031339 Explicitly return 0 or 1 in example code, don't use std::exit dd8d315ea Remove virtual inheritance in builder f8511cc9e Fix another unused variable 4002414f0 Switch to catch2 for testing 9bb27a31f Avoid unused variable warning b04163da6 Use std::array instead of C array 4701b6a57 Make string non-const so the return doesn't copy 454f7d711 Fix clang-tidy config 6105d7a62 "Modernize" travis config 7fefbf932 Use try/catch in main() b3a62df21 Various fixes based on clang-tidy reports 83f784641 Use uppercase letters for numeric literals 23fd5f5c9 CMake config: Also look for newer clang-tidy versions 25ba7a7f6 Remove unnecessary ref qualifier f1cc1728a Doxygen: Remove config settings not available in newer versions 0a0afc97d Fix doc. 630dc80bc fix docs e022ba387 Call commit on finished features. 5d3f6eaf9 Remember version in layer_builder_impl. Add accessor functions. bc9d5f977 Remove comment that doesn't apply (any more). e1618d063 Update appveyor config to use more recent visual studio version. e6f9e3e62 Remove unnecessary workaround in Appveyor config. e1df3894c Remove xcode6.4 build soon to be removed from travis. 808a7b6a1 Release 1.0.3 d4faa2fb0 catch exceptions in vtzero-stats 291572505 Add overload of copy_properties function using a property_manager. 189caf4b8 Use new copy_id() function in advanced documentation. 184bb33e1 Add feature::for_each_property_indexes() member function. 3e296a36f Bugfix: Wrong iterator was checked in assert. 1115c0910 Update submodule to use newest mvt-fixtures. f32e73893 Explicitly initialize member (needed by older GCCs). 8d37928ca More tests. bf68443be Add copy_properties() helper function to feature builders. 96ed8cbd7 Add copy_id() helper function to builders. b166fcc3a Document that layer class uses mutable. 8609cdf96 Add missing word 3484299f2 Release 1.0.2 6d3dd8940 Bugfix: layer_builder::add_feature() now commits features it adds. 8da72723f Update links in change log. git-subtree-dir: third_party/vtzero git-subtree-split: cf89d56ac22eee0a252aab8d2e87344e4ce73d70
308 lines
8.4 KiB
C++
308 lines
8.4 KiB
C++
|
|
#include <test.hpp>
|
|
|
|
#include <vtzero/builder.hpp>
|
|
#include <vtzero/geometry.hpp>
|
|
#include <vtzero/index.hpp>
|
|
|
|
#include <cstdint>
|
|
#include <string>
|
|
#include <type_traits>
|
|
#include <vector>
|
|
|
|
using polygon_type = std::vector<std::vector<vtzero::point>>;
|
|
|
|
struct polygon_handler {
|
|
|
|
polygon_type data;
|
|
|
|
void ring_begin(uint32_t count) {
|
|
data.emplace_back();
|
|
data.back().reserve(count);
|
|
}
|
|
|
|
void ring_point(const vtzero::point point) {
|
|
data.back().push_back(point);
|
|
}
|
|
|
|
void ring_end(vtzero::ring_type /* type */) const noexcept {
|
|
}
|
|
|
|
};
|
|
|
|
static void test_polygon_builder(bool with_id, bool with_prop) {
|
|
vtzero::tile_builder tbuilder;
|
|
vtzero::layer_builder lbuilder{tbuilder, "test"};
|
|
|
|
{
|
|
vtzero::polygon_feature_builder fbuilder{lbuilder};
|
|
|
|
if (with_id) {
|
|
fbuilder.set_id(17);
|
|
}
|
|
|
|
fbuilder.add_ring(4);
|
|
fbuilder.set_point(10, 20);
|
|
fbuilder.set_point(vtzero::point{20, 30});
|
|
fbuilder.set_point(mypoint{30, 40});
|
|
fbuilder.set_point(10, 20);
|
|
|
|
if (with_prop) {
|
|
fbuilder.add_property("foo", "bar");
|
|
}
|
|
|
|
fbuilder.commit();
|
|
}
|
|
|
|
const std::string data = tbuilder.serialize();
|
|
|
|
vtzero::vector_tile tile{data};
|
|
|
|
auto layer = tile.next_layer();
|
|
REQUIRE(layer.name() == "test");
|
|
REQUIRE(layer.version() == 2);
|
|
REQUIRE(layer.extent() == 4096);
|
|
REQUIRE(layer.num_features() == 1);
|
|
|
|
const auto feature = layer.next_feature();
|
|
REQUIRE(feature.id() == (with_id ? 17 : 0));
|
|
|
|
polygon_handler handler;
|
|
vtzero::decode_polygon_geometry(feature.geometry(), handler);
|
|
|
|
const polygon_type result = {{{10, 20}, {20, 30}, {30, 40}, {10, 20}}};
|
|
REQUIRE(handler.data == result);
|
|
}
|
|
|
|
TEST_CASE("polygon builder without id/without properties") {
|
|
test_polygon_builder(false, false);
|
|
}
|
|
|
|
TEST_CASE("polygon builder without id/with properties") {
|
|
test_polygon_builder(false, true);
|
|
}
|
|
|
|
TEST_CASE("polygon builder with id/without properties") {
|
|
test_polygon_builder(true, false);
|
|
}
|
|
|
|
TEST_CASE("polygon builder with id/with properties") {
|
|
test_polygon_builder(true, true);
|
|
}
|
|
|
|
TEST_CASE("Calling add_ring() with bad values throws assert") {
|
|
vtzero::tile_builder tbuilder;
|
|
vtzero::layer_builder lbuilder{tbuilder, "test"};
|
|
vtzero::polygon_feature_builder fbuilder{lbuilder};
|
|
|
|
SECTION("0") {
|
|
REQUIRE_THROWS_AS(fbuilder.add_ring(0), assert_error);
|
|
}
|
|
SECTION("1") {
|
|
REQUIRE_THROWS_AS(fbuilder.add_ring(1), assert_error);
|
|
}
|
|
SECTION("2") {
|
|
REQUIRE_THROWS_AS(fbuilder.add_ring(2), assert_error);
|
|
}
|
|
SECTION("3") {
|
|
REQUIRE_THROWS_AS(fbuilder.add_ring(3), assert_error);
|
|
}
|
|
SECTION("2^29") {
|
|
REQUIRE_THROWS_AS(fbuilder.add_ring(1UL << 29U), assert_error);
|
|
}
|
|
}
|
|
|
|
static void test_multipolygon_builder(bool with_id, bool with_prop) {
|
|
vtzero::tile_builder tbuilder;
|
|
vtzero::layer_builder lbuilder{tbuilder, "test"};
|
|
vtzero::polygon_feature_builder fbuilder{lbuilder};
|
|
|
|
if (with_id) {
|
|
fbuilder.set_id(17);
|
|
}
|
|
|
|
fbuilder.add_ring(4);
|
|
fbuilder.set_point(10, 20);
|
|
fbuilder.set_point(vtzero::point{20, 30});
|
|
fbuilder.set_point(mypoint{30, 40});
|
|
fbuilder.set_point(10, 20);
|
|
|
|
fbuilder.add_ring(5);
|
|
fbuilder.set_point(1, 1);
|
|
fbuilder.set_point(2, 1);
|
|
fbuilder.set_point(2, 2);
|
|
fbuilder.set_point(1, 2);
|
|
|
|
if (with_id) {
|
|
fbuilder.set_point(1, 1);
|
|
} else {
|
|
fbuilder.close_ring();
|
|
}
|
|
|
|
if (with_prop) {
|
|
fbuilder.add_property("foo", vtzero::encoded_property_value{"bar"});
|
|
}
|
|
|
|
fbuilder.commit();
|
|
|
|
const std::string data = tbuilder.serialize();
|
|
|
|
vtzero::vector_tile tile{data};
|
|
|
|
auto layer = tile.next_layer();
|
|
REQUIRE(layer.name() == "test");
|
|
REQUIRE(layer.version() == 2);
|
|
REQUIRE(layer.extent() == 4096);
|
|
REQUIRE(layer.num_features() == 1);
|
|
|
|
const auto feature = layer.next_feature();
|
|
REQUIRE(feature.id() == (with_id ? 17 : 0));
|
|
|
|
polygon_handler handler;
|
|
vtzero::decode_polygon_geometry(feature.geometry(), handler);
|
|
|
|
const polygon_type result = {{{10, 20}, {20, 30}, {30, 40}, {10, 20}},
|
|
{{1, 1}, {2, 1}, {2, 2}, {1, 2}, {1, 1}}};
|
|
REQUIRE(handler.data == result);
|
|
}
|
|
|
|
|
|
TEST_CASE("Multipolygon builder without id/without properties") {
|
|
test_multipolygon_builder(false, false);
|
|
}
|
|
|
|
TEST_CASE("Multipolygon builder without id/with properties") {
|
|
test_multipolygon_builder(false, true);
|
|
}
|
|
|
|
TEST_CASE("Multipolygon builder with id/without properties") {
|
|
test_multipolygon_builder(true, false);
|
|
}
|
|
|
|
TEST_CASE("Multipolygon builder with id/with properties") {
|
|
test_multipolygon_builder(true, true);
|
|
}
|
|
|
|
TEST_CASE("Calling add_ring() twice throws assert") {
|
|
vtzero::tile_builder tbuilder;
|
|
vtzero::layer_builder lbuilder{tbuilder, "test"};
|
|
vtzero::polygon_feature_builder fbuilder{lbuilder};
|
|
|
|
fbuilder.add_ring(4);
|
|
REQUIRE_ASSERT(fbuilder.add_ring(4));
|
|
}
|
|
|
|
TEST_CASE("Calling polygon_feature_builder::set_point()/close_ring() throws assert") {
|
|
vtzero::tile_builder tbuilder;
|
|
vtzero::layer_builder lbuilder{tbuilder, "test"};
|
|
vtzero::polygon_feature_builder fbuilder{lbuilder};
|
|
|
|
SECTION("set_point") {
|
|
REQUIRE_THROWS_AS(fbuilder.set_point(10, 10), assert_error);
|
|
}
|
|
SECTION("close_ring") {
|
|
REQUIRE_THROWS_AS(fbuilder.close_ring(), assert_error);
|
|
}
|
|
}
|
|
|
|
TEST_CASE("Calling polygon_feature_builder::set_point()/close_ring() too often throws assert") {
|
|
vtzero::tile_builder tbuilder;
|
|
vtzero::layer_builder lbuilder{tbuilder, "test"};
|
|
vtzero::polygon_feature_builder fbuilder{lbuilder};
|
|
|
|
fbuilder.add_ring(4);
|
|
fbuilder.set_point(10, 20);
|
|
fbuilder.set_point(20, 20);
|
|
fbuilder.set_point(30, 20);
|
|
fbuilder.set_point(10, 20);
|
|
|
|
SECTION("set_point") {
|
|
REQUIRE_THROWS_AS(fbuilder.set_point(50, 20), assert_error);
|
|
}
|
|
SECTION("close_ring") {
|
|
REQUIRE_THROWS_AS(fbuilder.close_ring(), assert_error);
|
|
}
|
|
}
|
|
|
|
TEST_CASE("Calling polygon_feature_builder::set_point() with same point throws") {
|
|
vtzero::tile_builder tbuilder;
|
|
vtzero::layer_builder lbuilder{tbuilder, "test"};
|
|
vtzero::polygon_feature_builder fbuilder{lbuilder};
|
|
|
|
fbuilder.add_ring(4);
|
|
fbuilder.set_point(10, 10);
|
|
REQUIRE_THROWS_AS(fbuilder.set_point(10, 10), vtzero::geometry_exception);
|
|
}
|
|
|
|
TEST_CASE("Calling polygon_feature_builder::set_point() creating unclosed ring throws") {
|
|
vtzero::tile_builder tbuilder;
|
|
vtzero::layer_builder lbuilder{tbuilder, "test"};
|
|
vtzero::polygon_feature_builder fbuilder{lbuilder};
|
|
|
|
fbuilder.add_ring(4);
|
|
fbuilder.set_point(10, 10);
|
|
fbuilder.set_point(10, 20);
|
|
fbuilder.set_point(20, 20);
|
|
REQUIRE_THROWS_AS(fbuilder.set_point(20, 30), vtzero::geometry_exception);
|
|
}
|
|
|
|
TEST_CASE("Add polygon from container") {
|
|
const polygon_type points = {{{10, 20}, {20, 30}, {30, 40}, {10, 20}}};
|
|
|
|
vtzero::tile_builder tbuilder;
|
|
vtzero::layer_builder lbuilder{tbuilder, "test"};
|
|
|
|
{
|
|
vtzero::polygon_feature_builder fbuilder{lbuilder};
|
|
|
|
#if 0
|
|
SECTION("using iterators") {
|
|
fbuilder.add_ring(points[0].cbegin(), points[0].cend());
|
|
}
|
|
|
|
SECTION("using iterators and size") {
|
|
fbuilder.add_ring(points[0].cbegin(), points[0].cend(), static_cast<uint32_t>(points[0].size()));
|
|
}
|
|
#endif
|
|
|
|
SECTION("using container directly") {
|
|
fbuilder.add_ring_from_container(points[0]);
|
|
}
|
|
|
|
fbuilder.commit();
|
|
}
|
|
|
|
const std::string data = tbuilder.serialize();
|
|
|
|
vtzero::vector_tile tile{data};
|
|
|
|
auto layer = tile.next_layer();
|
|
REQUIRE(layer);
|
|
REQUIRE(layer.name() == "test");
|
|
REQUIRE(layer.version() == 2);
|
|
REQUIRE(layer.extent() == 4096);
|
|
REQUIRE(layer.num_features() == 1);
|
|
|
|
const auto feature = layer.next_feature();
|
|
|
|
polygon_handler handler;
|
|
vtzero::decode_polygon_geometry(feature.geometry(), handler);
|
|
|
|
REQUIRE(handler.data == points);
|
|
}
|
|
|
|
#if 0
|
|
TEST_CASE("Add polygon from iterator with wrong count throws assert") {
|
|
const std::vector<vtzero::point> points = {{10, 20}, {20, 30}, {30, 40}, {10, 20}};
|
|
|
|
vtzero::tile_builder tbuilder;
|
|
vtzero::layer_builder lbuilder{tbuilder, "test"};
|
|
vtzero::polygon_feature_builder fbuilder{lbuilder};
|
|
|
|
REQUIRE_THROWS_AS(fbuilder.add_ring(points.cbegin(),
|
|
points.cend(),
|
|
static_cast<uint32_t>(points.size() + 1)), const assert_error&);
|
|
}
|
|
#endif
|
|
|