Fixed return type for STIsValid method; implemented STIsValidReason method

Author: apdevelop

LinqToDBPostGisNetTopologySuite.Tests/GeometryAccessorsTests.cs

@@ -202,21 +202,6 @@ public void TestSTIsSimple()
             }
         }
 
-        [Test]
-        public void TestSTIsValid()
-        {
-            using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
-            {
-                const string wkt1 = "LINESTRING(0 0, 1 1)";
-                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
-                const string wkt2 = "POLYGON((0 0, 1 1, 1 2, 1 1, 0 0))";
-                db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2)).Insert();
-
-                Assert.IsTrue(db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STIsValid()).Single());
-                Assert.IsFalse(db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STIsValid()).Single());
-            }
-        }
-
         [Test]
         public void TestSTNPoints()
         {

LinqToDBPostGisNetTopologySuite.Tests/GeometryValidationTests.cs

@@ -24,12 +24,30 @@ public void TestSTIsValid()
             {
                 const string wkt1 = "LINESTRING(0 0, 1 1)";
                 db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
-
                 const string wkt2 = "POLYGON((0 0, 1 1, 1 2, 1 1, 0 0))";
                 db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2)).Insert();
+                db.TestGeometries.Value(g => g.Id, 3).Value(p => p.Geometry, () => null).Insert();
 
                 Assert.IsTrue(db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STIsValid()).Single());
                 Assert.IsFalse(db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STIsValid()).Single());
+                Assert.IsNull(db.TestGeometries.Where(g => g.Id == 3).Select(g => g.Geometry.STIsValid()).Single());
+            }
+        }
+
+        [Test]
+        public void TestSTIsValidReason()
+        {
+            using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
+            {
+                const string wkt1 = "LINESTRING(0 0, 1 1)";
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
+                const string wkt2 = "POLYGON((0 0, 1 1, 1 2, 1 1, 0 0))";
+                db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2)).Insert();
+                db.TestGeometries.Value(g => g.Id, 3).Value(p => p.Geometry, () => null).Insert();
+
+                Assert.AreEqual("Valid Geometry", db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STIsValidReason()).Single());
+                Assert.AreEqual("Self-intersection[0 0]", db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STIsValidReason()).Single());
+                Assert.IsNull(db.TestGeometries.Where(g => g.Id == 3).Select(g => g.Geometry.STIsValidReason()).Single());
             }
         }
     }

LinqToDBPostGisNetTopologySuite/GeometryValidation.cs

@@ -15,15 +15,29 @@ namespace LinqToDBPostGisNetTopologySuite
     public static class GeometryValidation
     {
         /// <summary>
-        /// Returns true if geometry value is well-formed in 2D according to the OGC rules. 
+        /// Returns true if geometry value is well-formed in 2D according to the OGC rules.
         /// </summary>
         /// <remarks>
         /// See https://postgis.net/docs/manual-3.0/ST_IsValid.html
         /// </remarks>
         /// <param name="geometry">Input geometry</param>
         /// <returns>Is valid</returns>
         [Sql.Function("ST_IsValid", ServerSideOnly = true)]
-        public static bool STIsValid(this NTSG geometry)
+        public static bool? STIsValid(this NTSG geometry) // TODO: flags version
+        {
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Returns text stating if a geometry is valid or not an if not valid, a reason why.
+        /// </summary>
+        /// <remarks>
+        /// See https://postgis.net/docs/manual-3.0/ST_IsValidReason.html
+        /// </remarks>
+        /// <param name="geometry">Input geometry</param>
+        /// <returns>Valid reason</returns>
+        [Sql.Function("ST_IsValidReason", ServerSideOnly = true)]
+        public static string STIsValidReason(this NTSG geometry) // TODO: flags version
         {
             throw new InvalidOperationException();
         }