changes from code review

Author: alpha-beta-soup

README.md

@@ -219,7 +219,7 @@ import geopandas as gpd
 import a5
 from shapely.geometry import Polygon
 
-o = pd.read_parquet('./tests/data/output/7/sample_tif_s2')
+o = pd.read_parquet('./tests/data/output/7/sample_tif_a5')
 o['geometry'] = o.index.map(lambda a: Polygon(a5.cell_to_boundary(a5.hex_to_u64(a))))
 
 gpd.GeoDataFrame(o, geometry="geometry", crs="EPSG:4326").to_file('tests/data/output/7/sample_tif_a5.gpkg')

raster2dggs/a5.py

@@ -27,7 +27,7 @@
     "--parent_res",
     required=False,
     type=click.Choice(list(map(str, range(const.MIN_A5, const.MAX_A5 + 1)))),
-    help="A3 parent resolution to index and aggregate to. Defaults to resolution - 6",
+    help="A5 parent resolution to index and aggregate to. Defaults to resolution - 6",
 )
 @click.option(
     "-u",

raster2dggs/indexers/a5rasterindexer.py

@@ -16,6 +16,17 @@
 from raster2dggs.interfaces import RasterIndexer
 
 
+def is_valid_a5_cell(cell: str, min_resolution: int, max_resolution: int):
+    cell = a5py.hex_to_u64(cell)
+    try:
+        c: a5py.A5Cell = a5py.core.serialization.deserialize(cell)
+    except TypeError:
+        return False
+    if not (min_resolution <= c["resolution"] <= max_resolution):
+        return False
+    return True
+
+
 class A5RasterIndexer(RasterIndexer):
     """
     Provides integration for the A5 DGGS.
@@ -106,15 +117,6 @@ def cell_to_children_size(self, cell: int, desired_resolution: int) -> int:
         cell_level = a5py.get_resolution(cell)
         return 4 ** (desired_resolution - cell_level)
 
-    def is_valid_cell(self, cell: str, min_resolution: int, max_resolution: int):
-        cell = a5py.hex_to_u64(cell)
-        try:
-            c: a5py.A5Cell = a5py.core.serialization.deserialize(cell)
-        except TypeError:
-            return False
-        if not (min_resolution <= c["resolution"] <= max_resolution):
-            return False
-        return True
 
     def compaction(
         self, df: pd.DataFrame, resolution: int, parent_res: int
@@ -130,7 +132,7 @@ def compaction(
         unprocessed_indices = set(
             filter(
                 lambda c: (not pd.isna(c))
-                and self.is_valid_cell(c, parent_res, resolution),
+                and is_valid_a5_cell(c, parent_res, resolution),
                 set(df.index),
             ),
         )