vector2dggs 0.5.4__py3-none-any.whl → 0.6.1__py3-none-any.whl

vector2dggs/__init__.py

@@ -1 +1 @@
-__version__: str = "0.5.4"
+__version__: str = "0.6.1"

vector2dggs/h3.py

@@ -11,8 +11,6 @@ from typing import Union
 from urllib.parse import urlparse
 import warnings
 
-os.environ["USE_PYGEOS"] = "0"
-
 import click
 import click_log
 import dask.dataframe as dd
@@ -69,18 +67,40 @@ def polyfill(
     output_directory: str,
 ) -> None:
     """
-    Reads a geoparquet, performs H3 polyfilling,
-    and writes out to parquet.
+    Reads a geoparquet, performs H3 polyfilling (for Polygon),
+    linetracing (for LineString), and writes out to parquet.
     """
     df = gpd.read_parquet(pq_in).reset_index().drop(columns=[spatial_sort_col])
     if len(df.index) == 0:
         # Input is empty, nothing to polyfill
         return None
-    df = df.h3.polyfill_resample(resolution, return_geometry=False)
+
+    df_polygon = df[df.geom_type == "Polygon"]
+    if len(df_polygon.index) > 0:
+        df_polygon = df_polygon.h3.polyfill_resample(
+            resolution, return_geometry=False
+        ).drop(columns=["index"])
+
+    df_linestring = df[df.geom_type == "LineString"]
+    if len(df_linestring.index) > 0:
+        df_linestring = (
+            df_linestring.h3.linetrace(resolution)
+            .explode("h3_linetrace")
+            .set_index("h3_linetrace")
+        )
+        df_linestring = df_linestring[~df_linestring.index.duplicated(keep="first")]
+
+    df = pd.concat(
+        map(
+            lambda _df: pd.DataFrame(_df.drop(columns=[_df.geometry.name])),
+            [df_polygon, df_linestring],
+        )
+    )
+
     if len(df.index) == 0:
         # Polyfill resulted in empty output (e.g. large cell, small feature)
         return None
-    df = pd.DataFrame(df).drop(columns=["index", "geometry"])
+
     df.index.rename(f"h3_{resolution:02}", inplace=True)
     parent_res: int = _get_parent_res(parent_res, resolution)
     # Secondary (parent) H3 index, used later for partitioning
