adds tuple type check when compacting

Author: alpha-beta-soup

raster2dggs/h3.py

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

raster2dggs/indexers/geohashrasterindexer.py

@@ -132,6 +132,8 @@ def compaction(
                 list(parent_cells)
             )
             for parent, group in parent_groups:
+                if isinstance(parent, tuple) and len(parent) == 1:
+                    parent = parent[0]
                 if parent in compaction_map:
                     continue
                 expected_count = self.cell_to_children_size(parent, precision)

raster2dggs/indexers/h3rasterindexer.py

@@ -68,9 +68,9 @@ def parent_groupby(
         self, df, resolution: int, aggfunc: Union[str, Callable], decimals: int
     ) -> pd.DataFrame:
         """
-        Function for aggregating the h3 resolution values per parent partition. Each partition will be run through with a
-        pandas .groupby function. This step is to ensure there are no duplicate h3 values, which will happen when indexing a
-        high resolution raster at a coarser h3 resolution.
+        Function for aggregating the H3 resolution values per parent partition. Each partition will be run through with a
+        pandas .groupby function. This step is to ensure there are no duplicate H3 values, which will happen when indexing a
+        high resolution raster at a coarser H3 resolution.
 
         Implementation of interface function.
         """
@@ -126,6 +126,8 @@ def compaction(
                 list(parent_cells)
             )
             for parent, group in parent_groups:
+                if isinstance(parent, tuple) and len(parent) == 1:
+                    parent = parent[0]
                 if parent in compaction_map:
                     continue
                 expected_count = self.cell_to_children_size(parent, resolution)

raster2dggs/indexers/maidenheadrasterindexer.py

@@ -135,6 +135,8 @@ def compaction(
                 list(parent_cells)
             )
             for parent, group in parent_groups:
+                if isinstance(parent, tuple) and len(parent) == 1:
+                    parent = parent[0]
                 if parent in compaction_map:
                     continue
                 expected_count = self.cell_to_children_size(parent, level)

raster2dggs/indexers/rhprasterindexer.py

@@ -123,6 +123,8 @@ def compaction(
                 list(parent_cells)
             )
             for parent, group in parent_groups:
+                if isinstance(parent, tuple) and len(parent) == 1:
+                    parent = parent[0]
                 if parent in compaction_map:
                     continue
                 expected_count = self.cell_to_children_size(parent, resolution)

raster2dggs/indexers/s2rasterindexer.py

@@ -146,6 +146,8 @@ def compaction(
                 list(parent_cells)
             )
             for parent, group in parent_groups:
+                if isinstance(parent, tuple) and len(parent) == 1:
+                    parent = parent[0]
                 if parent in compaction_map:
                     continue
                 expected_count = self.cell_to_children_size(

raster2dggs/rHP.py

@@ -29,7 +29,7 @@
     "--parent_res",
     required=False,
     type=click.Choice(list(map(str, range(const.MIN_RHP, const.MAX_RHP + 1)))),
-    help="rHEALPix Parent resolution to index and aggregate to. Defaults to resolution - 6",
+    help="rHEALPix parent resolution to index and aggregate to. Defaults to resolution - 6",
 )
 @click.option(
     "-u",