Skip to content

Commit

Permalink
H3 CLI Region Subcommands (#923)
Browse files Browse the repository at this point in the history
* H3 CLI Region Subcommands

* Apply suggestions from code review

Co-authored-by: Isaac Brodsky <isaac@isaacbrodsky.com>

* Add multipolygon tests

* Improve polygon parsing across buffer length barrier

* Actually get polygon file reading working and add the polygon tests

* Fix compiler warning-as-error on Windows

* I totally get the memory leak pedantry for the library, but the CLI is just going to quit milliseconds after it's finished processing the data and printing to the screen, so it's kinda painful here.

* Update src/apps/filters/h3.c

* Update src/apps/filters/h3.c

* git clean -ffdx is my friend

* Apply suggestions from code review

Co-authored-by: Isaac Brodsky <isaac@isaacbrodsky.com>

* Fix formatting

* Abort polygon parsing early if we know the input is invalid

* Apply suggestions from code review

Co-authored-by: Isaac Brodsky <isaac@isaacbrodsky.com>

* Update src/apps/filters/h3.c

Co-authored-by: Isaac Brodsky <isaac@isaacbrodsky.com>

* Address comments by @nrabinowitz

---------

Co-authored-by: Isaac Brodsky <isaac@isaacbrodsky.com>
  • Loading branch information
dfellis and isaacbrodsky authored Oct 14, 2024
1 parent e8b1661 commit 33681ff
Show file tree
Hide file tree
Showing 12 changed files with 641 additions and 12 deletions.
472 changes: 460 additions & 12 deletions src/apps/filters/h3.c

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions tests/cli/cellsToMultiPolygon.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
add_h3_cli_test(testCliCellsToMultiPolygonFile1 "cellsToMultiPolygon -f ${PROJECT_SOURCE_DIR}/tests/inputfiles/multipolygon_test1.txt" "[[[[37.784046, -122.427089], [37.772267, -122.434586], [37.761736, -122.425769], [37.762982, -122.409455], [37.752446, -122.400640], [37.753689, -122.384324], [37.765468, -122.376819], [37.776004, -122.385635], [37.774761, -122.401954], [37.785293, -122.410771]]]]")
add_h3_cli_test(testCliCellsToMultiPolygonFile2 "cellsToMultiPolygon -f ${PROJECT_SOURCE_DIR}/tests/inputfiles/multipolygon_test2.txt" "[[[[37.784046, -122.427089], [37.772267, -122.434586], [37.761736, -122.425769], [37.762982, -122.409455], [37.752446, -122.400640], [37.753689, -122.384324], [37.765468, -122.376819], [37.776004, -122.385635], [37.774761, -122.401954], [37.785293, -122.410771]]], [[[38.231228, -123.642760], [38.229797, -123.658996], [38.218020, -123.666324], [38.207675, -123.657418], [38.209105, -123.641184], [38.220882, -123.633853]]]]")
add_h3_cli_test(testCliCellsToMultiPolygonFile3 "cellsToMultiPolygon -f ${PROJECT_SOURCE_DIR}/tests/inputfiles/multipolygon_test3.txt" "[[[[37.106073, -122.020493], [37.114176, -121.906636], [37.196816, -121.853848], [37.204791, -121.739761], [37.287359, -121.686742], [37.361955, -121.747972], [37.444452, -121.694882], [37.518923, -121.756207], [37.510841, -121.870623], [37.585130, -121.932045], [37.576863, -122.046394], [37.494361, -122.099157], [37.485965, -122.213273], [37.403391, -122.265803], [37.329215, -122.204381], [37.246571, -122.256843], [37.172270, -122.195515], [37.180556, -122.081726]], [[37.428341, -121.923550], [37.353926, -121.862223], [37.271356, -121.915080], [37.263198, -122.029101], [37.337556, -122.090429], [37.420129, -122.037735]]]]")
add_h3_cli_test(testCliCellsToMultiPolygonFile4 "cellsToMultiPolygon -f ${PROJECT_SOURCE_DIR}/tests/inputfiles/multipolygon_test4.txt" "[[[[37.114176, -121.906636], [37.196816, -121.853848], [37.204791, -121.739761], [37.287359, -121.686742], [37.361955, -121.747972], [37.444452, -121.694882], [37.518923, -121.756207], [37.510841, -121.870623], [37.585130, -121.932045], [37.576863, -122.046394], [37.494361, -122.099157], [37.485965, -122.213273], [37.403391, -122.265803], [37.329215, -122.204381], [37.246571, -122.256843], [37.172270, -122.195515], [37.180556, -122.081726], [37.106073, -122.020493]], [[37.337556, -122.090429], [37.420129, -122.037735], [37.428341, -121.923550], [37.353926, -121.862223], [37.271356, -121.915080], [37.263198, -122.029101]]], [[[43.431278, -115.975237], [43.508096, -115.912429], [43.581386, -115.974912], [43.577810, -116.100258], [43.500970, -116.162919], [43.427727, -116.100382]]]]")
add_h3_cli_test(testCliCellsToMultiPolygonFile5 "cellsToMultiPolygon -f ${PROJECT_SOURCE_DIR}/tests/inputfiles/multipolygon_test5.txt" "[[[[37.893933, -120.851267], [37.968684, -120.912560], [37.961273, -121.028117], [38.035842, -121.089514], [38.028243, -121.205013], [38.102628, -121.266514], [38.094842, -121.381953], [38.169044, -121.443555], [38.161070, -121.558932], [38.235088, -121.620634], [38.226927, -121.735948], [38.300760, -121.797749], [38.292411, -121.912997], [38.366059, -121.974896], [38.357522, -122.090075], [38.275391, -122.143187], [38.266721, -122.258129], [38.184513, -122.311004], [38.175712, -122.425707], [38.093428, -122.478345], [38.084496, -122.592809], [38.002138, -122.645211], [37.993077, -122.759435], [37.910647, -122.811600], [37.901458, -122.925582], [37.818957, -122.977512], [37.809642, -123.091252], [37.727072, -123.142946], [37.653813, -123.081070], [37.571172, -123.132698], [37.497785, -123.070917], [37.415075, -123.122480], [37.341561, -123.060795], [37.258782, -123.112292], [37.185142, -123.050702], [37.102296, -123.102134], [37.028530, -123.040638], [36.945618, -123.092005], [36.871727, -123.030604], [36.788751, -123.081906], [36.714736, -123.020599], [36.723641, -122.907984], [36.649445, -122.846765], [36.658170, -122.734072], [36.583794, -122.672942], [36.592340, -122.560174], [36.517784, -122.499133], [36.526150, -122.386293], [36.451416, -122.325343], [36.459602, -122.212431], [36.384689, -122.151573], [36.392695, -122.038593], [36.317605, -121.977827], [36.325432, -121.864780], [36.408404, -121.812338], [36.416106, -121.699065], [36.499012, -121.646395], [36.506587, -121.532897], [36.589424, -121.479999], [36.596872, -121.366277], [36.679638, -121.313150], [36.686957, -121.199205], [36.769651, -121.145849], [36.776840, -121.031683], [36.859460, -120.978099], [36.866518, -120.863712], [36.949062, -120.809899], [37.024556, -120.870629], [37.107030, -120.816743], [37.182402, -120.877566], [37.264805, -120.823607], [37.340054, -120.884523], [37.422384, -120.830491], [37.497511, -120.891502], [37.579767, -120.837396], [37.654769, -120.898500], [37.736951, -120.844321], [37.811828, -120.905520]]], [[[37.490250, -121.006554], [37.565196, -121.067667], [37.647458, -121.013720], [37.722279, -121.074928], [37.804467, -121.020908], [37.879162, -121.082210], [37.871614, -121.197541], [37.789422, -121.251401], [37.714782, -121.190091], [37.632515, -121.243878], [37.557750, -121.182663], [37.475409, -121.236378], [37.400519, -121.175257], [37.318106, -121.228899], [37.243092, -121.167872], [37.160607, -121.221443], [37.085470, -121.160510], [37.002914, -121.214009], [36.995490, -121.328282], [36.912860, -121.381551], [36.905305, -121.495600], [36.822602, -121.548639], [36.814919, -121.662463], [36.732145, -121.715272], [36.724333, -121.828869], [36.799241, -121.889820], [36.791248, -122.003352], [36.865977, -122.064397], [36.857802, -122.177861], [36.932351, -122.239000], [36.923995, -122.352395], [36.998363, -122.413626], [36.989826, -122.526949], [37.064013, -122.588271], [37.055294, -122.701520], [36.972446, -122.753285], [36.898316, -122.691966], [36.906977, -122.578878], [36.832666, -122.517650], [36.841147, -122.404488], [36.766655, -122.343351], [36.774955, -122.230118], [36.700284, -122.169073], [36.708403, -122.055771], [36.633553, -121.994819], [36.641490, -121.881449], [36.566462, -121.820592], [36.574218, -121.707157], [36.657058, -121.654417], [36.664688, -121.540757], [36.747458, -121.487788], [36.754960, -121.373903], [36.837659, -121.320705], [36.845030, -121.206596], [36.927656, -121.153169], [36.934897, -121.038838], [37.017447, -120.985181], [37.092763, -121.046013], [37.175243, -120.992284], [37.250436, -121.053210], [37.332844, -120.999409], [37.407914, -121.060428]]]]")
add_h3_cli_test(testCliCellsToMultiPolygonStdin1 "cellsToMultiPolygon -f -- < ${PROJECT_SOURCE_DIR}/tests/inputfiles/multipolygon_test1.txt" "[[[[37.784046, -122.427089], [37.772267, -122.434586], [37.761736, -122.425769], [37.762982, -122.409455], [37.752446, -122.400640], [37.753689, -122.384324], [37.765468, -122.376819], [37.776004, -122.385635], [37.774761, -122.401954], [37.785293, -122.410771]]]]")
add_h3_cli_test(testCliCellsToMultiPolygonStdin2 "cellsToMultiPolygon -f -- < ${PROJECT_SOURCE_DIR}/tests/inputfiles/multipolygon_test2.txt" "[[[[37.784046, -122.427089], [37.772267, -122.434586], [37.761736, -122.425769], [37.762982, -122.409455], [37.752446, -122.400640], [37.753689, -122.384324], [37.765468, -122.376819], [37.776004, -122.385635], [37.774761, -122.401954], [37.785293, -122.410771]]], [[[38.231228, -123.642760], [38.229797, -123.658996], [38.218020, -123.666324], [38.207675, -123.657418], [38.209105, -123.641184], [38.220882, -123.633853]]]]")
add_h3_cli_test(testCliCellsToMultiPolygonStdin3 "cellsToMultiPolygon -f -- < ${PROJECT_SOURCE_DIR}/tests/inputfiles/multipolygon_test3.txt" "[[[[37.106073, -122.020493], [37.114176, -121.906636], [37.196816, -121.853848], [37.204791, -121.739761], [37.287359, -121.686742], [37.361955, -121.747972], [37.444452, -121.694882], [37.518923, -121.756207], [37.510841, -121.870623], [37.585130, -121.932045], [37.576863, -122.046394], [37.494361, -122.099157], [37.485965, -122.213273], [37.403391, -122.265803], [37.329215, -122.204381], [37.246571, -122.256843], [37.172270, -122.195515], [37.180556, -122.081726]], [[37.428341, -121.923550], [37.353926, -121.862223], [37.271356, -121.915080], [37.263198, -122.029101], [37.337556, -122.090429], [37.420129, -122.037735]]]]")
add_h3_cli_test(testCliCellsToMultiPolygonStdin4 "cellsToMultiPolygon -f -- < ${PROJECT_SOURCE_DIR}/tests/inputfiles/multipolygon_test4.txt" "[[[[37.114176, -121.906636], [37.196816, -121.853848], [37.204791, -121.739761], [37.287359, -121.686742], [37.361955, -121.747972], [37.444452, -121.694882], [37.518923, -121.756207], [37.510841, -121.870623], [37.585130, -121.932045], [37.576863, -122.046394], [37.494361, -122.099157], [37.485965, -122.213273], [37.403391, -122.265803], [37.329215, -122.204381], [37.246571, -122.256843], [37.172270, -122.195515], [37.180556, -122.081726], [37.106073, -122.020493]], [[37.337556, -122.090429], [37.420129, -122.037735], [37.428341, -121.923550], [37.353926, -121.862223], [37.271356, -121.915080], [37.263198, -122.029101]]], [[[43.431278, -115.975237], [43.508096, -115.912429], [43.581386, -115.974912], [43.577810, -116.100258], [43.500970, -116.162919], [43.427727, -116.100382]]]]")
add_h3_cli_test(testCliCellsToMultiPolygonStdin5 "cellsToMultiPolygon -f -- < ${PROJECT_SOURCE_DIR}/tests/inputfiles/multipolygon_test5.txt" "[[[[37.893933, -120.851267], [37.968684, -120.912560], [37.961273, -121.028117], [38.035842, -121.089514], [38.028243, -121.205013], [38.102628, -121.266514], [38.094842, -121.381953], [38.169044, -121.443555], [38.161070, -121.558932], [38.235088, -121.620634], [38.226927, -121.735948], [38.300760, -121.797749], [38.292411, -121.912997], [38.366059, -121.974896], [38.357522, -122.090075], [38.275391, -122.143187], [38.266721, -122.258129], [38.184513, -122.311004], [38.175712, -122.425707], [38.093428, -122.478345], [38.084496, -122.592809], [38.002138, -122.645211], [37.993077, -122.759435], [37.910647, -122.811600], [37.901458, -122.925582], [37.818957, -122.977512], [37.809642, -123.091252], [37.727072, -123.142946], [37.653813, -123.081070], [37.571172, -123.132698], [37.497785, -123.070917], [37.415075, -123.122480], [37.341561, -123.060795], [37.258782, -123.112292], [37.185142, -123.050702], [37.102296, -123.102134], [37.028530, -123.040638], [36.945618, -123.092005], [36.871727, -123.030604], [36.788751, -123.081906], [36.714736, -123.020599], [36.723641, -122.907984], [36.649445, -122.846765], [36.658170, -122.734072], [36.583794, -122.672942], [36.592340, -122.560174], [36.517784, -122.499133], [36.526150, -122.386293], [36.451416, -122.325343], [36.459602, -122.212431], [36.384689, -122.151573], [36.392695, -122.038593], [36.317605, -121.977827], [36.325432, -121.864780], [36.408404, -121.812338], [36.416106, -121.699065], [36.499012, -121.646395], [36.506587, -121.532897], [36.589424, -121.479999], [36.596872, -121.366277], [36.679638, -121.313150], [36.686957, -121.199205], [36.769651, -121.145849], [36.776840, -121.031683], [36.859460, -120.978099], [36.866518, -120.863712], [36.949062, -120.809899], [37.024556, -120.870629], [37.107030, -120.816743], [37.182402, -120.877566], [37.264805, -120.823607], [37.340054, -120.884523], [37.422384, -120.830491], [37.497511, -120.891502], [37.579767, -120.837396], [37.654769, -120.898500], [37.736951, -120.844321], [37.811828, -120.905520]]], [[[37.490250, -121.006554], [37.565196, -121.067667], [37.647458, -121.013720], [37.722279, -121.074928], [37.804467, -121.020908], [37.879162, -121.082210], [37.871614, -121.197541], [37.789422, -121.251401], [37.714782, -121.190091], [37.632515, -121.243878], [37.557750, -121.182663], [37.475409, -121.236378], [37.400519, -121.175257], [37.318106, -121.228899], [37.243092, -121.167872], [37.160607, -121.221443], [37.085470, -121.160510], [37.002914, -121.214009], [36.995490, -121.328282], [36.912860, -121.381551], [36.905305, -121.495600], [36.822602, -121.548639], [36.814919, -121.662463], [36.732145, -121.715272], [36.724333, -121.828869], [36.799241, -121.889820], [36.791248, -122.003352], [36.865977, -122.064397], [36.857802, -122.177861], [36.932351, -122.239000], [36.923995, -122.352395], [36.998363, -122.413626], [36.989826, -122.526949], [37.064013, -122.588271], [37.055294, -122.701520], [36.972446, -122.753285], [36.898316, -122.691966], [36.906977, -122.578878], [36.832666, -122.517650], [36.841147, -122.404488], [36.766655, -122.343351], [36.774955, -122.230118], [36.700284, -122.169073], [36.708403, -122.055771], [36.633553, -121.994819], [36.641490, -121.881449], [36.566462, -121.820592], [36.574218, -121.707157], [36.657058, -121.654417], [36.664688, -121.540757], [36.747458, -121.487788], [36.754960, -121.373903], [36.837659, -121.320705], [36.845030, -121.206596], [36.927656, -121.153169], [36.934897, -121.038838], [37.017447, -120.985181], [37.092763, -121.046013], [37.175243, -120.992284], [37.250436, -121.053210], [37.332844, -120.999409], [37.407914, -121.060428]]]]")
add_h3_cli_test(testCliCellsToMultiPolygonArg1 "cellsToMultiPolygon -c \"\\\\`cat ${PROJECT_SOURCE_DIR}/tests/inputfiles/multipolygon_test1.txt\\\\`\"" "[[[[37.784046, -122.427089], [37.772267, -122.434586], [37.761736, -122.425769], [37.762982, -122.409455], [37.752446, -122.400640], [37.753689, -122.384324], [37.765468, -122.376819], [37.776004, -122.385635], [37.774761, -122.401954], [37.785293, -122.410771]]]]")
add_h3_cli_test(testCliCellsToMultiPolygonArg2 "cellsToMultiPolygon -c \"\\\\`cat ${PROJECT_SOURCE_DIR}/tests/inputfiles/multipolygon_test2.txt\\\\`\"" "[[[[37.784046, -122.427089], [37.772267, -122.434586], [37.761736, -122.425769], [37.762982, -122.409455], [37.752446, -122.400640], [37.753689, -122.384324], [37.765468, -122.376819], [37.776004, -122.385635], [37.774761, -122.401954], [37.785293, -122.410771]]], [[[38.231228, -123.642760], [38.229797, -123.658996], [38.218020, -123.666324], [38.207675, -123.657418], [38.209105, -123.641184], [38.220882, -123.633853]]]]")
add_h3_cli_test(testCliCellsToMultiPolygonArg3 "cellsToMultiPolygon -c \"\\\\`cat ${PROJECT_SOURCE_DIR}/tests/inputfiles/multipolygon_test3.txt\\\\`\"" "[[[[37.106073, -122.020493], [37.114176, -121.906636], [37.196816, -121.853848], [37.204791, -121.739761], [37.287359, -121.686742], [37.361955, -121.747972], [37.444452, -121.694882], [37.518923, -121.756207], [37.510841, -121.870623], [37.585130, -121.932045], [37.576863, -122.046394], [37.494361, -122.099157], [37.485965, -122.213273], [37.403391, -122.265803], [37.329215, -122.204381], [37.246571, -122.256843], [37.172270, -122.195515], [37.180556, -122.081726]], [[37.428341, -121.923550], [37.353926, -121.862223], [37.271356, -121.915080], [37.263198, -122.029101], [37.337556, -122.090429], [37.420129, -122.037735]]]]")
add_h3_cli_test(testCliCellsToMultiPolygonArg4 "cellsToMultiPolygon -c \"\\\\`cat ${PROJECT_SOURCE_DIR}/tests/inputfiles/multipolygon_test4.txt\\\\`\"" "[[[[37.114176, -121.906636], [37.196816, -121.853848], [37.204791, -121.739761], [37.287359, -121.686742], [37.361955, -121.747972], [37.444452, -121.694882], [37.518923, -121.756207], [37.510841, -121.870623], [37.585130, -121.932045], [37.576863, -122.046394], [37.494361, -122.099157], [37.485965, -122.213273], [37.403391, -122.265803], [37.329215, -122.204381], [37.246571, -122.256843], [37.172270, -122.195515], [37.180556, -122.081726], [37.106073, -122.020493]], [[37.337556, -122.090429], [37.420129, -122.037735], [37.428341, -121.923550], [37.353926, -121.862223], [37.271356, -121.915080], [37.263198, -122.029101]]], [[[43.431278, -115.975237], [43.508096, -115.912429], [43.581386, -115.974912], [43.577810, -116.100258], [43.500970, -116.162919], [43.427727, -116.100382]]]]")
8 changes: 8 additions & 0 deletions tests/cli/maxPolygonToCellsSize.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
add_h3_cli_test(testCliMaxPolygonToCellsSizeFile1 "maxPolygonToCellsSize -r 7 -f ${PROJECT_SOURCE_DIR}/tests/inputfiles/polygon_test1.txt" "100")
add_h3_cli_test(testCliMaxPolygonToCellsSizeFile2 "maxPolygonToCellsSize -r 7 -f ${PROJECT_SOURCE_DIR}/tests/inputfiles/polygon_test2.txt" "23")
add_h3_cli_test(testCliMaxPolygonToCellsSizeFile3 "maxPolygonToCellsSize -r 4 -f ${PROJECT_SOURCE_DIR}/tests/inputfiles/polygon_test3.txt" "3484")
add_h3_cli_test(testCliMaxPolygonToCellsSizeStdin1 "maxPolygonToCellsSize -r 7 -f -- < ${PROJECT_SOURCE_DIR}/tests/inputfiles/polygon_test1.txt" "100")
add_h3_cli_test(testCliMaxPolygonToCellsSizeStdin2 "maxPolygonToCellsSize -r 7 -f -- < ${PROJECT_SOURCE_DIR}/tests/inputfiles/polygon_test2.txt" "23")
add_h3_cli_test(testCliMaxPolygonToCellsSizeStdin3 "maxPolygonToCellsSize -r 4 -f -- < ${PROJECT_SOURCE_DIR}/tests/inputfiles/polygon_test3.txt" "3484")
add_h3_cli_test(testCliMaxPolygonToCellsSizeArg1 "maxPolygonToCellsSize -r 7 -p \"\\\\`cat ${PROJECT_SOURCE_DIR}/tests/inputfiles/polygon_test1.txt\\\\`\"" "100")
add_h3_cli_test(testCliMaxPolygonToCellsSizeArg2 "maxPolygonToCellsSize -r 7 -p \"\\\\`cat ${PROJECT_SOURCE_DIR}/tests/inputfiles/polygon_test2.txt\\\\`\"" "23")
8 changes: 8 additions & 0 deletions tests/cli/polygonToCells.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
add_h3_cli_test(testCliPolygonToCellsFile1 "polygonToCells -r 7 -f ${PROJECT_SOURCE_DIR}/tests/inputfiles/polygon_test1.txt | tr -s '\\\\r\\\\n' ',' | tr -s '\\\\n' ','" "87283082bffffff,872830870ffffff,872830820ffffff,87283082effffff,872830828ffffff,87283082affffff,872830876ffffff,")
add_h3_cli_test(testCliPolygonToCellsFile2 "polygonToCells -r 7 -f ${PROJECT_SOURCE_DIR}/tests/inputfiles/polygon_test2.txt | tr -s '\\\\r\\\\n' ',' | tr -s '\\\\n' ','" "872830828ffffff,87283082effffff,")
add_h3_cli_test(testCliPolygonToCellsFile3 "polygonToCells -r 4 -f ${PROJECT_SOURCE_DIR}/tests/inputfiles/polygon_test3.txt | tr -s '\\\\r\\\\n' ',' | tr -s '\\\\n' ','" "84f05a3ffffffff,84e720bffffffff,84e7257ffffffff,84e725bffffffff,")
add_h3_cli_test(testCliPolygonToCellsStdin1 "polygonToCells -r 7 -f -- < ${PROJECT_SOURCE_DIR}/tests/inputfiles/polygon_test1.txt | tr -s '\\\\r\\\\n' ',' | tr -s '\\\\n' ','" "87283082bffffff,872830870ffffff,872830820ffffff,87283082effffff,872830828ffffff,87283082affffff,872830876ffffff,")
add_h3_cli_test(testCliPolygonToCellsStdin2 "polygonToCells -r 7 -f -- < ${PROJECT_SOURCE_DIR}/tests/inputfiles/polygon_test2.txt | tr -s '\\\\r\\\\n' ',' | tr -s '\\\\n' ','" "872830828ffffff,87283082effffff,")
add_h3_cli_test(testCliPolygonToCellsStdin3 "polygonToCells -r 4 -f -- < ${PROJECT_SOURCE_DIR}/tests/inputfiles/polygon_test3.txt | tr -s '\\\\r\\\\n' ',' | tr -s '\\\\n' ','" "84f05a3ffffffff,84e720bffffffff,84e7257ffffffff,84e725bffffffff,")
add_h3_cli_test(testCliPolygonToCellsArg1 "polygonToCells -r 7 -p \"\\\\`cat ${PROJECT_SOURCE_DIR}/tests/inputfiles/polygon_test1.txt\\\\`\" | tr -s '\\\\r\\\\n' ',' | tr -s '\\\\n' ','" "87283082bffffff,872830870ffffff,872830820ffffff,87283082effffff,872830828ffffff,87283082affffff,872830876ffffff,")
add_h3_cli_test(testCliPolygonToCellsArg2 "polygonToCells -r 7 -p \"\\\\`cat ${PROJECT_SOURCE_DIR}/tests/inputfiles/polygon_test2.txt\\\\`\" | tr -s '\\\\r\\\\n' ',' | tr -s '\\\\n' ','" "872830828ffffff,87283082effffff,")
1 change: 1 addition & 0 deletions tests/inputfiles/multipolygon_test1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
872830828ffffff,87283082effffff
1 change: 1 addition & 0 deletions tests/inputfiles/multipolygon_test2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
872830828ffffff,87283082effffff,872831828ffffff
8 changes: 8 additions & 0 deletions tests/inputfiles/multipolygon_test3.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[
"8528340bfffffff",
"85283447fffffff",
"8528347bfffffff",
"85283463fffffff",
"85283477fffffff",
"8528340ffffffff"
]
9 changes: 9 additions & 0 deletions tests/inputfiles/multipolygon_test4.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[
"8528340bfffffff",
"85283447fffffff",
"8528347bfffffff",
"85283463fffffff",
"85283477fffffff",
"8528340ffffffff",
"8528840ffffffff"
]
Loading

0 comments on commit 33681ff

Please sign in to comment.