h3 3.5.0 → 3.7.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/CHANGELOG.md +45 -0
- data/Gemfile.lock +9 -7
- data/README.md +8 -8
- data/ext/h3/src/.github/workflows/test-linux.yml +118 -0
- data/ext/h3/src/.github/workflows/test-macos.yml +42 -0
- data/ext/h3/src/.github/workflows/test-website.yml +32 -0
- data/ext/h3/src/.github/workflows/test-windows.yml +44 -0
- data/ext/h3/src/.gitignore +5 -0
- data/ext/h3/src/.travis.yml +21 -32
- data/ext/h3/src/CHANGELOG.md +60 -0
- data/ext/h3/src/CMakeLists.txt +150 -33
- data/ext/h3/src/CONTRIBUTING.md +1 -1
- data/ext/h3/src/README.md +65 -16
- data/ext/h3/src/RELEASE.md +3 -1
- data/ext/h3/src/VERSION +1 -1
- data/ext/h3/src/dev-docs/RFCs/rfc-template.md +21 -0
- data/ext/h3/src/dev-docs/RFCs/v4.0.0/error-handling-rfc.md +21 -0
- data/ext/h3/src/dev-docs/RFCs/v4.0.0/names_for_concepts_types_functions.md +276 -0
- data/ext/h3/src/dev-docs/RFCs/v4.0.0/overrideable-allocators-rfc.md +141 -0
- data/ext/h3/src/dev-docs/RFCs/v4.0.0/polyfill-modes-rfc.md +21 -0
- data/ext/h3/src/dev-docs/RFCs/v4.0.0/vertex-mode-rfc.md +50 -0
- data/ext/h3/src/dev-docs/build_windows.md +6 -1
- data/ext/h3/src/dev-docs/creating_bindings.md +3 -3
- data/ext/h3/src/dev-docs/custom_alloc.md +27 -0
- data/ext/h3/src/docs/{overview/mainpage.md → README.md} +2 -3
- data/ext/h3/src/docs/api/hierarchy.md +8 -0
- data/ext/h3/src/docs/api/misc.md +94 -0
- data/ext/h3/src/docs/community/applications.md +1 -0
- data/ext/h3/src/docs/community/bindings.md +10 -0
- data/ext/h3/src/docs/community/tutorials.md +8 -3
- data/ext/h3/src/docs/core-library/coordsystems.md +5 -4
- data/ext/h3/src/docs/core-library/filters.md +8 -9
- data/ext/h3/src/docs/core-library/geoToH3desc.md +2 -3
- data/ext/h3/src/docs/core-library/h3ToGeoBoundaryDesc.md +4 -5
- data/ext/h3/src/docs/core-library/h3ToGeoDesc.md +3 -4
- data/ext/h3/src/docs/core-library/h3indexing.md +26 -17
- data/ext/h3/src/docs/core-library/overview.md +2 -3
- data/ext/h3/src/docs/core-library/restable.md +1 -2
- data/ext/h3/src/docs/core-library/usage.md +1 -2
- data/ext/h3/src/docs/table-of-contents.json +47 -0
- data/ext/h3/src/docs/{overview/usecases.md → usecases.md} +6 -11
- data/ext/h3/src/scripts/binding_functions.sh +1 -1
- data/ext/h3/src/scripts/coverage.sh.in +8 -4
- data/ext/h3/src/scripts/update_version.sh +2 -2
- data/ext/h3/src/src/apps/applib/include/args.h +1 -0
- data/ext/h3/src/src/apps/applib/include/test.h +1 -0
- data/ext/h3/src/src/apps/applib/include/utility.h +7 -1
- data/ext/h3/src/src/apps/applib/lib/args.c +2 -0
- data/ext/h3/src/src/apps/applib/lib/kml.c +2 -0
- data/ext/h3/src/src/apps/applib/lib/test.c +1 -0
- data/ext/h3/src/src/apps/applib/lib/utility.c +133 -2
- data/ext/h3/src/src/apps/benchmarks/benchmarkH3Api.c +1 -1
- data/ext/h3/src/{website/html.config.js → src/apps/benchmarks/benchmarkH3UniEdge.c} +15 -12
- data/ext/h3/src/src/apps/filters/h3ToComponents.c +1 -0
- data/ext/h3/src/src/apps/filters/h3ToGeo.c +1 -0
- data/ext/h3/src/src/apps/filters/h3ToGeoBoundary.c +1 -0
- data/ext/h3/src/src/apps/filters/h3ToLocalIj.c +1 -0
- data/ext/h3/src/src/apps/filters/hexRange.c +1 -0
- data/ext/h3/src/src/apps/filters/kRing.c +1 -0
- data/ext/h3/src/src/apps/filters/localIjToH3.c +1 -0
- data/ext/h3/src/src/apps/miscapps/generateBaseCellNeighbors.c +2 -2
- data/ext/h3/src/src/apps/miscapps/generateFaceCenterPoint.c +1 -0
- data/ext/h3/src/src/apps/miscapps/generateNumHexagons.c +1 -2
- data/ext/h3/src/src/apps/miscapps/generatePentagonDirectionFaces.c +67 -0
- data/ext/h3/src/src/apps/miscapps/h3ToGeoBoundaryHier.c +1 -0
- data/ext/h3/src/src/apps/miscapps/h3ToGeoHier.c +1 -0
- data/ext/h3/src/src/apps/miscapps/h3ToHier.c +1 -0
- data/ext/h3/src/src/apps/testapps/mkRandGeo.c +1 -0
- data/ext/h3/src/src/apps/testapps/mkRandGeoBoundary.c +1 -0
- data/ext/h3/src/src/apps/testapps/testBBox.c +1 -0
- data/ext/h3/src/src/apps/testapps/testBaseCells.c +15 -1
- data/ext/h3/src/src/apps/testapps/testCompact.c +121 -2
- data/ext/h3/src/src/apps/testapps/testCoordIj.c +1 -0
- data/ext/h3/src/src/apps/testapps/testGeoCoord.c +47 -8
- data/ext/h3/src/src/apps/testapps/testGeoToH3.c +1 -0
- data/ext/h3/src/src/apps/testapps/testH3Api.c +1 -0
- data/ext/h3/src/src/apps/testapps/testH3CellArea.c +47 -0
- data/ext/h3/src/src/apps/testapps/testH3CellAreaExhaustive.c +180 -0
- data/ext/h3/src/src/apps/testapps/testH3Distance.c +2 -50
- data/ext/h3/src/src/apps/testapps/testH3DistanceExhaustive.c +84 -0
- data/ext/h3/src/src/apps/testapps/testH3GetFaces.c +1 -0
- data/ext/h3/src/src/apps/testapps/testH3Index.c +33 -3
- data/ext/h3/src/src/apps/testapps/testH3Line.c +2 -84
- data/ext/h3/src/src/apps/testapps/testH3LineExhaustive.c +115 -0
- data/ext/h3/src/src/apps/testapps/testH3Memory.c +175 -0
- data/ext/h3/src/src/apps/testapps/testH3NeighborRotations.c +1 -0
- data/ext/h3/src/src/apps/testapps/testH3SetToLinkedGeo.c +1 -0
- data/ext/h3/src/src/apps/testapps/testH3SetToVertexGraph.c +1 -0
- data/ext/h3/src/src/apps/testapps/testH3ToCenterChild.c +68 -0
- data/ext/h3/src/src/apps/testapps/testH3ToChildren.c +15 -2
- data/ext/h3/src/src/apps/testapps/testH3ToGeo.c +1 -0
- data/ext/h3/src/src/apps/testapps/testH3ToGeoBoundary.c +1 -0
- data/ext/h3/src/src/apps/testapps/testH3ToLocalIj.c +24 -236
- data/ext/h3/src/src/apps/testapps/testH3ToLocalIjExhaustive.c +265 -0
- data/ext/h3/src/src/apps/testapps/testH3ToParent.c +1 -0
- data/ext/h3/src/src/apps/testapps/testH3UniEdge.c +45 -16
- data/ext/h3/src/src/apps/testapps/testH3UniEdgeExhaustive.c +111 -0
- data/ext/h3/src/src/apps/testapps/testHexRanges.c +1 -0
- data/ext/h3/src/src/apps/testapps/testHexRing.c +1 -0
- data/ext/h3/src/src/apps/testapps/testKRing.c +1 -0
- data/ext/h3/src/src/apps/testapps/testLinkedGeo.c +1 -0
- data/ext/h3/src/src/apps/testapps/testMaxH3ToChildrenSize.c +1 -0
- data/ext/h3/src/src/apps/testapps/testPentagonIndexes.c +58 -0
- data/ext/h3/src/src/apps/testapps/testPolyfill.c +72 -9
- data/ext/h3/src/src/apps/testapps/testPolyfillReported.c +157 -0
- data/ext/h3/src/src/apps/testapps/testPolygon.c +27 -1
- data/ext/h3/src/src/apps/testapps/testVec2d.c +1 -0
- data/ext/h3/src/src/apps/testapps/testVec3d.c +1 -0
- data/ext/h3/src/src/apps/testapps/testVertex.c +66 -0
- data/ext/h3/src/src/apps/testapps/testVertexGraph.c +1 -0
- data/ext/h3/src/src/h3lib/include/algos.h +8 -0
- data/ext/h3/src/src/h3lib/include/alloc.h +40 -0
- data/ext/h3/src/src/h3lib/include/baseCells.h +4 -0
- data/ext/h3/src/src/h3lib/include/bbox.h +4 -1
- data/ext/h3/src/src/h3lib/include/constants.h +2 -0
- data/ext/h3/src/src/h3lib/include/faceijk.h +3 -2
- data/ext/h3/src/src/h3lib/include/geoCoord.h +2 -3
- data/ext/h3/src/src/h3lib/include/h3Index.h +37 -4
- data/ext/h3/src/src/h3lib/include/h3api.h.in +85 -17
- data/ext/h3/src/src/h3lib/include/linkedGeo.h +1 -0
- data/ext/h3/src/src/h3lib/include/polygon.h +1 -0
- data/ext/h3/src/src/h3lib/include/polygonAlgos.h +1 -0
- data/ext/h3/src/src/h3lib/include/vertex.h +44 -0
- data/ext/h3/src/src/h3lib/include/vertexGraph.h +1 -0
- data/ext/h3/src/src/h3lib/lib/algos.c +305 -80
- data/ext/h3/src/src/h3lib/lib/baseCells.c +26 -4
- data/ext/h3/src/src/h3lib/lib/bbox.c +56 -27
- data/ext/h3/src/src/h3lib/lib/coordijk.c +2 -0
- data/ext/h3/src/src/h3lib/lib/faceijk.c +35 -24
- data/ext/h3/src/src/h3lib/lib/geoCoord.c +162 -44
- data/ext/h3/src/src/h3lib/lib/h3Index.c +150 -46
- data/ext/h3/src/src/h3lib/lib/h3UniEdge.c +42 -57
- data/ext/h3/src/src/h3lib/lib/linkedGeo.c +20 -15
- data/ext/h3/src/src/h3lib/lib/localij.c +5 -5
- data/ext/h3/src/src/h3lib/lib/polygon.c +3 -2
- data/ext/h3/src/src/h3lib/lib/vec2d.c +1 -0
- data/ext/h3/src/src/h3lib/lib/vec3d.c +1 -0
- data/ext/h3/src/src/h3lib/lib/vertex.c +134 -0
- data/ext/h3/src/src/h3lib/lib/vertexGraph.c +8 -5
- data/ext/h3/src/website/.eslintignore +2 -0
- data/ext/h3/src/website/.gitignore +57 -0
- data/ext/h3/src/website/.nvmrc +1 -0
- data/ext/h3/src/website/README.md +8 -6
- data/ext/h3/src/website/gatsby-config.js +83 -0
- data/ext/h3/src/website/package.json +20 -12
- data/ext/h3/src/website/scripts/build-to-gh-pages.sh +7 -5
- data/ext/h3/src/website/src/.gitkeep +0 -0
- data/ext/h3/src/website/templates/documentation.jsx +129 -0
- data/ext/h3/src/website/yarn.lock +13723 -0
- data/h3.gemspec +1 -0
- data/lib/h3.rb +8 -23
- data/lib/h3/bindings/base.rb +15 -4
- data/lib/h3/bindings/private.rb +13 -9
- data/lib/h3/geo_json.rb +1 -1
- data/lib/h3/hierarchy.rb +24 -9
- data/lib/h3/indexing.rb +7 -7
- data/lib/h3/inspection.rb +22 -26
- data/lib/h3/miscellaneous.rb +157 -9
- data/lib/h3/regions.rb +3 -0
- data/lib/h3/traversal.rb +9 -9
- data/lib/h3/unidirectional_edges.rb +18 -18
- data/lib/h3/version.rb +1 -1
- data/spec/geo_json_spec.rb +8 -0
- data/spec/hierarchy_spec.rb +23 -13
- data/spec/indexing_spec.rb +15 -15
- data/spec/inspection_spec.rb +17 -17
- data/spec/miscellaneous_spec.rb +151 -6
- data/spec/{region_spec.rb → regions_spec.rb} +1 -1
- data/spec/traversal_spec.rb +6 -6
- data/spec/unidirectional_edges_spec.rb +18 -18
- metadata +55 -15
- data/ext/h3/src/.ycm_extra_conf.py +0 -92
- data/ext/h3/src/appveyor.yml +0 -50
- data/ext/h3/src/website/src/config.js +0 -46
- data/ext/h3/src/website/src/mdRoutes.js +0 -151
- data/ext/h3/src/website/src/styles/_variables.scss +0 -16
- data/ext/h3/src/website/src/styles/index.scss +0 -3
- data/ext/h3/src/website/static/index.html +0 -15
- data/lib/h3/bindings.rb +0 -12
@@ -0,0 +1,58 @@
|
|
1
|
+
/*
|
2
|
+
* Copyright 2019 Uber Technologies, Inc.
|
3
|
+
*
|
4
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
+
* you may not use this file except in compliance with the License.
|
6
|
+
* You may obtain a copy of the License at
|
7
|
+
*
|
8
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
9
|
+
*
|
10
|
+
* Unless required by applicable law or agreed to in writing, software
|
11
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
+
* See the License for the specific language governing permissions and
|
14
|
+
* limitations under the License.
|
15
|
+
*/
|
16
|
+
|
17
|
+
#include <stdlib.h>
|
18
|
+
|
19
|
+
#include "h3api.h"
|
20
|
+
#include "test.h"
|
21
|
+
|
22
|
+
#define PADDED_COUNT 16
|
23
|
+
|
24
|
+
SUITE(getPentagonIndexes) {
|
25
|
+
TEST(propertyTests) {
|
26
|
+
int expectedCount = H3_EXPORT(pentagonIndexCount)();
|
27
|
+
|
28
|
+
for (int res = 0; res <= 15; res++) {
|
29
|
+
H3Index h3Indexes[PADDED_COUNT] = {0};
|
30
|
+
H3_EXPORT(getPentagonIndexes)(res, h3Indexes);
|
31
|
+
|
32
|
+
int numFound = 0;
|
33
|
+
|
34
|
+
for (int i = 0; i < PADDED_COUNT; i++) {
|
35
|
+
H3Index h3Index = h3Indexes[i];
|
36
|
+
if (h3Index) {
|
37
|
+
numFound++;
|
38
|
+
t_assert(H3_EXPORT(h3IsValid(h3Index)),
|
39
|
+
"index should be valid");
|
40
|
+
t_assert(H3_EXPORT(h3IsPentagon(h3Index)),
|
41
|
+
"index should be pentagon");
|
42
|
+
t_assert(H3_EXPORT(h3GetResolution(h3Index)) == res,
|
43
|
+
"index should have correct resolution");
|
44
|
+
|
45
|
+
// verify uniqueness
|
46
|
+
for (int j = i + 1; j < PADDED_COUNT; j++) {
|
47
|
+
if (h3Indexes[j] == h3Index) {
|
48
|
+
t_assert(false, "index should be seen only once");
|
49
|
+
}
|
50
|
+
}
|
51
|
+
}
|
52
|
+
}
|
53
|
+
|
54
|
+
t_assert(numFound == expectedCount,
|
55
|
+
"there should be exactly 12 pentagons");
|
56
|
+
}
|
57
|
+
}
|
58
|
+
}
|
@@ -15,11 +15,13 @@
|
|
15
15
|
*/
|
16
16
|
|
17
17
|
#include <stdlib.h>
|
18
|
+
|
18
19
|
#include "algos.h"
|
19
20
|
#include "constants.h"
|
20
21
|
#include "geoCoord.h"
|
21
22
|
#include "h3Index.h"
|
22
23
|
#include "test.h"
|
24
|
+
#include "utility.h"
|
23
25
|
|
24
26
|
// Fixtures
|
25
27
|
static GeoCoord sfVerts[] = {
|
@@ -41,14 +43,69 @@ static GeoCoord emptyVerts[] = {{0.659966917655, -2.1364398519394},
|
|
41
43
|
static Geofence emptyGeofence = {.numVerts = 3, .verts = emptyVerts};
|
42
44
|
static GeoPolygon emptyGeoPolygon;
|
43
45
|
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
46
|
+
/**
|
47
|
+
* Return true if the cell crosses the meridian.
|
48
|
+
*/
|
49
|
+
static bool isTransmeridianCell(H3Index h) {
|
50
|
+
GeoBoundary bndry;
|
51
|
+
H3_EXPORT(h3ToGeoBoundary)(h, &bndry);
|
52
|
+
|
53
|
+
double minLon = M_PI, maxLon = -M_PI;
|
54
|
+
for (int i = 0; i < bndry.numVerts; i++) {
|
55
|
+
if (bndry.verts[i].lon < minLon) minLon = bndry.verts[i].lon;
|
56
|
+
if (bndry.verts[i].lon > maxLon) maxLon = bndry.verts[i].lon;
|
57
|
+
}
|
58
|
+
|
59
|
+
return maxLon - minLon > M_PI - (M_PI / 4);
|
60
|
+
}
|
61
|
+
|
62
|
+
static void fillIndex_assertions(H3Index h) {
|
63
|
+
if (isTransmeridianCell(h)) {
|
64
|
+
// TODO: these do not work correctly
|
65
|
+
return;
|
66
|
+
}
|
67
|
+
|
68
|
+
int currentRes = H3_EXPORT(h3GetResolution)(h);
|
69
|
+
// TODO: Not testing more than one depth because the assertions fail.
|
70
|
+
for (int nextRes = currentRes; nextRes <= currentRes + 1; nextRes++) {
|
71
|
+
GeoBoundary bndry;
|
72
|
+
H3_EXPORT(h3ToGeoBoundary)(h, &bndry);
|
73
|
+
GeoPolygon polygon = {
|
74
|
+
.geofence = {.numVerts = bndry.numVerts, .verts = bndry.verts},
|
75
|
+
.numHoles = 0,
|
76
|
+
.holes = 0};
|
77
|
+
|
78
|
+
int polyfillSize = H3_EXPORT(maxPolyfillSize)(&polygon, nextRes);
|
79
|
+
H3Index* polyfillOut = calloc(polyfillSize, sizeof(H3Index));
|
80
|
+
H3_EXPORT(polyfill)(&polygon, nextRes, polyfillOut);
|
81
|
+
|
82
|
+
int polyfillCount = countActualHexagons(polyfillOut, polyfillSize);
|
83
|
+
|
84
|
+
int childrenSize = H3_EXPORT(maxH3ToChildrenSize)(h, nextRes);
|
85
|
+
H3Index* children = calloc(childrenSize, sizeof(H3Index));
|
86
|
+
H3_EXPORT(h3ToChildren)(h, nextRes, children);
|
87
|
+
|
88
|
+
int h3ToChildrenCount = countActualHexagons(children, childrenSize);
|
89
|
+
|
90
|
+
t_assert(polyfillCount == h3ToChildrenCount,
|
91
|
+
"Polyfill count matches h3ToChildren count");
|
92
|
+
|
93
|
+
for (int i = 0; i < childrenSize; i++) {
|
94
|
+
bool found = false;
|
95
|
+
if (children[i] == H3_NULL) continue;
|
96
|
+
for (int j = 0; j < polyfillSize; j++) {
|
97
|
+
if (polyfillOut[j] == children[i]) {
|
98
|
+
found = true;
|
99
|
+
break;
|
100
|
+
}
|
101
|
+
}
|
102
|
+
t_assert(found,
|
103
|
+
"All indexes match between polyfill and h3ToChildren");
|
49
104
|
}
|
105
|
+
|
106
|
+
free(polyfillOut);
|
107
|
+
free(children);
|
50
108
|
}
|
51
|
-
return actualNumHexagons;
|
52
109
|
}
|
53
110
|
|
54
111
|
SUITE(polyfill) {
|
@@ -64,13 +121,13 @@ SUITE(polyfill) {
|
|
64
121
|
|
65
122
|
TEST(maxPolyfillSize) {
|
66
123
|
int numHexagons = H3_EXPORT(maxPolyfillSize)(&sfGeoPolygon, 9);
|
67
|
-
t_assert(numHexagons ==
|
124
|
+
t_assert(numHexagons == 5613, "got expected max polyfill size");
|
68
125
|
|
69
126
|
numHexagons = H3_EXPORT(maxPolyfillSize)(&holeGeoPolygon, 9);
|
70
|
-
t_assert(numHexagons ==
|
127
|
+
t_assert(numHexagons == 5613, "got expected max polyfill size (hole)");
|
71
128
|
|
72
129
|
numHexagons = H3_EXPORT(maxPolyfillSize)(&emptyGeoPolygon, 9);
|
73
|
-
t_assert(numHexagons ==
|
130
|
+
t_assert(numHexagons == 15, "got expected max polyfill size (empty)");
|
74
131
|
}
|
75
132
|
|
76
133
|
TEST(polyfill) {
|
@@ -300,4 +357,10 @@ SUITE(polyfill) {
|
|
300
357
|
t_assert(numPentagons == 1, "one pentagon found");
|
301
358
|
free(hexagons);
|
302
359
|
}
|
360
|
+
|
361
|
+
TEST(fillIndex) {
|
362
|
+
iterateAllIndexesAtRes(0, fillIndex_assertions);
|
363
|
+
iterateAllIndexesAtRes(1, fillIndex_assertions);
|
364
|
+
iterateAllIndexesAtRes(2, fillIndex_assertions);
|
365
|
+
}
|
303
366
|
}
|
@@ -0,0 +1,157 @@
|
|
1
|
+
/*
|
2
|
+
* Copyright 2017-2019 Uber Technologies, Inc.
|
3
|
+
*
|
4
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
+
* you may not use this file except in compliance with the License.
|
6
|
+
* You may obtain a copy of the License at
|
7
|
+
*
|
8
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
9
|
+
*
|
10
|
+
* Unless required by applicable law or agreed to in writing, software
|
11
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
+
* See the License for the specific language governing permissions and
|
14
|
+
* limitations under the License.
|
15
|
+
*/
|
16
|
+
|
17
|
+
#include <stdlib.h>
|
18
|
+
|
19
|
+
#include "algos.h"
|
20
|
+
#include "constants.h"
|
21
|
+
#include "geoCoord.h"
|
22
|
+
#include "h3Index.h"
|
23
|
+
#include "test.h"
|
24
|
+
#include "utility.h"
|
25
|
+
|
26
|
+
// Tests for specific polyfill examples
|
27
|
+
|
28
|
+
SUITE(polyfill_reported) {
|
29
|
+
// https://github.com/uber/h3-js/issues/76#issuecomment-561204505
|
30
|
+
TEST(entireWorld) {
|
31
|
+
// TODO: Fails for a single worldwide polygon
|
32
|
+
GeoCoord worldVerts[] = {
|
33
|
+
{-M_PI_2, -M_PI}, {M_PI_2, -M_PI}, {M_PI_2, 0}, {-M_PI_2, 0}};
|
34
|
+
Geofence worldGeofence = {.numVerts = 4, .verts = worldVerts};
|
35
|
+
GeoPolygon worldGeoPolygon = {.geofence = worldGeofence, .numHoles = 0};
|
36
|
+
GeoCoord worldVerts2[] = {
|
37
|
+
{-M_PI_2, 0}, {M_PI_2, 0}, {M_PI_2, M_PI}, {-M_PI_2, M_PI}};
|
38
|
+
Geofence worldGeofence2 = {.numVerts = 4, .verts = worldVerts2};
|
39
|
+
GeoPolygon worldGeoPolygon2 = {.geofence = worldGeofence2,
|
40
|
+
.numHoles = 0};
|
41
|
+
|
42
|
+
for (int res = 0; res < 3; res++) {
|
43
|
+
int polyfillSize =
|
44
|
+
H3_EXPORT(maxPolyfillSize)(&worldGeoPolygon, res);
|
45
|
+
H3Index* polyfillOut = calloc(polyfillSize, sizeof(H3Index));
|
46
|
+
|
47
|
+
H3_EXPORT(polyfill)(&worldGeoPolygon, res, polyfillOut);
|
48
|
+
int actualNumHexagons =
|
49
|
+
countActualHexagons(polyfillOut, polyfillSize);
|
50
|
+
|
51
|
+
int polyfillSize2 =
|
52
|
+
H3_EXPORT(maxPolyfillSize)(&worldGeoPolygon2, res);
|
53
|
+
H3Index* polyfillOut2 = calloc(polyfillSize2, sizeof(H3Index));
|
54
|
+
|
55
|
+
H3_EXPORT(polyfill)(&worldGeoPolygon2, res, polyfillOut2);
|
56
|
+
int actualNumHexagons2 =
|
57
|
+
countActualHexagons(polyfillOut2, polyfillSize2);
|
58
|
+
|
59
|
+
t_assert(actualNumHexagons + actualNumHexagons2 ==
|
60
|
+
H3_EXPORT(numHexagons)(res),
|
61
|
+
"got expected polyfill size (entire world)");
|
62
|
+
|
63
|
+
// Sets should be disjoint
|
64
|
+
for (int i = 0; i < polyfillSize; i++) {
|
65
|
+
if (polyfillOut[i] == 0) continue;
|
66
|
+
|
67
|
+
bool found = false;
|
68
|
+
for (int j = 0; j < polyfillSize2; j++) {
|
69
|
+
if (polyfillOut[i] == polyfillOut2[j]) {
|
70
|
+
found = true;
|
71
|
+
break;
|
72
|
+
}
|
73
|
+
}
|
74
|
+
t_assert(!found,
|
75
|
+
"Index found more than once when polyfilling the "
|
76
|
+
"entire world");
|
77
|
+
}
|
78
|
+
|
79
|
+
free(polyfillOut);
|
80
|
+
free(polyfillOut2);
|
81
|
+
}
|
82
|
+
}
|
83
|
+
|
84
|
+
// https://github.com/uber/h3-js/issues/67
|
85
|
+
TEST(h3js_67) {
|
86
|
+
double east = H3_EXPORT(degsToRads)(-56.25);
|
87
|
+
double north = H3_EXPORT(degsToRads)(-33.13755119234615);
|
88
|
+
double south = H3_EXPORT(degsToRads)(-34.30714385628804);
|
89
|
+
double west = H3_EXPORT(degsToRads)(-57.65625);
|
90
|
+
|
91
|
+
GeoCoord testVerts[] = {
|
92
|
+
{north, east}, {south, east}, {south, west}, {north, west}};
|
93
|
+
Geofence testGeofence = {.numVerts = 4, .verts = testVerts};
|
94
|
+
GeoPolygon testPolygon;
|
95
|
+
testPolygon.geofence = testGeofence;
|
96
|
+
testPolygon.numHoles = 0;
|
97
|
+
|
98
|
+
int res = 7;
|
99
|
+
int numHexagons = H3_EXPORT(maxPolyfillSize)(&testPolygon, res);
|
100
|
+
H3Index* hexagons = calloc(numHexagons, sizeof(H3Index));
|
101
|
+
|
102
|
+
H3_EXPORT(polyfill)(&testPolygon, res, hexagons);
|
103
|
+
int actualNumHexagons = countActualHexagons(hexagons, numHexagons);
|
104
|
+
|
105
|
+
t_assert(actualNumHexagons == 4499,
|
106
|
+
"got expected polyfill size (h3-js#67)");
|
107
|
+
free(hexagons);
|
108
|
+
}
|
109
|
+
|
110
|
+
// 2nd test case from h3-js#67
|
111
|
+
TEST(h3js_67_2nd) {
|
112
|
+
double east = H3_EXPORT(degsToRads)(-57.65625);
|
113
|
+
double north = H3_EXPORT(degsToRads)(-34.30714385628804);
|
114
|
+
double south = H3_EXPORT(degsToRads)(-35.4606699514953);
|
115
|
+
double west = H3_EXPORT(degsToRads)(-59.0625);
|
116
|
+
|
117
|
+
GeoCoord testVerts[] = {
|
118
|
+
{north, east}, {south, east}, {south, west}, {north, west}};
|
119
|
+
Geofence testGeofence = {.numVerts = 4, .verts = testVerts};
|
120
|
+
GeoPolygon testPolygon;
|
121
|
+
testPolygon.geofence = testGeofence;
|
122
|
+
testPolygon.numHoles = 0;
|
123
|
+
|
124
|
+
int res = 7;
|
125
|
+
int numHexagons = H3_EXPORT(maxPolyfillSize)(&testPolygon, res);
|
126
|
+
H3Index* hexagons = calloc(numHexagons, sizeof(H3Index));
|
127
|
+
|
128
|
+
H3_EXPORT(polyfill)(&testPolygon, res, hexagons);
|
129
|
+
int actualNumHexagons = countActualHexagons(hexagons, numHexagons);
|
130
|
+
|
131
|
+
t_assert(actualNumHexagons == 4609,
|
132
|
+
"got expected polyfill size (h3-js#67, 2nd case)");
|
133
|
+
free(hexagons);
|
134
|
+
}
|
135
|
+
|
136
|
+
// https://github.com/uber/h3/issues/136
|
137
|
+
TEST(h3_136) {
|
138
|
+
GeoCoord testVerts[] = {{0.10068990369902957, 0.8920772174196191},
|
139
|
+
{0.10032914690616246, 0.8915914753447348},
|
140
|
+
{0.10033349237998787, 0.8915860128746426},
|
141
|
+
{0.10069496685903621, 0.8920742194546231}};
|
142
|
+
Geofence testGeofence = {.numVerts = 4, .verts = testVerts};
|
143
|
+
GeoPolygon testPolygon;
|
144
|
+
testPolygon.geofence = testGeofence;
|
145
|
+
testPolygon.numHoles = 0;
|
146
|
+
|
147
|
+
int res = 13;
|
148
|
+
int numHexagons = H3_EXPORT(maxPolyfillSize)(&testPolygon, res);
|
149
|
+
H3Index* hexagons = calloc(numHexagons, sizeof(H3Index));
|
150
|
+
|
151
|
+
H3_EXPORT(polyfill)(&testPolygon, res, hexagons);
|
152
|
+
int actualNumHexagons = countActualHexagons(hexagons, numHexagons);
|
153
|
+
|
154
|
+
t_assert(actualNumHexagons == 4353, "got expected polyfill size");
|
155
|
+
free(hexagons);
|
156
|
+
}
|
157
|
+
}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
/*
|
2
|
-
* Copyright 2017-
|
2
|
+
* Copyright 2017-2019 Uber Technologies, Inc.
|
3
3
|
*
|
4
4
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
5
5
|
* you may not use this file except in compliance with the License.
|
@@ -16,6 +16,7 @@
|
|
16
16
|
|
17
17
|
#include <assert.h>
|
18
18
|
#include <stdlib.h>
|
19
|
+
|
19
20
|
#include "bbox.h"
|
20
21
|
#include "constants.h"
|
21
22
|
#include "geoCoord.h"
|
@@ -553,4 +554,29 @@ SUITE(polygon) {
|
|
553
554
|
|
554
555
|
H3_EXPORT(destroyLinkedPolygon)(&polygon);
|
555
556
|
}
|
557
|
+
|
558
|
+
TEST(normalizeMultiPolygon_unassignedHole) {
|
559
|
+
GeoCoord verts[] = {{0, 0}, {0, 1}, {1, 1}, {1, 0}};
|
560
|
+
|
561
|
+
LinkedGeoLoop* outer = malloc(sizeof(*outer));
|
562
|
+
assert(outer != NULL);
|
563
|
+
createLinkedLoop(outer, &verts[0], 4);
|
564
|
+
|
565
|
+
GeoCoord verts2[] = {{2, 2}, {3, 3}, {2, 3}};
|
566
|
+
|
567
|
+
LinkedGeoLoop* inner = malloc(sizeof(*inner));
|
568
|
+
assert(inner != NULL);
|
569
|
+
createLinkedLoop(inner, &verts2[0], 3);
|
570
|
+
|
571
|
+
LinkedGeoPolygon polygon = {0};
|
572
|
+
addLinkedLoop(&polygon, inner);
|
573
|
+
addLinkedLoop(&polygon, outer);
|
574
|
+
|
575
|
+
int result = normalizeMultiPolygon(&polygon);
|
576
|
+
|
577
|
+
t_assert(result == NORMALIZATION_ERR_UNASSIGNED_HOLES,
|
578
|
+
"Expected error code returned");
|
579
|
+
|
580
|
+
H3_EXPORT(destroyLinkedPolygon)(&polygon);
|
581
|
+
}
|
556
582
|
}
|
@@ -0,0 +1,66 @@
|
|
1
|
+
/*
|
2
|
+
* Copyright 2020 Uber Technologies, Inc.
|
3
|
+
*
|
4
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
5
|
+
* you may not use this file except in compliance with the License.
|
6
|
+
* You may obtain a copy of the License at
|
7
|
+
*
|
8
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
9
|
+
*
|
10
|
+
* Unless required by applicable law or agreed to in writing, software
|
11
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
12
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
13
|
+
* See the License for the specific language governing permissions and
|
14
|
+
* limitations under the License.
|
15
|
+
*/
|
16
|
+
/** @file
|
17
|
+
* @brief tests H3 vertex functions.
|
18
|
+
*
|
19
|
+
* usage: `testVertex`
|
20
|
+
*/
|
21
|
+
|
22
|
+
#include "test.h"
|
23
|
+
#include "utility.h"
|
24
|
+
#include "vertex.h"
|
25
|
+
|
26
|
+
SUITE(Vertex) {
|
27
|
+
TEST(vertexNumForDirection_hex) {
|
28
|
+
H3Index origin = 0x823d6ffffffffff;
|
29
|
+
int vertexNums[NUM_HEX_VERTS] = {0};
|
30
|
+
for (Direction dir = K_AXES_DIGIT; dir < NUM_DIGITS; dir++) {
|
31
|
+
int vertexNum = vertexNumForDirection(origin, dir);
|
32
|
+
t_assert(vertexNum >= 0 && vertexNum < NUM_HEX_VERTS,
|
33
|
+
"vertex number appears valid");
|
34
|
+
t_assert(!vertexNums[vertexNum], "vertex number appears only once");
|
35
|
+
vertexNums[vertexNum] = 1;
|
36
|
+
}
|
37
|
+
}
|
38
|
+
|
39
|
+
TEST(vertexNumForDirection_pent) {
|
40
|
+
H3Index pentagon = 0x823007fffffffff;
|
41
|
+
int vertexNums[NUM_PENT_VERTS] = {0};
|
42
|
+
for (Direction dir = J_AXES_DIGIT; dir < NUM_DIGITS; dir++) {
|
43
|
+
int vertexNum = vertexNumForDirection(pentagon, dir);
|
44
|
+
t_assert(vertexNum >= 0 && vertexNum < NUM_PENT_VERTS,
|
45
|
+
"vertex number appears valid");
|
46
|
+
t_assert(!vertexNums[vertexNum], "vertex number appears only once");
|
47
|
+
vertexNums[vertexNum] = 1;
|
48
|
+
}
|
49
|
+
}
|
50
|
+
|
51
|
+
TEST(vertexNumForDirection_badDirections) {
|
52
|
+
H3Index origin = 0x823007fffffffff;
|
53
|
+
|
54
|
+
t_assert(
|
55
|
+
vertexNumForDirection(origin, CENTER_DIGIT) == INVALID_VERTEX_NUM,
|
56
|
+
"center digit should return invalid vertex");
|
57
|
+
t_assert(
|
58
|
+
vertexNumForDirection(origin, INVALID_DIGIT) == INVALID_VERTEX_NUM,
|
59
|
+
"invalid digit should return invalid vertex");
|
60
|
+
|
61
|
+
H3Index pentagon = 0x823007fffffffff;
|
62
|
+
t_assert(
|
63
|
+
vertexNumForDirection(pentagon, K_AXES_DIGIT) == INVALID_VERTEX_NUM,
|
64
|
+
"K direction on pentagon should return invalid vertex");
|
65
|
+
}
|
66
|
+
}
|