change geometry warning to error (like in DAVIE)

UnitTests/GATests/test_WKTPlusGeoType.py

@@ -1,6 +1,7 @@
 import pytest
 
 from otlmow_model.OtlmowModel.BaseClasses.OTLAsset import OTLAsset
+from otlmow_model.OtlmowModel.Exceptions.WrongGeometryTypeError import WrongGeometryTypeError
 from otlmow_model.OtlmowModel.Exceptions.WrongGeometryWarning import WrongGeometryWarning
 from otlmow_model.OtlmowModel.GeometrieTypes.PuntGeometrie import PuntGeometrie
 from otlmow_model.OtlmowModel.GeometrieTypes.VlakGeometrie import VlakGeometrie
@@ -28,7 +29,7 @@ def test_point(subtests):
         assert puntclass.geometry is not None
 
     with subtests.test(msg='invalid points'):
-        with pytest.warns(WrongGeometryWarning):
+        with pytest.raises(WrongGeometryTypeError):
             puntclass.geometry = 'POINT (200001 200002)'
         with pytest.raises(ValueError):
             puntclass.geometry = 'POINT Z (200001 200002,0 3)'
@@ -52,28 +53,28 @@ def test_point_polygon(subtests):
         assert puntvlakclass.geometry is not None
 
     with subtests.test(msg='invalid points'):
-        with pytest.warns(WrongGeometryWarning):
+        with pytest.raises(WrongGeometryTypeError):
             puntvlakclass.geometry = 'POINT (200001 220000)'
         with pytest.raises(ValueError):
             puntvlakclass.geometry = 'POINT Z (200001 200002,0 3)'
 
     with subtests.test(msg='invalid points (outside box)'):
-        with pytest.warns(WrongGeometryWarning):
+        with pytest.raises(WrongGeometryTypeError):
             puntvlakclass.geometry = 'POINT (200001 200002)'
         with pytest.raises(ValueError):
             puntvlakclass.geometry = 'POINT Z (1 2,0 3)'
 
     with subtests.test(msg='invalid polygons'):
-        with pytest.warns(WrongGeometryWarning):
+        with pytest.raises(WrongGeometryTypeError):
             puntvlakclass.geometry = 'POLYGON ((200010 200020, 200030 200040, 200050 200060))'
         with pytest.raises(ValueError):
             puntvlakclass.geometry = 'POLYGON Z ((200010.0 200020.0, 200030.0 200040.0 2, 200050.0 200060.0))'
 
 
 def test_invalid_geometry_based_on_geometry_artefact():
     instance = PointPolygonTestClass()
-    with pytest.warns(WrongGeometryWarning) as wrong_geometry_warning:
+    with pytest.raises(WrongGeometryTypeError) as wrong_geometry_exception:
         instance.geometry = 'LINESTRING Z (200001 200002 10, 200003 200004 20)'
     expected_msg = "Asset type PointPolygonTestClass shouldn't be assigned a LINESTRING Z as geometry, " \
                    "valid types are POINT Z and POLYGON Z"
-    assert expected_msg == wrong_geometry_warning[0].message.args[0]
+    assert expected_msg == wrong_geometry_exception.value.args[0]

otlmow_model/OtlmowModel/BaseClasses/WKTField.py

@@ -1,10 +1,9 @@
-import warnings
 from typing import Any
 
 from otlmow_model.OtlmowModel.BaseClasses.OTLField import OTLField
 from otlmow_model.OtlmowModel.BaseClasses.StringField import StringField
 from otlmow_model.OtlmowModel.BaseClasses.WKTValidator import WKTValidator
-from otlmow_model.OtlmowModel.Exceptions.WrongGeometryWarning import WrongGeometryWarning
+from otlmow_model.OtlmowModel.Exceptions.WrongGeometryTypeError import WrongGeometryTypeError
 
 
 class WKTField(StringField):
@@ -17,9 +16,9 @@ class WKTField(StringField):
 
     @classmethod
     def convert_to_correct_type(cls, value: str, log_warnings: bool = True) -> str:
-        value = (value.replace(' Z(', ' Z (').replace('T(', 'T (')
-                 .replace('G(', 'G (').replace('N(', 'N ('))
-        return value
+        return (value.replace(' Z(', ' Z (').replace('T(', 'T (')
+                .replace('G(', 'G (').replace('N(', 'N ('))
+
 
     @classmethod
     def validate(cls, value: Any, attribuut) -> bool:
@@ -34,7 +33,7 @@ def validate(cls, value: Any, attribuut) -> bool:
                 verkorte_uri = attribuut.owner.typeURI.split('#')[1]
                 error_msg = f"Asset type {verkorte_uri} shouldn't be assigned a {geo_type} as geometry, " \
                             f"valid types are {expected_types}"
-                warnings.warn(message=error_msg, category=WrongGeometryWarning)
+                raise WrongGeometryTypeError(error_msg)
         return True
 
     def __str__(self) -> str:

otlmow_model/OtlmowModel/Exceptions/WrongGeometryTypeError.py

@@ -0,0 +1,2 @@
+class WrongGeometryTypeError(Exception):
+    pass

otlmow_model/OtlmowModel/Exceptions/WrongGeometryWarning.py

@@ -1,2 +1,7 @@
+import warnings
+
+
 class WrongGeometryWarning(Warning):
-    pass
+    def __init__(self, message: str = ''):
+        self.message = message
+        warnings.warn('WrongGeometryWarning is now deprecated and replaced by an error', DeprecationWarning)