Skip to content

Cover polygonToCells bbox mis-estimation branch #1207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
isaacbrodsky wants to merge 1 commit into
base: master
Choose a base branch
from
+56 −1
Open

Cover polygonToCells bbox mis-estimation branch #1207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions src/apps/testapps/testPolygonToCells.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,15 @@ static LatLng lineVerts[] = {{0, 0}, {1, 0}};
static GeoLoop lineGeoLoop = {.numVerts = 2, .verts = lineVerts};
static GeoPolygon lineGeoPolygon;

static LatLng polarBandVerts[] = {
{85 * M_PI / 180, 0},
{85 * M_PI / 180, 179 * M_PI / 180},
{89.9 * M_PI / 180, 179 * M_PI / 180},
{89.9 * M_PI / 180, 0},
};
static GeoLoop polarBandGeoLoop = {.numVerts = 4, .verts = polarBandVerts};
static GeoPolygon polarBandGeoPolygon;

/**
* Return true if the cell crosses the meridian.
*/
Expand Down Expand Up @@ -179,6 +188,9 @@ SUITE(polygonToCells) {
invalidHoleGeoPolygon.numHoles = 1;
invalidHoleGeoPolygon.holes = &invalidHoleGeoLoop;

polarBandGeoPolygon.geoloop = polarBandGeoLoop;
polarBandGeoPolygon.numHoles = 0;

// --------------------------------------------
// maxPolygonToCellsSize
// --------------------------------------------
Expand Down Expand Up @@ -273,6 +285,20 @@ SUITE(polygonToCells) {
free(hexagons);
}

TEST(polygonToCells_polarBand) {
// Exercise a misestimation in bboxHexEstimate
int64_t numHexagons;
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSize)(&polarBandGeoPolygon,
9, 0, &numHexagons));
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index));

t_assert(H3_EXPORT(polygonToCells)(&polarBandGeoPolygon, 9, 0,
hexagons) == E_FAILED,
"polar band mis-estimates the number of cells");

free(hexagons);
}

TEST(polygonToCellsExact) {
LatLng somewhere = {1, 2};
H3Index origin;
Expand Down
30 changes: 30 additions & 0 deletions src/apps/testapps/testPolygonToCellsExperimental.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,15 @@ static LatLng lineVerts[] = {{0.6595072188743, -2.1371053983433},
static GeoLoop lineGeoLoop = {.numVerts = 2, .verts = lineVerts};
static GeoPolygon lineGeoPolygon;

static LatLng polarBandVerts[] = {
{85 * M_PI / 180, 0},
{85 * M_PI / 180, 179 * M_PI / 180},
{89.9 * M_PI / 180, 179 * M_PI / 180},
{89.9 * M_PI / 180, 0},
};
static GeoLoop polarBandGeoLoop = {.numVerts = 4, .verts = polarBandVerts};
static GeoPolygon polarBandGeoPolygon;

static GeoPolygon nullHoleGeoPolygon;
static GeoPolygon pointHoleGeoPolygon;
static GeoPolygon lineHoleGeoPolygon;
Expand Down Expand Up @@ -191,6 +200,9 @@ SUITE(polygonToCells) {
lineGeoPolygon.geoloop = lineGeoLoop;
lineGeoPolygon.numHoles = 0;

polarBandGeoPolygon.geoloop = polarBandGeoLoop;
polarBandGeoPolygon.numHoles = 0;

TEST(polygonToCells_ZeroSize) {
t_assert(H3_EXPORT(polygonToCellsExperimental)(&sfGeoPolygon, 9,
CONTAINMENT_CENTER, 0,
Expand Down Expand Up @@ -377,6 +389,24 @@ SUITE(polygonToCells) {
free(hexagons);
}

TEST(polygonToCells_polarBand) {
// Exercise a misestimation in bboxHexEstimate
int64_t numHexagons;
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)(
&polarBandGeoPolygon, 9, CONTAINMENT_CENTER, &numHexagons));
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index));

t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)(
&polarBandGeoPolygon, 9, CONTAINMENT_CENTER, numHexagons,
hexagons));
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons);

t_assert(actualNumIndexes == 4171389,
"got expected polygonToCells size");

free(hexagons);
}

TEST(polygonToCellsContainsPolygon) {
int64_t numHexagons;
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)(
Expand Down
1 change: 0 additions & 1 deletion src/h3lib/lib/algos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,6 @@ H3Error H3_EXPORT(polygonToCells)(const GeoPolygon *geoPolygon, int res,
// If this branch is reached, we have exceeded the maximum
// number of hexagons possible and need to clean up the
// allocated memory.
// TODO: Reachable via fuzzer
if (loopCount > numHexagons) {
H3_MEMORY(free)(search);
H3_MEMORY(free)(found);
Expand Down
Loading