Move up one level

nmandery · Nov 12, 2024 · 3e8fed4 · 3e8fed4
1 parent 40d8c17
commit 3e8fed4
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 22 deletions.
diff --git a/h3ronpy/python/h3ronpy/arrow/__init__.py → h3ronpy/python/h3ronpy/arrow.py b/h3ronpy/python/h3ronpy/arrow/__init__.py → h3ronpy/python/h3ronpy/arrow.py
diff --git a/h3ronpy/python/h3ronpy/pandas/raster.py b/h3ronpy/python/h3ronpy/pandas/raster.py
@@ -1,15 +1,16 @@
+import typing
+
 import geopandas as gpd
 import numpy as np
 import pandas as pd
-import typing
 
-from ..arrow import raster as arrow_raster
+from .. import raster
 from .vector import cells_dataframe_to_geodataframe
 
-__doc__ = arrow_raster.__doc__
+__doc__ = raster.__doc__
 
-nearest_h3_resolution = arrow_raster.nearest_h3_resolution
-rasterize_cells = arrow_raster.rasterize_cells
+nearest_h3_resolution = raster.nearest_h3_resolution
+rasterize_cells = raster.rasterize_cells
 
 
 def raster_to_dataframe(
@@ -39,7 +40,7 @@ def raster_to_dataframe(
     :return: pandas `DataFrame` or `GeoDataFrame`
     """
 
-    df = arrow_raster.raster_to_dataframe(
+    df = raster.raster_to_dataframe(
         in_raster,
         transform,
         h3_resolution,

diff --git a/h3ronpy/python/h3ronpy/pandas/vector.py b/h3ronpy/python/h3ronpy/pandas/vector.py
@@ -3,11 +3,10 @@
 import pyarrow as pa
 import shapely
 
-from h3ronpy.arrow.vector import cells_to_wkb_polygons
-
-from .. import DEFAULT_CELL_COLUMN_NAME, H3_CRS, ContainmentMode
-from ..arrow import util as _arrow_util
-from ..arrow import vector as _av
+from h3ronpy import DEFAULT_CELL_COLUMN_NAME, H3_CRS, ContainmentMode
+from h3ronpy import util as _arrow_util
+from h3ronpy import vector as _av
+from h3ronpy.vector import cells_to_wkb_polygons
 
 
 def cells_dataframe_to_geodataframe(

diff --git a/h3ronpy/python/h3ronpy/polars/raster.py b/h3ronpy/python/h3ronpy/polars/raster.py
@@ -1,9 +1,9 @@
-from ..arrow import raster as arrow_raster
+from h3ronpy import raster
 
-nearest_h3_resolution = arrow_raster.nearest_h3_resolution
-rasterize_cells = arrow_raster.rasterize_cells
+nearest_h3_resolution = raster.nearest_h3_resolution
+rasterize_cells = raster.rasterize_cells
 
-__doc__ = arrow_raster.__doc__
+__doc__ = raster.__doc__
 
 __all__ = [
     nearest_h3_resolution.__name__,

diff --git a/h3ronpy/python/h3ronpy/arrow/raster.py → h3ronpy/python/h3ronpy/raster.py b/h3ronpy/python/h3ronpy/arrow/raster.py → h3ronpy/python/h3ronpy/raster.py
@@ -33,11 +33,10 @@
 import numpy as np
 import pyarrow as pa
 
+from h3ronpy import DEFAULT_CELL_COLUMN_NAME
+from h3ronpy.arrow import _to_arrow_array, _to_uint64_array
 from h3ronpy.h3ronpyrs import raster
-
-from .. import DEFAULT_CELL_COLUMN_NAME
-from . import _to_arrow_array, _to_uint64_array
-from .vector import cells_bounds, cells_to_wkb_polygons
+from h3ronpy.vector import cells_bounds, cells_to_wkb_polygons
 
 try:
     # affine library is used by rasterio

diff --git a/h3ronpy/python/h3ronpy/arrow/util.py → h3ronpy/python/h3ronpy/util.py b/h3ronpy/python/h3ronpy/arrow/util.py → h3ronpy/python/h3ronpy/util.py
diff --git a/h3ronpy/python/h3ronpy/arrow/vector.py → h3ronpy/python/h3ronpy/vector.py b/h3ronpy/python/h3ronpy/arrow/vector.py → h3ronpy/python/h3ronpy/vector.py
@@ -2,11 +2,10 @@
 
 from arro3.core import Array, DataType, RecordBatch
 
+from h3ronpy import ContainmentMode
+from h3ronpy.arrow import _to_arrow_array, _to_uint64_array
 from h3ronpy.h3ronpyrs import vector
 
-from .. import ContainmentMode
-from . import _to_arrow_array, _to_uint64_array
-
 
 def cells_to_coordinates(arr, radians: bool = False) -> RecordBatch:
     """