diff --git a/data/aleppo_1133/original.parquet b/data/aleppo_1133/original.parquet index 4392183..2a6b014 100644 Binary files a/data/aleppo_1133/original.parquet and b/data/aleppo_1133/original.parquet differ diff --git a/data/aleppo_1133/simplified.parquet b/data/aleppo_1133/simplified.parquet index f933d7b..5638752 100644 Binary files a/data/aleppo_1133/simplified.parquet and b/data/aleppo_1133/simplified.parquet differ diff --git a/data/auckland_869/original.parquet b/data/auckland_869/original.parquet index e817e38..7d6074f 100644 Binary files a/data/auckland_869/original.parquet and b/data/auckland_869/original.parquet differ diff --git a/data/auckland_869/simplified.parquet b/data/auckland_869/simplified.parquet index 6719e07..2805661 100644 Binary files a/data/auckland_869/simplified.parquet and b/data/auckland_869/simplified.parquet differ diff --git a/data/bucaramanga_4617/original.parquet b/data/bucaramanga_4617/original.parquet index ad32ed9..902d4fb 100644 Binary files a/data/bucaramanga_4617/original.parquet and b/data/bucaramanga_4617/original.parquet differ diff --git a/data/bucaramanga_4617/simplified.parquet b/data/bucaramanga_4617/simplified.parquet index e8e334a..440a9be 100644 Binary files a/data/bucaramanga_4617/simplified.parquet and b/data/bucaramanga_4617/simplified.parquet differ diff --git a/data/douala_809/original.parquet b/data/douala_809/original.parquet index 7e23a64..1b634ef 100644 Binary files a/data/douala_809/original.parquet and b/data/douala_809/original.parquet differ diff --git a/data/douala_809/simplified.parquet b/data/douala_809/simplified.parquet index c97543f..1244642 100644 Binary files a/data/douala_809/simplified.parquet and b/data/douala_809/simplified.parquet differ diff --git a/data/liege_1656/original.parquet b/data/liege_1656/original.parquet index 7dc42e5..a4cd208 100644 Binary files a/data/liege_1656/original.parquet and b/data/liege_1656/original.parquet differ diff --git a/data/liege_1656/simplified.parquet b/data/liege_1656/simplified.parquet index 30c782b..1b14172 100644 Binary files a/data/liege_1656/simplified.parquet and b/data/liege_1656/simplified.parquet differ diff --git a/data/slc_4881/original.parquet b/data/slc_4881/original.parquet index 2be7375..9d815d4 100644 Binary files a/data/slc_4881/original.parquet and b/data/slc_4881/original.parquet differ diff --git a/data/slc_4881/simplified.parquet b/data/slc_4881/simplified.parquet index 3fe2bb3..0df5390 100644 Binary files a/data/slc_4881/simplified.parquet and b/data/slc_4881/simplified.parquet differ diff --git a/neatnet/tests/test_simplify.py b/neatnet/tests/test_simplify.py index f5896ef..b46dd0c 100644 --- 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)