Fixed return type for several Geometry Accessors methods (nullable int or bool)

Author: apdevelop

LinqToDBPostGisNetTopologySuite.Tests/GeometryAccessorsTests.cs

@@ -22,12 +22,21 @@ public void TestGeometryType()
         {
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
-                const string wkt = "LINESTRING(77.29 29.07,77.42 29.26,77.27 29.31,77.29 29.07)";
-                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt)).Insert();
+                const string wkt1 = "LINESTRING(77.29 29.07,77.42 29.26,77.27 29.31,77.29 29.07)";
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
+                db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => null).Insert();
 
-                var geometryType = db.TestGeometries.Select(g => g.Geometry.GeometryType()).Single();
+                var geometryType1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.GeometryType()).Single();
+                Assert.AreEqual("LINESTRING", geometryType1);
 
-                Assert.AreEqual("LINESTRING", geometryType);
+                var stGeometryType1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STGeometryType()).Single();
+                Assert.AreEqual("ST_LineString", stGeometryType1);
+
+                var geometryType2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.GeometryType()).Single();
+                Assert.IsNull(geometryType2);
+
+                var stGeometryType2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STGeometryType()).Single();
+                Assert.IsNull(stGeometryType2);
             }
         }
 
@@ -40,26 +49,56 @@ public void TestSTBoundary()
                 db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
                 const string wkt2 = "POLYGON (( 10 130, 50 190, 110 190, 140 150, 150 80, 100 10, 20 40, 10 130), (70 40, 100 50, 120 80, 80 110, 50 90, 70 40))";
                 db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2)).Insert();
+                const string wkt3 = "MULTILINESTRING((1 1 1,0 0 0.5, -1 1 1),(1 1 0.5,0 0 0.5, -1 1 0.5, 1 1 0.5) )";
+                db.TestGeometries.Value(g => g.Id, 3).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt3)).Insert();
 
                 var boundary1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STBoundary().STAsText()).Single();
                 Assert.AreEqual("MULTIPOINT(100 150,160 170)", boundary1);
 
                 var boundary2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STBoundary().STAsText()).Single();
                 Assert.AreEqual("MULTILINESTRING((10 130,50 190,110 190,140 150,150 80,100 10,20 40,10 130),(70 40,100 50,120 80,80 110,50 90,70 40))", boundary2);
+
+                var boundary3 = db.TestGeometries.Where(g => g.Id == 3).Select(g => g.Geometry.STBoundary().STAsText()).Single();
+                Assert.AreEqual("MULTIPOINT Z (-1 1 1,1 1 0.75)", boundary3);
             }
         }
 
         [Test]
-        public void TestSTDimension()
+        public void TestSTCoordDim()
         {
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
-                const string wkt = "GEOMETRYCOLLECTION(LINESTRING(1 1,0 0),POINT(0 0))";
+                const string wkt = "CIRCULARSTRING(1 2 3, 1 3 4, 5 6 7, 8 9 10, 11 12 13)";
                 db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt)).Insert();
+                db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => null).Insert();
 
-                var dimension = db.TestGeometries.Select(g => g.Geometry.STDimension()).Single();
+                var dimension1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STCoordDim()).Single();
+                Assert.AreEqual(3, dimension1);
 
-                Assert.AreEqual(1, dimension);
+                var dimension2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STCoordDim()).Single();
+                Assert.IsNull(dimension2);
+            }
+        }
+
+        [Test]
+        public void TestSTDimension()
+        {
+            using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
+            {
+                const string wkt1 = "GEOMETRYCOLLECTION(LINESTRING(1 1,0 0),POINT(0 0))";
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
+                const string wkt2 = "POINT(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();
+
+                var dimension1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STDimension()).Single();
+                Assert.AreEqual(1, dimension1);
+
+                var dimension2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STDimension()).Single();
+                Assert.AreEqual(0, dimension2);
+
+                var dimension3 = db.TestGeometries.Where(g => g.Id == 3).Select(g => g.Geometry.STDimension()).Single();
+                Assert.IsNull(dimension3);
             }
         }
 
@@ -68,12 +107,16 @@ public void TestSTEndPoint()
         {
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
-                const string wkt = "LINESTRING(1 1, 2 2, 3 3)";
-                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt)).Insert();
+                const string wkt1 = "LINESTRING(1 1, 2 2, 3 3)";
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
+                const string wkt2 = "POINT(1 1)";
+                db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2)).Insert();
 
