diff --git a/tests/test_vector_linz/test_vector_linz.py b/tests/test_vector_linz/test_vector_linz.py index a38a41e..2c8fd8f 100644 --- a/tests/test_vector_linz/test_vector_linz.py +++ b/tests/test_vector_linz/test_vector_linz.py @@ -37,9 +37,9 @@ class LinzVectorsTest(unittest.TestCase): "id": [1775717, 1775718, 1775719, 1778938, 1778939], } PASTURAL_LEASE = { - "area": 13278778764.94074, + "area": 13189155932.7776, "geometryType": "MultiPolygon", - "length": 15648834.84743058, + "length": 15552938.848015543, "columns": ["geometry", "id", "lease_name"], "id": [12511, 12653, 12658, 12797, 12461], } @@ -106,10 +106,10 @@ def compare_to_benchmark( # check various shape attributes match those expected self.assertEqual( - features.loc[0].geometry.geometryType(), + features.loc[0].geometry.geom_type, benchmark["geometryType"], "The geometryType of the returned {description} " - f"`{features.loc[0].geometry.geometryType()}` differs from the expected " + f"`{features.loc[0].geometry.geom_type}` differs from the expected " f"{benchmark['geometryType']}", ) self.assertEqual( diff --git a/tests/test_vector_linz_in_bounds/test_vector_linz_in_bounds.py b/tests/test_vector_linz_in_bounds/test_vector_linz_in_bounds.py index 41f76fa..aba72aa 100644 --- a/tests/test_vector_linz_in_bounds/test_vector_linz_in_bounds.py +++ b/tests/test_vector_linz_in_bounds/test_vector_linz_in_bounds.py @@ -41,9 +41,9 @@ class LinzVectorsTest(unittest.TestCase): # The expected datasets and files to be downloaded - used for comparison in the later tests LAND = { - "area": 150539776091.31247, + "area": 150539779947.93246, "geometryType": "Polygon", - "length": 6002892.54900315, + "length": 6002542.642926594, "columns": [ "geometry", "name", @@ -59,7 +59,7 @@ class LinzVectorsTest(unittest.TestCase): BATHYMETRY_CONTOURS = { "area": 0.0, "geometryType": "LineString", - "length": 144353.73387463146, + "length": 144353.7338746315, "columns": [ "geometry", "fidn", @@ -74,7 +74,7 @@ class LinzVectorsTest(unittest.TestCase): "sorind", "hypcat", ], - "valdco": [2.0, 2.0, 0.0, 0.0, 0.0], + "valdco": [0.0, 0.0, 2.0, 0.0, 2.0], } CHATHAM_CONTOURS = None @@ -152,10 +152,10 @@ def compare_to_benchmark( # check various shape attributes match those expected self.assertEqual( - features.loc[0].geometry.geometryType(), + features.loc[0].geometry.geom_type, benchmark["geometryType"], f"The geometryType of thereturned {description} " - f" `{features.loc[0].geometry.geometryType()}` differs from the expected " + f" `{features.loc[0].geometry.geom_type}` differs from the expected " f"{benchmark['geometryType']}", ) self.assertEqual( diff --git a/tests/test_vector_lris_in_bounds/test_vector_lris_in_bounds.py b/tests/test_vector_lris_in_bounds/test_vector_lris_in_bounds.py index 7149909..7eae5f3 100644 --- a/tests/test_vector_lris_in_bounds/test_vector_lris_in_bounds.py +++ b/tests/test_vector_lris_in_bounds/test_vector_lris_in_bounds.py @@ -164,10 +164,10 @@ def compare_to_benchmark( # check various shape attributes match those expected self.assertEqual( - features.loc[0].geometry.geometryType(), + features.loc[0].geometry.geom_type, benchmark["geometryType"], "The geometryType of the returned {description} " - f"`{features.loc[0].geometry.geometryType()}` differs from the expected " + f"`{features.loc[0].geometry.geom_type}` differs from the expected " f"{benchmark['geometryType']}", ) self.assertEqual( diff --git a/tests/test_vector_stats_nz/test_vector_stats_nz.py b/tests/test_vector_stats_nz/test_vector_stats_nz.py index 0613c3b..dda7b8c 100644 --- a/tests/test_vector_stats_nz/test_vector_stats_nz.py +++ b/tests/test_vector_stats_nz/test_vector_stats_nz.py @@ -126,10 +126,10 @@ def compare_to_benchmark( # check various shape attributes match those expected self.assertEqual( - features.loc[0].geometry.geometryType(), + features.loc[0].geometry.geom_type, benchmark["geometryType"], "The geometryType of the" - + f" returned {description} `{features.loc[0].geometry.geometryType()}` differs from the " + + f" returned {description} `{features.loc[0].geometry.geom_type}` differs from the " + f"expected {benchmark['geometryType']}", ) self.assertEqual( diff --git a/tests/test_vector_stats_nz_in_bounds/test_vector_stats_nz_in_bounds.py b/tests/test_vector_stats_nz_in_bounds/test_vector_stats_nz_in_bounds.py index b56f03e..2cf9a41 100644 --- a/tests/test_vector_stats_nz_in_bounds/test_vector_stats_nz_in_bounds.py +++ b/tests/test_vector_stats_nz_in_bounds/test_vector_stats_nz_in_bounds.py @@ -136,10 +136,10 @@ def compare_to_benchmark( # check various shape attributes match those expected self.assertEqual( - features.loc[0].geometry.geometryType(), + features.loc[0].geometry.geom_type, benchmark["geometryType"], "The geometryType of the" - + f" returned {description} `{features.loc[0].geometry.geometryType()}` differs from the " + + f" returned {description} `{features.loc[0].geometry.geom_type}` differs from the " + f"expected {benchmark['geometryType']}", ) self.assertEqual(