Merge pull request #26 from DahnJ/fix/dj-k-ring-smoothing

Fix: k-ring smoothing does not fail if geometry is present + switch to ruff

Author: DahnJ

.pre-commit-config.yaml

@@ -1,18 +1,18 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 23.10.0
     hooks:
       - id: black
         language_version: python3
 
-  - repo: https://github.com/PyCQA/flake8
-    rev: 3.9.2
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.1.5
     hooks:
-      - id: flake8
-        language_version: python3
+      - id: ruff
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v1.16.0
+    rev: v2.2.6
     hooks:
       - id: codespell
+        args: ['--config', '.codespellrc']
         language_version: python3

h3pandas/h3pandas.py

@@ -660,6 +660,9 @@ def k_ring_smoothing(
         881e30973bfffff  0.714286
         881e30973dfffff  0.714286
         """
+        # Drop geometry if present
+        df = self._df.drop(columns=["geometry"], errors="ignore")
+
         if sum([weights is None, k is None]) != 1:
             raise ValueError("Exactly one of `k` and `weights` must be set.")
 
@@ -671,7 +674,7 @@ def k_ring_smoothing(
         # Unweighted case
         if weights is None:
             result = pd.DataFrame(
-                self._df.h3.k_ring(k, explode=True)
+                df.h3.k_ring(k, explode=True)
                 .groupby("h3_k_ring")
                 .sum()
                 .divide((1 + 3 * k * (k + 1)))
@@ -695,10 +698,7 @@ def weighted_hex_ring(df, k, normalized_weight):
 
         result = (
             pd.concat(
-                [
-                    weighted_hex_ring(self._df, i, weights[i])
-                    for i in range(len(weights))
-                ]
+                [weighted_hex_ring(df, i, weights[i]) for i in range(len(weights))]
             )
             .groupby("h3_hex_ring")
             .sum()

notebook/01-unified-data-layers.ipynb

@@ -1,7 +1,7 @@
 from h3pandas import h3pandas  # noqa: F401
 from h3 import h3
 import pytest
-from shapely.geometry import Polygon, box
+from shapely.geometry import Polygon, box, Point
 import pandas as pd
 import geopandas as gpd
 from geopandas.testing import assert_geodataframe_equal
@@ -519,6 +519,12 @@ def test_h3_k_ring_smoothing_1_ring_weighted(self, h3_dataframe_with_values):
         result = set(data.h3.k_ring_smoothing(weights=[2, 1])["val"])
         assert expected == result
 
+    def test_does_not_fail_if_geometry_present(self, h3_geodataframe_with_values):
+        h3_geodataframe_with_values["geometry"] = [Point(0, 0)] * len(
+            h3_geodataframe_with_values
+        )
+        h3_geodataframe_with_values.h3.k_ring_smoothing(1)
+
 
 class TestPolyfillResample:
     def test_polyfill_resample(self, h3_geodataframe_with_values):