-                var endPoint = db.TestGeometries.Select(g => g.Geometry.STEndPoint().STAsText()).Single();
+                var endPoint1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STEndPoint().STAsText()).Single();
+                Assert.AreEqual("POINT(3 3)", endPoint1);
 
-                Assert.AreEqual("POINT(3 3)", endPoint);
+                var endPoint2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STEndPoint()).Single();
+                Assert.IsNull(endPoint2);
             }
         }
 
@@ -91,6 +134,23 @@ public void TestSTEnvelope()
             }
         }
 
+        [Test]
+        public void TestSTIsClosed()
+        {
+            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 = "LINESTRING(0 0, 0 1, 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.IsFalse(db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STIsClosed()).Single());
+                Assert.IsTrue(db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STIsClosed()).Single());
+                Assert.IsNull(db.TestGeometries.Where(g => g.Id == 3).Select(g => g.Geometry.STIsClosed()).Single());
+            }
+        }
+
         [Test]
         public void TestSTIsEmpty()
         {
@@ -108,6 +168,40 @@ public void TestSTIsEmpty()
             }
         }
 
+        [Test]
+        public void TestSTIsRing()
+        {
+            using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
+            {
+                const string wkt1 = "LINESTRING(0 0, 0 1, 1 1, 1 0, 0 0)";
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
+                const string wkt2 = "LINESTRING(0 0, 0 1, 1 0, 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.STIsRing()).Single());
+                Assert.IsFalse(db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STIsRing()).Single());
+                Assert.IsNull(db.TestGeometries.Where(g => g.Id == 3).Select(g => g.Geometry.STIsRing()).Single());
+            }
+        }
+
+        [Test]
+        public void TestSTIsSimple()
+        {
+            using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
+            {
+                const string wkt1 = "POLYGON((1 1, 2 1, 2 2, 1 1))";
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
+                const string wkt2 = "LINESTRING(1 1,2 2,2 3.5,1 3,1 2,2 1)";
+                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.STIsSimple()).Single());
+                Assert.IsFalse(db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STIsSimple()).Single());
+                Assert.IsNull(db.TestGeometries.Where(g => g.Id == 3).Select(g => g.Geometry.STIsSimple()).Single());
+            }
+        }
+
         [Test]
         public void TestSTIsValid()
         {
@@ -123,6 +217,33 @@ public void TestSTIsValid()
             }
         }
 
+        [Test]
+        public void TestSTNPoints()
+        {
+            using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
+            {
+                const string wkt1 = "POINT(77.29 29.07)";
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
+                const string wkt2 = "LINESTRING(77.29 29.07 1,77.42 29.26 0,77.27 29.31 -1,77.29 29.07 3)";
+                db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2)).Insert();
+                const string wkt3 = "LINESTRING EMPTY";
+                db.TestGeometries.Value(g => g.Id, 3).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt3)).Insert();
+                db.TestGeometries.Value(g => g.Id, 4).Value(p => p.Geometry, () => null).Insert();
+
+                var nPoints1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STNPoints()).Single();
+                Assert.AreEqual(1, nPoints1);
+
+                var nPoints2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STNPoints()).Single();
+                Assert.AreEqual(4, nPoints2);
+
+                var nPoints3 = db.TestGeometries.Where(g => g.Id == 3).Select(g => g.Geometry.STNPoints()).Single();
+                Assert.AreEqual(0, nPoints3);
+
+                var nPoints4 = db.TestGeometries.Where(g => g.Id == 4).Select(g => g.Geometry.STNPoints()).Single();
+                Assert.IsNull(nPoints4);
+            }
+        }
+
         [Test]
         public void TestSTNumGeometries()
         {
@@ -132,12 +253,21 @@ public void TestSTNumGeometries()
                 db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
                 const string wkt2 = "GEOMETRYCOLLECTION(MULTIPOINT(-2 3 , -2 2), LINESTRING(5 5, 10 10), POLYGON((-7 4.2, -7.1 5, -7.1 4.3, -7 4.2)))";
                 db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2)).Insert();
+                const string wkt3 = "POINT EMPTY";
+                db.TestGeometries.Value(g => g.Id, 3).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt3)).Insert();
+                db.TestGeometries.Value(g => g.Id, 4).Value(p => p.Geometry, () => null).Insert();
 
                 var numGeometries1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STNumGeometries()).Single();
                 Assert.AreEqual(1, numGeometries1);
 
                 var numGeometries2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STNumGeometries()).Single();
                 Assert.AreEqual(3, numGeometries2);
