Skip to content

Commit

Permalink
chore: bump conda lock files (#1172)
Browse files Browse the repository at this point in the history
* updated conda lock files

* patch h3 api usage for 4.x

---------

Co-authored-by: bjlittle <2051656+bjlittle@users.noreply.github.com>
Co-authored-by: Bill Little <bill.james.little@gmail.com>
  • Loading branch information
3 people authored Oct 21, 2024
1 parent 9dba3e9 commit 75fbc1f
Show file tree
Hide file tree
Showing 8 changed files with 1,699 additions and 1,803 deletions.
2 changes: 1 addition & 1 deletion docs/src/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ def autolog(message: str, section: str | None = None, color: str | None = None)
nitpicky = True
nitpick_ignore_regex = [
(r"py:.*", r"Corners"), # TBD: geovista.geodesic.PANEL_BBOX_BY_IDX
(r"py:.*", r"h3.get_res0_indexes"), # no uber/h3 sphinx docs available
(r"py:.*", r"h3.get_res0_cells"), # no uber/h3 sphinx docs available
(r"py:.*", r"scooby.Report"), # no scooby sphinx docs available
(r"py:.*", r"pv"), # TBD: geovista.geoplotter, geovista.gridlines (lazy import)
(r"py:class", r"numpy.typing.ArrayLike"), # TBD: geovista.pantry.data (lazy import)
Expand Down
582 changes: 282 additions & 300 deletions requirements/locks/py310-lock-linux-64.txt

Large diffs are not rendered by default.

580 changes: 281 additions & 299 deletions requirements/locks/py310-lock-linux-64.yml

Large diffs are not rendered by default.

584 changes: 284 additions & 300 deletions requirements/locks/py311-lock-linux-64.txt

Large diffs are not rendered by default.

582 changes: 283 additions & 299 deletions requirements/locks/py311-lock-linux-64.yml

Large diffs are not rendered by default.

582 changes: 282 additions & 300 deletions requirements/locks/py312-lock-linux-64.txt

Large diffs are not rendered by default.

580 changes: 281 additions & 299 deletions requirements/locks/py312-lock-linux-64.yml

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/geovista/examples/spatial_index/uber_h3.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def generate_icosahedron_surface(resolution: int | None = 0) -> GeoSurface:
icosahedron face connectivity.
"""
pairs = [h3.h3_to_geo(cell) for cell in sorted(h3.get_pentagon_indexes(resolution))]
pairs = [h3.cell_to_latlng(cell) for cell in sorted(h3.get_pentagons(resolution))]
lats, lons = list(zip(*pairs, strict=True))

# An icosahedron contains 20 equilateral triangle faces,
Expand Down Expand Up @@ -273,7 +273,7 @@ def to_children(h3indexes: H3Indexes) -> H3Indexes:
"""
result = set()
children = [h3.h3_to_children(h3index) for h3index in h3indexes]
children = [h3.cell_to_children(h3index) for h3index in h3indexes]
result.update(*children)

return result
Expand Down Expand Up @@ -309,7 +309,7 @@ def to_mesh(h3indexes: H3Indexes) -> PolyData:

# Get the lat/lon vertices of each H3Index cell polygon.
for h3index in h3indexes:
boundary = h3.h3_to_geo_boundary(h3index, geo_json=False)
boundary = h3.cell_to_boundary(h3index)
boundary_lats, boundary_lons = zip(*boundary, strict=True)
lats.extend(boundary_lats)
lons.extend(boundary_lons)
Expand Down Expand Up @@ -406,7 +406,7 @@ def callback(actor: Actor, flag: bool) -> None:
# **base icosahedron** surface and geodesic edges,
# a Natural Earth base layer and coastlines.
#
# We also use the :func:`h3.get_res0_indexes` function to bootstrap the
# We also use the :func:`h3.get_res0_cells` function to bootstrap the
# Uber ``H3`` hierarchy by generating the ``H3Index`` strings for all
# the cells participating in the base (coarsest) resolution .
#
Expand Down Expand Up @@ -435,7 +435,7 @@ def main() -> None:
base_layer="blue",
)

indexes_resolution_0 = h3.get_res0_indexes()
indexes_resolution_0 = h3.get_res0_cells()
mesh_resolution_0 = to_mesh(indexes_resolution_0)
indexes_resolution_1 = to_children(indexes_resolution_0)
mesh_resolution_1 = to_mesh(indexes_resolution_1)
Expand Down

0 comments on commit 75fbc1f

Please sign in to comment.