@@ -193,7 +213,7 @@ def _index(
         # Remove all attributes except the geometry
         df = df.loc[:, ["geometry"]]
 
-    LOGGER.info("Watch out for ninjas! (Cutting polygons)")
+    LOGGER.info("Cutting large geometries")
     with tqdm(total=df.shape[0]) as pbar:
         for index, row in df.iterrows():
             df.loc[index, "geometry"] = GeometryCollection(
@@ -218,8 +238,9 @@ def _index(
         {
             "index": lambda frame: frame[
                 (frame.geometry.geom_type != "Polygon")
-            ],  # NB currently points and lines are lost; in principle, these could be indexed
-            "message": "Dropping non-polygonal geometries",
+                & (frame.geometry.geom_type != "LineString")
+            ],  # NB currently points and other types are lost; in principle, these could be indexed
+            "message": "Dropping unsupported geometries",
         },
     ]
     for condition in drop_conditions:
@@ -319,7 +340,7 @@ def _index(
     required=False,
     default=None,
     type=int,
-    help="Set the coordinate reference system (CRS) used for cutting large polygons (see `--cur-threshold`). Defaults to the same CRS as the input. Should be a valid EPSG code.",
+    help="Set the coordinate reference system (CRS) used for cutting large geometries (see `--cur-threshold`). Defaults to the same CRS as the input. Should be a valid EPSG code.",
     nargs=1,
 )
 @click.option(
@@ -328,7 +349,7 @@ def _index(
     required=True,
     default=5000,
     type=int,
-    help="Cutting up large polygons into smaller pieces based on a target length. Units are assumed to match the input CRS units unless the `--cut_crs` is also given, in which case units match the units of the supplied CRS.",
+    help="Cutting up large geometries into smaller geometries based on a target length. Units are assumed to match the input CRS units unless the `--cut_crs` is also given, in which case units match the units of the supplied CRS.",
     nargs=1,
 )
 @click.option(

vector2dggs/katana.py

@@ -11,13 +11,20 @@ Redistribution and use in source and binary forms, with or without modification,
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
 
-from shapely.geometry import box, Polygon, MultiPolygon, GeometryCollection
+from shapely.geometry import (
+    box,
+    Polygon,
+    MultiPolygon,
+    LineString,
+    MultiLineString,
+    GeometryCollection,
+)
 from shapely.validation import explain_validity, make_valid
 
 
 def katana(geometry, threshold, count=0) -> GeometryCollection:
     """
-    Split a polygon into two parts across it's shortest dimension.
+    Split a geometry into two parts across its shortest dimension.
     Invalid input `geometry` will silently be made valid (if possible).
     """
     if geometry is None:
@@ -53,7 +60,7 @@ def katana(geometry, threshold, count=0) -> GeometryCollection:
         if not isinstance(c, GeometryCollection):
             c = GeometryCollection([c])
         for e in c.geoms:
-            if isinstance(e, (Polygon, MultiPolygon)):
+            if isinstance(e, (Polygon, MultiPolygon, LineString, MultiLineString)):
                 result.extend(katana(e, threshold, count + 1))
     if count > 0:
         return result

{vector2dggs-0.5.4.dist-info → vector2dggs-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vector2dggs
-Version: 0.5.4
+Version: 0.6.1
 Summary: CLI DGGS indexer for vector geospatial data
 Home-page: https://github.com/manaakiwhenua/vector2dggs
 License: LGPL-3.0-or-later
@@ -9,27 +9,27 @@ Author: James Ardo
 Author-email: ardoj@landcareresearch.co.nz
 Maintainer: Richard Law
 Maintainer-email: lawr@landcareresearch.co.nz
-Requires-Python: >=3.10,<4.0
+Requires-Python: >=3.11,<4.0
 Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: GIS
 Classifier: Topic :: Scientific/Engineering :: Information Analysis
-Requires-Dist: click (>=8.1.3,<9.0.0)
+Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: click-log (>=0.4.0,<0.5.0)
-Requires-Dist: dask (>=2023.3.0,<2024.0.0)
-Requires-Dist: dask-geopandas (>=0.3.0,<0.4.0)
-Requires-Dist: gdal (>=3.6.4,<4.0.0)
-Requires-Dist: geopandas (>=0.12.2,<0.13.0)
-Requires-Dist: h3pandas (>=0.2.3,<0.3.0)
-Requires-Dist: psycopg2 (>=2.9.6,<3.0.0)
-Requires-Dist: pyarrow (>=11.0.0,<12.0.0)
-Requires-Dist: pygeos (>=0.14,<0.15)
-Requires-Dist: pyproj (>=3.5.0,<4.0.0)
-Requires-Dist: sqlalchemy (>=2.0.10,<3.0.0)
-Requires-Dist: tqdm (>=4.65.0,<5.0.0)
+Requires-Dist: dask (>=2024.8.0,<2025.0.0)
+Requires-Dist: dask-geopandas (>=0.4.1,<0.5.0)
+Requires-Dist: gdal (==3.8.4)
+Requires-Dist: geopandas (>=1.0.1,<2.0.0)
+Requires-Dist: h3pandas (>=0.2.6,<0.3.0)
+Requires-Dist: numpy (<2)
+Requires-Dist: psycopg2 (>=2.9.9,<3.0.0)
+Requires-Dist: pyarrow (>=17.0.0,<18.0.0)
+Requires-Dist: pyproj (>=3.6.1,<4.0.0)
+Requires-Dist: shapely (>=2.0.5,<3.0.0)
+Requires-Dist: sqlalchemy (>=2.0.32,<3.0.0)
+Requires-Dist: tqdm (>=4.66.5,<5.0.0)
 Project-URL: Repository, https://github.com/manaakiwhenua/vector2dggs
 Description-Content-Type: text/markdown
 
@@ -159,6 +159,8 @@ In brief, to get started:
 
 If you run `poetry install`, the CLI tool will be aliased so you can simply use `vector2dggs` rather than `poetry run vector2dggs`, which is the alternative if you do not `poetry install`.
 
+Alternaively, it is also possible to isntall using pip with `pip install -e .`, and bypass Poetry.
+
 #### Code formatting
 
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
@@ -187,14 +189,14 @@ vector2dggs h3 -v DEBUG -id ogc_fid -r 9 -p 5 -t 4 --overwrite -tbl topo50_lake
   title={{vector2dggs}},
   author={Ardo, James and Law, Richard},
   url={https://github.com/manaakiwhenua/vector2dggs},
-  version={0.5.4},
+  version={0.6.1},
   date={2023-04-20}
 }
 ```
 
 APA/Harvard
 
-> Ardo, J., & Law, R. (2023). vector2dggs (0.5.4) [Computer software]. https://github.com/manaakiwhenua/vector2dggs
+> Ardo, J., & Law, R. (2023). vector2dggs (0.6.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.6.1.dist-info/RECORD

@@ -0,0 +1,10 @@
+vector2dggs/__init__.py,sha256=8sqy-gBl8LCgOL8GSQBSJg6UWO0eWPpvb3gdHmGQvbg,27
+vector2dggs/cli.py,sha256=tL4NJ99uQsqoVinwYadna1a4ko5v2sdZaFaeDAj6QNE,599
+vector2dggs/h3.py,sha256=AMH9VdspvKu26VhFmuWf48xm4VEDKxmNuvOeb_I2nmI,14310
+vector2dggs/katana.py,sha256=pgVWy032NkT5yilUO0d0IKH4NUvY7DJLjmfsxhBiF08,3407
+vector2dggs-0.6.1.dist-info/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+vector2dggs-0.6.1.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+vector2dggs-0.6.1.dist-info/METADATA,sha256=djCsEsjEqHZp2iTyMhBaTVOs0VtNAORURR7s9N8cs0U,9846
+vector2dggs-0.6.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+vector2dggs-0.6.1.dist-info/entry_points.txt,sha256=5h8LB9L2oOE5u_N7FRGtu4JDwa553iPs4u0XhcLeLZU,52
+vector2dggs-0.6.1.dist-info/RECORD,,

vector2dggs-0.5.4.dist-info/RECORD

@@ -1,10 +0,0 @@
-vector2dggs/__init__.py,sha256=k2mVhGfDpsy8Z1zpD4DDxkUDrEoNwp3wetuIS9B8ioQ,27
-vector2dggs/cli.py,sha256=tL4NJ99uQsqoVinwYadna1a4ko5v2sdZaFaeDAj6QNE,599
-vector2dggs/h3.py,sha256=Ye9YS9G1HEnoSm9pnXVTUZClC5FpGaUGmIXtZWvk7bw,13646
-vector2dggs/katana.py,sha256=xx5R9lDuraWLK5bfGkiDQDC2r2naj_sKZlYeB52_xwc,3320
-vector2dggs-0.5.4.dist-info/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-vector2dggs-0.5.4.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-vector2dggs-0.5.4.dist-info/METADATA,sha256=X7yb_cHG7RUx_hCh4VwuUL5wlcQeGvxxmz2w3URXiKE,9777
-vector2dggs-0.5.4.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-vector2dggs-0.5.4.dist-info/entry_points.txt,sha256=5h8LB9L2oOE5u_N7FRGtu4JDwa553iPs4u0XhcLeLZU,52
-vector2dggs-0.5.4.dist-info/RECORD,,