-
Notifications
You must be signed in to change notification settings - Fork 462
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.
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
Add fixes and tests for 0-, 1-, and 2-vertex geoloops and holes #816
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -54,14 +54,22 @@ static LatLng invalid2Verts[] = {{NAN, NAN}, {-NAN, -NAN}}; | |
static GeoLoop invalid2GeoLoop = {.numVerts = 2, .verts = invalid2Verts}; | ||
static GeoPolygon invalid2GeoPolygon; | ||
|
||
static LatLng pointVerts[] = {{0, 0}}; | ||
static GeoLoop nullGeoLoop = {.numVerts = 0}; | ||
static GeoPolygon nullGeoPolygon; | ||
|
||
static LatLng pointVerts[] = {{0.6595072188743, -2.1371053983433}}; | ||
static GeoLoop pointGeoLoop = {.numVerts = 1, .verts = pointVerts}; | ||
static GeoPolygon pointGeoPolygon; | ||
|
||
static LatLng lineVerts[] = {{0, 0}, {1, 0}}; | ||
static LatLng lineVerts[] = {{0.6595072188743, -2.1371053983433}, | ||
{0.6591482046471, -2.1373141048153}}; | ||
static GeoLoop lineGeoLoop = {.numVerts = 2, .verts = lineVerts}; | ||
static GeoPolygon lineGeoPolygon; | ||
|
||
static GeoPolygon nullHoleGeoPolygon; | ||
static GeoPolygon pointHoleGeoPolygon; | ||
static GeoPolygon lineHoleGeoPolygon; | ||
|
||
/** | ||
* Return true if the cell crosses the meridian. | ||
*/ | ||
|
@@ -144,6 +152,18 @@ SUITE(polygonToCells) { | |
holeGeoPolygon.numHoles = 1; | ||
holeGeoPolygon.holes = &holeGeoLoop; | ||
|
||
nullHoleGeoPolygon.geoloop = sfGeoLoop; | ||
nullHoleGeoPolygon.numHoles = 1; | ||
nullHoleGeoPolygon.holes = &nullGeoLoop; | ||
|
||
pointHoleGeoPolygon.geoloop = sfGeoLoop; | ||
pointHoleGeoPolygon.numHoles = 1; | ||
pointHoleGeoPolygon.holes = &pointGeoLoop; | ||
|
||
lineHoleGeoPolygon.geoloop = sfGeoLoop; | ||
lineHoleGeoPolygon.numHoles = 1; | ||
lineHoleGeoPolygon.holes = &lineGeoLoop; | ||
|
||
emptyGeoPolygon.geoloop = emptyGeoLoop; | ||
emptyGeoPolygon.numHoles = 0; | ||
|
||
|
@@ -153,6 +173,9 @@ SUITE(polygonToCells) { | |
invalid2GeoPolygon.geoloop = invalid2GeoLoop; | ||
invalid2GeoPolygon.numHoles = 0; | ||
|
||
nullGeoPolygon.geoloop = nullGeoLoop; | ||
nullGeoPolygon.numHoles = 0; | ||
|
||
pointGeoPolygon.geoloop = pointGeoLoop; | ||
pointGeoPolygon.numHoles = 0; | ||
|
||
|
@@ -598,6 +621,282 @@ SUITE(polygonToCells) { | |
free(hexagons); | ||
} | ||
|
||
TEST(polygonToCellsNullPolygon) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&nullGeoPolygon, 9, CONTAINMENT_CENTER, &numHexagons)); | ||
t_assert(numHexagons == 0, "got expected estimated size"); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&nullGeoPolygon, 9, CONTAINMENT_CENTER, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
t_assert(actualNumIndexes == 0, "got expected polygonToCells size"); | ||
free(hexagons); | ||
} | ||
|
||
TEST(polygonToCellsNullPolygon_full) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&nullGeoPolygon, 9, CONTAINMENT_FULL, &numHexagons)); | ||
t_assert(numHexagons == 0, "got expected estimated size"); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&nullGeoPolygon, 9, CONTAINMENT_FULL, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
t_assert(actualNumIndexes == 0, "got expected polygonToCells size"); | ||
free(hexagons); | ||
} | ||
|
||
TEST(polygonToCellsNullPolygon_overlapping) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&nullGeoPolygon, 9, CONTAINMENT_OVERLAPPING, &numHexagons)); | ||
t_assert(numHexagons == 0, "got expected estimated size"); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&nullGeoPolygon, 9, CONTAINMENT_OVERLAPPING, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
t_assert(actualNumIndexes == 0, "got expected polygonToCells size"); | ||
free(hexagons); | ||
} | ||
|
||
TEST(polygonToCellsPointPolygon) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&pointGeoPolygon, 9, CONTAINMENT_CENTER, &numHexagons)); | ||
t_assert(numHexagons == 1, "got expected estimated size"); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&pointGeoPolygon, 9, CONTAINMENT_CENTER, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
t_assert(actualNumIndexes == 0, "got expected polygonToCells size"); | ||
free(hexagons); | ||
} | ||
|
||
TEST(polygonToCellsPointPolygon_full) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&pointGeoPolygon, 9, CONTAINMENT_FULL, &numHexagons)); | ||
t_assert(numHexagons == 1, "got expected estimated size"); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&pointGeoPolygon, 9, CONTAINMENT_FULL, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
t_assert(actualNumIndexes == 0, "got expected polygonToCells size"); | ||
free(hexagons); | ||
} | ||
|
||
TEST(polygonToCellsPointPolygon_overlapping) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&pointGeoPolygon, 9, CONTAINMENT_OVERLAPPING, &numHexagons)); | ||
t_assert(numHexagons == 1, "got expected estimated size"); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&pointGeoPolygon, 9, CONTAINMENT_OVERLAPPING, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
t_assert(actualNumIndexes == 1, "got expected polygonToCells size"); | ||
free(hexagons); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There is a test missing in this PR for polygonToCellsPointPolygon_overlappingBbox (and same for the below), which is why the fuzzer is still failing |
||
|
||
TEST(polygonToCellsLinePolygon) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&lineGeoPolygon, 9, CONTAINMENT_CENTER, &numHexagons)); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&lineGeoPolygon, 9, CONTAINMENT_CENTER, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
t_assert(actualNumIndexes == 0, "got expected polygonToCells size"); | ||
free(hexagons); | ||
} | ||
|
||
TEST(polygonToCellsLinePolygon_full) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&lineGeoPolygon, 9, CONTAINMENT_FULL, &numHexagons)); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&lineGeoPolygon, 9, CONTAINMENT_FULL, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
t_assert(actualNumIndexes == 0, "got expected polygonToCells size"); | ||
free(hexagons); | ||
} | ||
|
||
TEST(polygonToCellsLinePolygon_overlapping) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&lineGeoPolygon, 9, CONTAINMENT_OVERLAPPING, &numHexagons)); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&lineGeoPolygon, 9, CONTAINMENT_OVERLAPPING, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
t_assert(actualNumIndexes == 9, "got expected polygonToCells size"); | ||
free(hexagons); | ||
} | ||
|
||
TEST(polygonToCellsNullHole) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&nullHoleGeoPolygon, 9, CONTAINMENT_CENTER, &numHexagons)); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&nullHoleGeoPolygon, 9, CONTAINMENT_CENTER, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
// Same as without the hole | ||
t_assert(actualNumIndexes == 1253, | ||
"got expected polygonToCells size (null hole)"); | ||
free(hexagons); | ||
} | ||
|
||
TEST(polygonToCellsNullHole_full) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&nullHoleGeoPolygon, 9, CONTAINMENT_FULL, &numHexagons)); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&nullHoleGeoPolygon, 9, CONTAINMENT_FULL, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
// Same as without the hole | ||
t_assert(actualNumIndexes == 1175, | ||
"got expected polygonToCells size (null hole)"); | ||
free(hexagons); | ||
} | ||
|
||
TEST(polygonToCellsNullHole_overlapping) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&nullHoleGeoPolygon, 9, CONTAINMENT_OVERLAPPING, &numHexagons)); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&nullHoleGeoPolygon, 9, CONTAINMENT_OVERLAPPING, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
// Same as without the hole | ||
t_assert(actualNumIndexes == 1334, | ||
"got expected polygonToCells size (null hole)"); | ||
free(hexagons); | ||
} | ||
|
||
TEST(polygonToCellsPointHole) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&pointHoleGeoPolygon, 9, CONTAINMENT_CENTER, &numHexagons)); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&pointHoleGeoPolygon, 9, CONTAINMENT_CENTER, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
// Same as without the hole | ||
t_assert(actualNumIndexes == 1253, | ||
"got expected polygonToCells size (point hole)"); | ||
free(hexagons); | ||
} | ||
|
||
TEST(polygonToCellsPointHole_full) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&pointHoleGeoPolygon, 9, CONTAINMENT_FULL, &numHexagons)); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&pointHoleGeoPolygon, 9, CONTAINMENT_FULL, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
// We expect that the cell containing the hole is not included | ||
t_assert(actualNumIndexes == 1175 - 1, | ||
"got expected polygonToCells size (point hole)"); | ||
free(hexagons); | ||
} | ||
|
||
TEST(polygonToCellsPointHole_overlapping) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&pointHoleGeoPolygon, 9, CONTAINMENT_OVERLAPPING, &numHexagons)); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&pointHoleGeoPolygon, 9, CONTAINMENT_OVERLAPPING, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
// Same as without the hole | ||
t_assert(actualNumIndexes == 1334, | ||
"got expected polygonToCells size (point hole)"); | ||
free(hexagons); | ||
} | ||
|
||
TEST(polygonToCellsLineHole) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&lineHoleGeoPolygon, 9, CONTAINMENT_CENTER, &numHexagons)); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&lineHoleGeoPolygon, 9, CONTAINMENT_CENTER, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
// Same as without the hole | ||
t_assert(actualNumIndexes == 1253, | ||
"got expected polygonToCells size (line hole)"); | ||
free(hexagons); | ||
} | ||
|
||
TEST(polygonToCellsLineHole_full) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&lineHoleGeoPolygon, 9, CONTAINMENT_FULL, &numHexagons)); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&lineHoleGeoPolygon, 9, CONTAINMENT_FULL, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
// We expect that the cells intersecting the line are not included | ||
t_assert(actualNumIndexes == 1175 - 9, | ||
"got expected polygonToCells size (line hole)"); | ||
free(hexagons); | ||
} | ||
|
||
TEST(polygonToCellsLineHole_overlapping) { | ||
int64_t numHexagons; | ||
t_assertSuccess(H3_EXPORT(maxPolygonToCellsSizeExperimental)( | ||
&lineHoleGeoPolygon, 9, CONTAINMENT_OVERLAPPING, &numHexagons)); | ||
H3Index *hexagons = calloc(numHexagons, sizeof(H3Index)); | ||
|
||
t_assertSuccess(H3_EXPORT(polygonToCellsExperimental)( | ||
&lineHoleGeoPolygon, 9, CONTAINMENT_OVERLAPPING, hexagons)); | ||
int64_t actualNumIndexes = countNonNullIndexes(hexagons, numHexagons); | ||
|
||
// Same as without the hole | ||
t_assert(actualNumIndexes == 1334, | ||
"got expected polygonToCells size (line hole)"); | ||
free(hexagons); | ||
} | ||
|
||
TEST(invalidFlags) { | ||
int64_t numHexagons; | ||
for (uint32_t flags = CONTAINMENT_INVALID; flags <= 32; flags++) { | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -418,6 +418,12 @@ void iterStepPolygonCompact(IterCellsPolygonCompact *iter) { | |
iter->_started = true; | ||
} | ||
|
||
// Short-circuit iteration for 0-vert polygon | ||
if (iter->_polygon->geoloop.numVerts == 0) { | ||
iterDestroyPolygonCompact(iter); | ||
return; | ||
} | ||
|
||
ContainmentMode mode = FLAG_GET_CONTAINMENT_MODE(iter->_flags); | ||
|
||
while (cell) { | ||
|
@@ -700,6 +706,17 @@ static double getAverageCellArea(int res) { | |
H3Error H3_EXPORT(maxPolygonToCellsSizeExperimental)(const GeoPolygon *polygon, | ||
int res, uint32_t flags, | ||
int64_t *out) { | ||
// Special case: 0-vertex polygon | ||
if (polygon->geoloop.numVerts == 0) { | ||
*out = 0; | ||
return E_SUCCESS; | ||
} | ||
// Special case: 1-vertex polygon | ||
if (polygon->geoloop.numVerts == 1) { | ||
*out = 1; | ||
return E_SUCCESS; | ||
} | ||
Comment on lines
+714
to
+718
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In overlapping BBOX mode, this will not be correct as more than one cell bounding box may overlap a vertex. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Gotcha. I'll have a new PR up for this soon. |
||
|
||
// Initialize the iterator without stepping, so we can adjust the res and | ||
// flags (after they are validated by the initialization) before we start | ||
IterCellsPolygonCompact iter = _iterInitPolygonCompact(polygon, res, flags); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe these could be collapsed to the same test and just loop through which flags to test? Might be easier to read that way?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
True, that's what you did in #800. I can collapse this one, and the null hole, but not the other two (where OVERLAPPING and FULL behave differently)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, actually this is the only one I can collapse, the others have different results per mode