vector2dggs 0.10.0__py3-none-any.whl → 0.10.1__py3-none-any.whl

vector2dggs/__init__.py

@@ -1 +1 @@
-__version__: str = "0.10.0"
+__version__: str = "0.10.1"

vector2dggs/rHP.py

@@ -12,13 +12,9 @@ import geopandas as gpd
 from typing import Union
 from pathlib import Path
 from rhealpixdggs.conversion import compress_order_cells
+from rhealpixdggs.rhp_wrappers import rhp_to_center_child
 from rhppandas.util.const import COLUMNS
 
-# from rhealpixdggs.rhp_wrappers import rhp_to_center_child, rhp_is_valid
-from rhealpixdggs.rhp_wrappers import rhp_is_valid
-from rhealpixdggs.dggs import RHEALPixDGGS
-from rhealpixdggs.dggs import WGS84_003
-
 import vector2dggs.constants as const
 import vector2dggs.common as common
 
@@ -57,54 +53,6 @@ def rhppolyfill(df: gpd.GeoDataFrame, resolution: int) -> pd.DataFrame:
     )
 
 
-# TODO replace when merged https://github.com/manaakiwhenua/rhealpixdggs-py/pull/37
-def rhp_to_center_child(
-    rhpindex: str, res: int = None, dggs: RHEALPixDGGS = WGS84_003
-) -> str:
-    """
-    Returns central child of rhpindex at resolution res (immediate central
-    child if res == None).
-
-    Returns None if the cell index is invalid.
-
-    Returns None if the DGGS has an even number of cells on a side.
-
-    EXAMPLES::
-
-        >>> rhp_to_center_child('S001450634')
-        'S0014506344'
-        >>> rhp_to_center_child('S001450634', res=13)
-        'S001450634444'
-        >>> rhp_to_center_child('INVALID')
-    """
-    # Stop early if the cell index is invalid
-    if not rhp_is_valid(rhpindex, dggs):
-        return None
-
-    # DGGSs with even numbers of cells on a side never have a cell at the centre
-    if (dggs.N_side % 2) == 0:
-        return None
-
-    # Handle mismatch between cell resolution and requested child resolution
-    parent_res = len(rhpindex) - 1
-    if res is not None and res < parent_res:
-        return rhpindex
-
-    # Standard case (including parent_res == res)
-    else:
-        # res == None returns the central child from one level down (by convention)
-        added_levels = 1 if res is None else res - parent_res
-
-        # Derive index of centre child and append that to rhpindex
-        # NOTE: only works for odd values of N_side
-        c_index = int((dggs.N_side**2 - 1) / 2)
-
-        # Append the required number of child digits to cell index
-        child_index = rhpindex + "".join(str(c_index) for _ in range(0, added_levels))
-
-        return child_index
-
-
 def compact_cells(cells: set[str]) -> set[str]:
     """
     Compact a set of rHEALPix DGGS cells.

{vector2dggs-0.10.0.dist-info → vector2dggs-0.10.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: vector2dggs
-Version: 0.10.0
+Version: 0.10.1
 Summary: CLI DGGS indexer for vector geospatial data
 License: LGPL-3.0-or-later
 Keywords: dggs,vector,h3,rHEALPix,cli
@@ -30,6 +30,7 @@ Requires-Dist: psycopg2 (>=2.9.9,<3.0.0)
 Requires-Dist: pyarrow (>=20.0,<21.0)
 Requires-Dist: pyproj (>=3.7,<4.0)
 Requires-Dist: python-geohash (>=0.8.5,<0.9.0)
+Requires-Dist: rhealpixdggs (>=0.5.12,<0.6.0)
 Requires-Dist: rhppandas (>=0.2.0,<0.3.0)
 Requires-Dist: rusty-polygon-geohasher (>=0.2.3,<0.3.0)
 Requires-Dist: s2geometry (>=0.9.0,<0.10.0)
@@ -261,14 +262,14 @@ vector2dggs h3 -v DEBUG -id ogc_fid -r 9 -p 5 -t 4 --overwrite -lyr topo50_lake
   title={{vector2dggs}},
   author={Ardo, James and Law, Richard},
   url={https://github.com/manaakiwhenua/vector2dggs},
-  version={0.10.0},
+  version={0.10.1},
   date={2023-04-20}
 }
 ```
 
 APA/Harvard
 
-> Ardo, J., & Law, R. (2023). vector2dggs (0.10.0) [Computer software]. https://github.com/manaakiwhenua/vector2dggs
+> Ardo, J., & Law, R. (2023). vector2dggs (0.10.1) [Computer software]. https://github.com/manaakiwhenua/vector2dggs
 
 [![manaakiwhenua-standards](https://github.com/manaakiwhenua/vector2dggs/workflows/manaakiwhenua-standards/badge.svg)](https://github.com/manaakiwhenua/manaakiwhenua-standards)
 

{vector2dggs-0.10.0.dist-info → vector2dggs-0.10.1.dist-info}/RECORD

@@ -1,15 +1,15 @@
-vector2dggs/__init__.py,sha256=qK7__omM0NPcz4bMM5qUWKeZsOEhxeVWv_P38IPNVnw,28
+vector2dggs/__init__.py,sha256=zkryc4Uha10GTKJDVvFVRKEySO4-gejqb9sTlyYC-EE,28
 vector2dggs/cli.py,sha256=d_4skD62k6pXUWgDdVHbDwpe4A4yo62ZFx8Cp_6GpBA,767
 vector2dggs/common.py,sha256=rQL1_rFr1VTyILffOZgdwPzZS1JThn4TBPswfCkMjbM,14471
 vector2dggs/constants.py,sha256=KdmBQCP_GCygzvDLtS8AMQM9i6QqOkf-9YQkh_AzrKc,1779
 vector2dggs/geohash.py,sha256=PVLkaaSVLgzDZNfuL0y3Xioh4pyvom845HuyLIAsLUY,10398
 vector2dggs/h3.py,sha256=Juvc8g4QWfDIco9RQHaX8p9S9rkW5QvusxpyO-G7eSs,7408
 vector2dggs/katana.py,sha256=v4BRzVCsroC6RzIYdxLfrr9eFOdmXb5S9jXBMs5tgSo,3571
-vector2dggs/rHP.py,sha256=E03dQngbT3LtksZkaM6QSJv983ZGpLeXRedjqsEQZZI,9869
+vector2dggs/rHP.py,sha256=UoRdidkkVGhGP85wrfBE_5BNrx1Xg5skQQe1F5X0LZ8,8109
 vector2dggs/s2.py,sha256=SOXMHQQq86bM88MDgBBemGiXIbuEIbrhLSgPwLKceLY,12809
-vector2dggs-0.10.0.dist-info/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-vector2dggs-0.10.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-vector2dggs-0.10.0.dist-info/METADATA,sha256=LuNEa06-KpDdXDdbDynhkxUXp6nuaOQ7q9ycIrJODKs,12606
-vector2dggs-0.10.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-vector2dggs-0.10.0.dist-info/entry_points.txt,sha256=5h8LB9L2oOE5u_N7FRGtu4JDwa553iPs4u0XhcLeLZU,52
-vector2dggs-0.10.0.dist-info/RECORD,,
+vector2dggs-0.10.1.dist-info/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+vector2dggs-0.10.1.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+vector2dggs-0.10.1.dist-info/METADATA,sha256=MNgUCPkWdxUte-n8iRQUgCFAdv_rOXp-GtPvK7vaTNU,12652
+vector2dggs-0.10.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+vector2dggs-0.10.1.dist-info/entry_points.txt,sha256=5h8LB9L2oOE5u_N7FRGtu4JDwa553iPs4u0XhcLeLZU,52
+vector2dggs-0.10.1.dist-info/RECORD,,