diegoripley/tippecanoe
1
0
Fork 0
mirror of https://github.com/felt/tippecanoe.git synced 2026-10-06 10:25:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade Wagyu to version 0.5.0

Browse Source
This commit is contained in:
Eric Fischer
2020-08-25 17:00:50 -07:00
parent ddb79937d9
commit e0c7f1b91a
55 changed files with 794 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mapbox/geometry/wagyu/wagyu.hpp
+15 -11
View File
@@ -10,17 +10,17 @@
#include <mapbox/geometry/wagyu/build_local_minima_list.hpp>
#include <mapbox/geometry/wagyu/build_result.hpp>
#include <mapbox/geometry/wagyu/config.hpp>
#include <mapbox/geometry/wagyu/interrupt.hpp>
#include <mapbox/geometry/wagyu/local_minimum.hpp>
#include <mapbox/geometry/wagyu/snap_rounding.hpp>
#include <mapbox/geometry/wagyu/topology_correction.hpp>
#include <mapbox/geometry/wagyu/vatti.hpp>
#define WAGYU_MAJOR_VERSION 0
#define WAGYU_MINOR_VERSION 4
#define WAGYU_PATCH_VERSION 3
#define WAGYU_MINOR_VERSION 5
#define WAGYU_PATCH_VERSION 0
#define WAGYU_VERSION \
(WAGYU_MAJOR_VERSION * 100000) + (WAGYU_MINOR_VERSION * 100) + (WAGYU_PATCH_VERSION)
#define WAGYU_VERSION (WAGYU_MAJOR_VERSION * 100000) + (WAGYU_MINOR_VERSION * 100) + (WAGYU_PATCH_VERSION)
namespace mapbox {
namespace geometry {
@@ -44,14 +44,12 @@ public:
}
template <typename T2>
bool add_ring(mapbox::geometry::linear_ring<T2> const& pg,
polygon_type p_type = polygon_type_subject) {
bool add_ring(mapbox::geometry::linear_ring<T2> const& pg, polygon_type p_type = polygon_type_subject) {
return add_linear_ring(pg, minima_list, p_type);
}
template <typename T2>
bool add_polygon(mapbox::geometry::polygon<T2> const& ppg,
polygon_type p_type = polygon_type_subject) {
bool add_polygon(mapbox::geometry::polygon<T2> const& ppg, polygon_type p_type = polygon_type_subject) {
bool result = false;
for (auto const& r : ppg) {
if (add_ring(r, p_type)) {
@@ -125,10 +123,16 @@ public:
ring_manager<T> manager;
interrupt_check(); // Check for interruptions
build_hot_pixels(minima_list, manager);
interrupt_check(); // Check for interruptions
execute_vatti(minima_list, manager, cliptype, subject_fill_type, clip_fill_type);
interrupt_check(); // Check for interruptions
correct_topology(manager);
build_result(solution, manager, reverse_output);
@@ -136,6 +140,6 @@ public:
return true;
}
};
}
}
}
} // namespace wagyu
} // namespace geometry
} // namespace mapbox