+
+                var numGeometries3 = db.TestGeometries.Where(g => g.Id == 3).Select(g => g.Geometry.STNumGeometries()).Single();
+                Assert.AreEqual(0, numGeometries3);
+
+                var numGeometries4 = db.TestGeometries.Where(g => g.Id == 4).Select(g => g.Geometry.STNumGeometries()).Single();
+                Assert.IsNull(numGeometries4);
             }
         }
 
@@ -146,12 +276,34 @@ public void TestSTNumPoints()
         {
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
-                const string wkt = "LINESTRING(77.29 29.07,77.42 29.26,77.27 29.31,77.29 29.07)";
-                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt)).Insert();
+                const string wkt1 = "LINESTRING(77.29 29.07,77.42 29.26,77.27 29.31,77.29 29.07)";
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
+                const string wkt2 = "POINT(77.29 29.07)";
+                db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2)).Insert();
+
+                var numPoints1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STNumPoints()).Single();
+                Assert.AreEqual(4, numPoints1);
+
+                var numPoints2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STNumPoints()).Single();
+                Assert.IsNull(numPoints2);
+            }
+        }
 
-                var numPoints = db.TestGeometries.Select(g => g.Geometry.STNumPoints()).Single();
+        [Test]
+        public void TestSTStartPoint()
+        {
+            using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
+            {
+                const string wkt1 = "LINESTRING(0 1, 0 2)";
+                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
+                const string wkt2 = "POINT(0 1)";
+                db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2)).Insert();
+
+                var startPoint1 = db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STStartPoint().STAsText()).Single();
+                Assert.AreEqual("POINT(0 1)", startPoint1);
 
-                Assert.AreEqual(4, numPoints);
+                var startPoint2 = db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STStartPoint()).Single();
+                Assert.IsNull(startPoint2);
             }
         }
 
@@ -164,6 +316,8 @@ public void TestSTXYZM()
                 db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
                 const string wkt2 = "POINT(1 2)";
                 db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2)).Insert();
+                const string wkt3 = "POINT EMPTY";
+                db.TestGeometries.Value(g => g.Id, 3).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt3)).Insert();
 
                 var query1 = db.TestGeometries.Where(g => g.Id == 1);
                 Assert.AreEqual(1, query1.Select(g => g.Geometry.STX()).Single());
@@ -176,6 +330,12 @@ public void TestSTXYZM()
                 Assert.AreEqual(2, query2.Select(g => g.Geometry.STY()).Single());
                 Assert.IsNull(query2.Select(g => g.Geometry.STZ()).Single());
                 Assert.IsNull(query2.Select(g => g.Geometry.STM()).Single());
+
+                var query3 = db.TestGeometries.Where(g => g.Id == 3);
+                Assert.IsNull(query3.Select(g => g.Geometry.STX()).Single());
+                Assert.IsNull(query3.Select(g => g.Geometry.STY()).Single());
+                Assert.IsNull(query2.Select(g => g.Geometry.STZ()).Single());
+                Assert.IsNull(query2.Select(g => g.Geometry.STM()).Single());
             }
         }
     }

LinqToDBPostGisNetTopologySuite.Tests/SpatialRelationshipsTests.cs

@@ -19,7 +19,7 @@ public void Setup()
         }
 
         [Test]
-        public void TestSTCovers()
+        public void TestSTCoversSTExteriorRing()
         {
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
@@ -29,6 +29,7 @@ public void TestSTCovers()
                 const string wkt2 = "POINT(1 2)";
                 db.TestGeometries.Value(g => g.Id, 2).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt2).STBuffer(20)).Insert();
                 var bigc = db.TestGeometries.Single(g => g.Id == 2).Geometry;
+                db.TestGeometries.Value(g => g.Id, 3).Value(p => p.Geometry, () => GeometryInput.STGeomFromText(wkt1)).Insert();
 
                 Assert.IsTrue(db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STCovers(smallc)).Single());
                 Assert.IsFalse(db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STCovers(bigc)).Single());
@@ -39,6 +40,8 @@ public void TestSTCovers()
                 Assert.IsTrue(db.TestGeometries.Where(g => g.Id == 1).Select(g => g.Geometry.STCoveredBy(bigc)).Single());
                 Assert.IsTrue(db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STExteriorRing().STCoveredBy(bigc)).Single());
                 Assert.IsFalse(db.TestGeometries.Where(g => g.Id == 2).Select(g => g.Geometry.STExteriorRing().STWithin(bigc)).Single());
+
+                Assert.IsNull(db.TestGeometries.Where(g => g.Id == 3).Select(g => g.Geometry.STExteriorRing()).Single());
             }
         }