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

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

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

{hydamo_validation-1.3.0b4 → 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.0b4"
+__version__ = "1.3.1b1"
 
 __license__ = "MIT"
 __maintainer__ = "Daniel Tollenaar"

{hydamo_validation-1.3.0b4 → hydamo_validation-1.3.1b1}/hydamo_validation/logical_validation.py

@@ -1,5 +1,6 @@
 """Logical validation."""
 
+# %%
 from hydamo_validation import general_functions, logic_functions, topologic_functions
 from shapely.geometry import LineString, Point, Polygon
 import numpy as np
@@ -102,9 +103,9 @@ def gdf_add_summary(
     if critical:
         gdf.loc[gdf[variable] == False, "invalid_critical"] += f"{rule_id}{separator}"
     else:
-        gdf.loc[
-            gdf[variable] == False, "invalid_non_critical"
-        ] += f"{rule_id}{separator}"
+        gdf.loc[gdf[variable] == False, "invalid_non_critical"] += (
+            f"{rule_id}{separator}"
+        )
     if tags is not None:
         gdf.loc[tags_indices, ("tags_assigned")] += f"{tags}{separator}"
         gdf.loc[gdf[variable] == False, "tags_invalid"] += f"{tags}{separator}"
@@ -122,13 +123,13 @@ def execute(
 ):
     """Execute the logical validation."""
 
-    object_rules_sets = (
+    object_rules_sets = [
         i
         for i in validation_rules_sets["objects"]
         if i["object"] in datamodel.data_layers
-    )
+    ]
     logger.info(
-        rf"lagen met valide objecten én regels: {[i["object"] for i in object_rules_sets]}"
+        rf"lagen met valide objecten en regels: {[i["object"] for i in object_rules_sets]}"
     )
     for object_rules in object_rules_sets:
         col_translation: dict = {}

{hydamo_validation-1.3.0b4 → hydamo_validation-1.3.1b1}/hydamo_validation/summaries.py

@@ -161,6 +161,7 @@ class LayersSummary:
                             layer=object_layer,
                             driver="GPKG",
                             engine="pyogrio",
+                            layer_options={"OVERWRITE": "YES"},
                         )
                 layers += [object_layer]
             else:

{hydamo_validation-1.3.0b4 → 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.0b4 → hydamo_validation-1.3.1b1}/hydamo_validation/validator.py

@@ -281,9 +281,7 @@ def _validator(
             gdf, schema = datasets.read_layer(
                 layer, result_summary=result_summary, status_object=status_object
             )
-            if (
-                gdf.empty
-            ):  # pass if gdf is empty. Most likely due to mall-formed or ill-specifiec status_object
+            if gdf.empty:  # pass if gdf is empty. Most likely due to mall-formed or ill-specifiec status_object
                 logger.warning(
                     f"{layer}: geen objecten ingelezen. Zorg dat alle waarden in de kolom 'status_object' voorkomen in {status_object}"
                 )

{hydamo_validation-1.3.0b4 → 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.0b4
+Version: 1.3.1b1
 Summary: Validation module for HyDAMO data
 Author-email: Daniel Tollenaar <daniel@d2hydro.nl>
 License: MIT

{hydamo_validation-1.3.0b4 → 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.0b4 → hydamo_validation-1.3.1b1}/pyproject.toml

@@ -1,46 +1,46 @@
-[build-system]
-requires = ["setuptools>=61"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "hydamo_validation"
-description = "Validation module for HyDAMO data"
-readme = "README.md"
-authors = [
-    { name = "Daniel Tollenaar", email = "daniel@d2hydro.nl" },
-]
-license = { text = "MIT" }
-
-requires-python = ">=3.12"
-dependencies = [
-    "geopandas",
-    "pandas>=2",
-    "pyogrio",
-    "rasterio",
-    "shapely>=2",
-    "rasterstats",
-]
-
-dynamic = ["version"]
-
-[project.optional-dependencies]
-tests = ["pytest"]
-
-[tool.flake8]
-max-line-length = 120
-max-complexity = 10
-
-[tool.setuptools]
-zip-safe = true
-
-[tool.setuptools.dynamic]
-version = { attr = "hydamo_validation.__version__" }
-
-[tool.setuptools.packages.find]
-include = ["hydamo_validation", "hydamo_validation.*"]
-
-[tool.setuptools.package-data]
-hydamo_validation = ["schemas/hydamo/*.json","schemas/rules/*.json", "styles/*.*"]
-
-[project.urls]
-Source = "https://github.com/HetWaterschapshuis/HyDAMOValidatieModule"
+[build-system]
+requires = ["setuptools>=61"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "hydamo_validation"
+description = "Validation module for HyDAMO data"
+readme = "README.md"
+authors = [
+    { name = "Daniel Tollenaar", email = "daniel@d2hydro.nl" },
+]
+license = { text = "MIT" }
+
+requires-python = ">=3.12"
+dependencies = [
+    "geopandas",
+    "pandas>=2",
+    "pyogrio",
+    "rasterio",
+    "shapely>=2",
+    "rasterstats",
+]
+
+dynamic = ["version"]
+
+[project.optional-dependencies]
+tests = ["pytest"]
+
+[tool.flake8]
+max-line-length = 120
+max-complexity = 10
+
+[tool.setuptools]
+zip-safe = true
+
+[tool.setuptools.dynamic]
+version = { attr = "hydamo_validation.__version__" }
+
+[tool.setuptools.packages.find]
+include = ["hydamo_validation", "hydamo_validation.*"]
+
+[tool.setuptools.package-data]
+hydamo_validation = ["schemas/hydamo/*.json","schemas/rules/*.json", "styles/*.*"]
+
+[project.urls]
+Source = "https://github.com/HetWaterschapshuis/HyDAMOValidatieModule"

hydamo_validation-1.3.1b1/tests/test_dommelerwaard.py

@@ -0,0 +1,87 @@
+# %%
+from hydamo_validation import validator
+from pathlib import Path
+import pandas as pd
+
+DATA_DIR = Path(r"d:\repositories\HyDAMOValidatieModule\tests\data")
+coverage = {"AHN": DATA_DIR.joinpath(r"dtm")}
+directory = DATA_DIR.joinpath(r"tasks/test_dommelerwaard")
+exports_dir = Path(__file__).parent / "exports"
+exports_dir.mkdir(exist_ok=True)
+
+hydamo_validator = validator(
+    output_types=["geopackage", "csv", "geojson"], coverages=coverage, log_level="INFO"
+)
+
+
+datamodel, layer_summary, result_summary = hydamo_validator(
+    directory=directory, raise_error=False
+)
+
+
+def test_hydroobjects():
+    EXPECTED_INDEX = pd.Index(
+        [
+            "nen3610id",
+            "code",
+            "geometry",
+            "syntax_breedte",
+            "syntax_categorieoppwaterlichaam",
+            "syntax_code",
+            "syntax_created_date",
+            "syntax_detailniveaugeometrie",
+            "syntax_draineert",
+            "syntax_featuretype",
+            "syntax_getijdebeinvloed",
+            "syntax_globalid",
+            "syntax_hydroobjectgroeperingid",
+            "syntax_hyperlink",
+            "syntax_krwstromendid",
+            "syntax_last_edited_date",
+            "syntax_lengte",
+            "syntax_lvpublicatiedatum",
+            "syntax_metadataid",
+            "syntax_naam",
+            "syntax_namespace",
+            "syntax_nen3610id",
+            "syntax_niveau",
+            "syntax_objectid",
+            "syntax_ontstaanswijze",
+            "syntax_opmerking",
+            "syntax_oppervlaktewaterlichaamid",
+            "syntax_oppwatervolgnummer",
+            "syntax_persistentie",
+            "syntax_ruimtelijkeafbakeningbekend",
+            "syntax_ruwheidhoog",
+            "syntax_ruwheidlaag",
+            "syntax_soortoppwaterkwaliteit",
+            "syntax_soortoppwaterkwantiteit",
+            "syntax_statusleggerwatersysteem",
+            "syntax_statusobject",
+            "syntax_typeruwheid",
+            "syntax_vaarwegid",
+            "syntax_geometry",
+            "syntax_oordeel",
+            "validate_000_lengte_gt_1m",
+            "validate_001_goed_gesplitst",
+            "validate_002_goede_kruising",
+            "validate_003_geen_eindpunt",
+            "validate_006_kunstwerk_op_peilscheiding",
+            "validate_005_kunstwerk_tussen_hobject",
+            "rating",
+            "valid",
+            "invalid",
+            "invalid_critical",
+            "invalid_non_critical",
+            "ignored",
+            "summary",
+            "tags_assigned",
+            "tags_invalid",
+            "date_check",
+        ]
+    )
+
+    assert layer_summary.hydroobject.columns.equals(EXPECTED_INDEX)
+
+
+# %%

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)

hydamo_validation-1.3.0b4/tests/test_dommelerwaard.py

@@ -1,31 +0,0 @@
-# %%
-from hydamo_validation import validator
-from hydamo_validation import __version__
-from pathlib import Path
-from datetime import datetime
-
-# try:
-#     from .config import DATA_DIR
-# except ImportError:
-#     from config import DATA_DIR
-
-DATA_DIR = Path(r"d:\repositories\HyDAMOValidatieModule\tests\data")
-coverage = {"AHN": DATA_DIR.joinpath(r"dtm")}
-directory = DATA_DIR.joinpath(r"tasks/test_dommelerwaard")
-exports_dir = Path(__file__).parent / "exports"
-exports_dir.mkdir(exist_ok=True)
-
-# hydamo_validator = validator(output_types=["geopackage", "csv", "geojson"],
-#                              coverages=coverage,
-#                              log_level="INFO"
-#                              )
-
-
-# datamodel, layer_summary, result_summary = hydamo_validator(
-#     directory=directory,
-#     raise_error=True
-#     )
-
-# datamodel.to_geopackage(exports_dir / "datamodel.gpkg",
-#                         use_schema=False)
-# %%