standardize input FUA indices & columns (#150)

uscuni · Dec 10, 2024 · 5fade1e · 5fade1e
1 parent cf8a658
commit 5fade1e
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 3 deletions.
diff --git a/data/aleppo_1133/original.parquet b/data/aleppo_1133/original.parquet
diff --git a/data/aleppo_1133/simplified.parquet b/data/aleppo_1133/simplified.parquet
diff --git a/data/auckland_869/original.parquet b/data/auckland_869/original.parquet
diff --git a/data/auckland_869/simplified.parquet b/data/auckland_869/simplified.parquet
diff --git a/data/bucaramanga_4617/original.parquet b/data/bucaramanga_4617/original.parquet
diff --git a/data/bucaramanga_4617/simplified.parquet b/data/bucaramanga_4617/simplified.parquet
diff --git a/data/douala_809/original.parquet b/data/douala_809/original.parquet
diff --git a/data/douala_809/simplified.parquet b/data/douala_809/simplified.parquet
diff --git a/data/liege_1656/original.parquet b/data/liege_1656/original.parquet
diff --git a/data/liege_1656/simplified.parquet b/data/liege_1656/simplified.parquet
diff --git a/data/slc_4881/original.parquet b/data/slc_4881/original.parquet
diff --git a/data/slc_4881/simplified.parquet b/data/slc_4881/simplified.parquet
diff --git a/neatnet/tests/test_simplify.py b/neatnet/tests/test_simplify.py
@@ -4,7 +4,7 @@
 import numpy
 import pytest
 import shapely
-from pandas.testing import assert_series_equal
+from pandas.testing import assert_frame_equal, assert_series_equal
 
 import neatnet
 
@@ -65,7 +65,11 @@ def test_simplify_network_small(scenario, tol, known_length):
     assert observed.index.dtype == numpy.dtype("int64")
 
     assert observed.shape == known.shape
-    assert_series_equal(known._status, observed._status)
+    assert_series_equal(known["_status"], observed["_status"])
+    assert_frame_equal(
+        known.drop(columns=["_status", "geometry"]),
+        observed.drop(columns=["_status", "geometry"]),
+    )
 
     pytest.geom_test(known, observed, tolerance=tol, aoi=f"{ac}_{scenario}")
 
@@ -98,5 +102,9 @@ def test_simplify_network_full_fua(aoi, tol, known_length):
     assert observed.index.dtype == numpy.dtype("int64")
 
     if pytest.ubuntu and pytest.env_type != "oldest":
-        assert_series_equal(known._status, observed._status)
+        assert_series_equal(known["_status"], observed["_status"])
+        assert_frame_equal(
+            known.drop(columns=["_status", "geometry"]),
+            observed.drop(columns=["_status", "geometry"]),
+        )
         pytest.geom_test(known, observed, tolerance=tol, aoi=aoi)