hydamo-validation 1.3.0b5__tar.gz → 1.3.1b1__tar.gz

{hydamo_validation-1.3.0b5 → hydamo_validation-1.3.1b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hydamo_validation
-Version: 1.3.0b5
+Version: 1.3.1b1
 Summary: Validation module for HyDAMO data
 Author-email: Daniel Tollenaar <daniel@d2hydro.nl>
 License: MIT

{hydamo_validation-1.3.0b5 → hydamo_validation-1.3.1b1}/hydamo_validation/__init__.py

@@ -1,7 +1,7 @@
 __author__ = ["Het Waterschapshuis", "D2HYDRO", "HKV", "HydroConsult"]
 __copyright__ = "Copyright 2021, HyDAMO ValidatieTool"
 __credits__ = ["D2HYDRO", "HKV", "HydroConsult"]
-__version__ = "1.3.0b5"
+__version__ = "1.3.1b1"
 
 __license__ = "MIT"
 __maintainer__ = "Daniel Tollenaar"

{hydamo_validation-1.3.0b5 → hydamo_validation-1.3.1b1}/hydamo_validation/syntax_validation.py

@@ -249,13 +249,21 @@ def fields_syntax(gdf, schema, validation_schema, keep_columns=[]):
     geotype = next(
         (i["dtype"] for i in validation_schema if i["id"] == "geometry"), None
     )
+
+    # since shapely2.0 we can't use PointZ anymore
     if geotype:
+        has_z = any(i.endswith("Z") for i in geotype)
+        if has_z:
+            geotype = [i[:-1] if i.endswith("Z") else i for i in geotype]
         result_col = "syntax_geometry"
         validation_gdf[result_col] = ""
 
         bool_series = ~(
-            ~result_gdf["geometry"].is_valid | result_gdf["geometry"].type.isin(geotype)
+            result_gdf["geometry"].is_valid
+            & result_gdf["geometry"].geom_type.isin(geotype)
+            & (result_gdf["geometry"].has_z == has_z)
         )
+
         validation_gdf.loc[bool_series, result_col] = result_gdf[
             bool_series
         ].geometry.apply(lambda x: f"{x.type} -> NULL (7)")

{hydamo_validation-1.3.0b5 → hydamo_validation-1.3.1b1}/hydamo_validation.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hydamo_validation
-Version: 1.3.0b5
+Version: 1.3.1b1
 Summary: Validation module for HyDAMO data
 Author-email: Daniel Tollenaar <daniel@d2hydro.nl>
 License: MIT

{hydamo_validation-1.3.0b5 → hydamo_validation-1.3.1b1}/hydamo_validation.egg-info/SOURCES.txt

@@ -40,6 +40,7 @@ tests/test_not_overlapping.py
 tests/test_productie.py
 tests/test_structures_at_interersections.py
 tests/test_summaries.py
+tests/test_testset.py
 tests/test_topologic_functions.py
 tests/test_validationrules.py
 tests/test_wrij.py

hydamo_validation-1.3.1b1/tests/test_testset.py

@@ -0,0 +1,43 @@
+from pathlib import Path
+from hydamo_validation import validator
+import pandas as pd
+import pytest
+import shutil
+
+DATA_DIR = Path(__file__).parent.joinpath("data")
+COVERAGE = {"AHN": DATA_DIR.joinpath(r"dtm")}
+DIRECTORY = DATA_DIR.joinpath("tasks", "test_testset")
+
+hydamo_validator = validator(
+    output_types=["geopackage"], coverages=COVERAGE, log_level="INFO"
+)
+
+
+@pytest.fixture
+def result():
+    results_dir = DIRECTORY / "results"
+    if results_dir.exists():
+        shutil.rmtree(DIRECTORY / "results")
+    return hydamo_validator(directory=DIRECTORY, raise_error=True)
+
+
+def test_results_available(result):
+    # assert if result is generated
+    assert result is not None
+
+
+def test_validate_result(result):
+    # unpack result
+    datamodel, layer_summary, result_summary = result
+
+    # check if profielpunt is available
+    assert hasattr(layer_summary, "profielpunt")
+
+    # invalid geometries contain (7) in syntax_geometry column
+    result = layer_summary.profielpunt.syntax_geometry.apply(
+        lambda x: "(7)" not in x
+    ).reset_index(drop=True)
+
+    # we expecte only the first geometry to be valid, containing PointZ, Point, LineString, LineStringZ
+    expected_result = pd.Series([True, False, False, False], name="syntax_geometry")
+    assert result.equals(expected_result)