Implemented most Geometry Constructors methods with tests

Author: apdevelop

LinqToDBPostGisNetTopologySuite.Tests/GeometryConstructorsTests.cs

@@ -134,13 +134,99 @@ public void TestSTMakePointM()
         {
             using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
             {
-                db.TestGeometries.Value(g => g.Id, 1).Value(p => p.Geometry, () => GeometryConstructors.STMakePointM(10, 20, -999)).Insert();
+                db.TestGeometries
+                    .Value(g => g.Id, 1)
+                    .Value(p => p.Geometry, () => GeometryConstructors.STMakePointM(10, 20, -999))
+                    .Insert();
 
                 var point1 = db.TestGeometries.Where(g => g.Id == 1);
                 Assert.AreEqual(10, point1.Select(g => g.Geometry.STX()).Single(), 0.1);
                 Assert.AreEqual(20, point1.Select(g => g.Geometry.STY()).Single(), 0.1);
                 Assert.AreEqual(-999, point1.Select(g => g.Geometry.STM()).Single(), 0.1);
             }
         }
+
+        [Test]
+        public void TestSTMakePolygon()
+        {
+            const string Wkt1 = "LINESTRING(75.15 29.53 1,77 29 1,77.6 29.5 1, 75.15 29.53 1)";
+            const string Wkt2 = "LINESTRINGM(75.15 29.53 1,77 29 1,77.6 29.5 2, 75.15 29.53 2)";
+
+            using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
+            {
+                db.TestGeometries
+                    .Value(g => g.Id, 1)
+                    .Value(p => p.Geometry, () => GeometryConstructors.STMakePolygon(GeometryInput.STGeomFromText(Wkt1)))
+                    .Insert();
+
+                db.TestGeometries
+                    .Value(g => g.Id, 2)
+                    .Value(p => p.Geometry, () => GeometryConstructors.STMakePolygon(GeometryInput.STGeomFromText(Wkt2)))
+                    .Insert();
+
+                var result1 = db.TestGeometries.Where(g => g.Id == 1);
+                Assert.AreEqual("POLYGON((75.15 29.53 1,77 29 1,77.6 29.5 1,75.15 29.53 1))", 
+                    result1.Select(g => g.Geometry.STAsEWKT()).Single());
+
+                var result2 = db.TestGeometries.Where(g => g.Id == 2);
+                Assert.AreEqual("POLYGONM((75.15 29.53 1,77 29 1,77.6 29.5 2,75.15 29.53 2))", 
+                    result2.Select(g => g.Geometry.STAsEWKT()).Single());
+            }
+        }
+
+        [Test]
+        public void TestSTPolygon()
+        {
+            const string Wkt1 = "LINESTRING(75 29, 77 29, 77 29, 75 29)";
+            const string Wkt2 = "LINESTRING(75 29 1, 77 29 2, 77 29 3, 75 29 1)";
+
+            using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
+            {
+                db.TestGeometries
+                    .Value(g => g.Id, 1)
+                    .Value(p => p.Geometry, () => GeometryConstructors.STPolygon(GeometryInput.STGeomFromText(Wkt1), SRID4326))
+                    .Insert();
+
+                db.TestGeometries
+                    .Value(g => g.Id, 2)
+                    .Value(p => p.Geometry, () => GeometryConstructors.STPolygon(GeometryInput.STGeomFromText(Wkt2), SRID4326))
+                    .Insert();
+
+                var result1 = db.TestGeometries.Where(g => g.Id == 1);
+                Assert.AreEqual("POLYGON((75 29,77 29,77 29,75 29))", 
+                    result1.Select(g => g.Geometry.STAsText()).Single());
+
+                var result2 = db.TestGeometries.Where(g => g.Id == 2);
+                Assert.AreEqual("SRID=4326;POLYGON((75 29 1,77 29 2,77 29 3,75 29 1))",
+                    result2.Select(g => g.Geometry.STAsEWKT()).Single());
+            }
+        }
+
+        [Test]
+        public void TestSTTileEnvelope()
+        {
+            using (var db = new PostGisTestDataConnection(TestDatabaseConnectionString))
+            {
+                db.TestGeometries
+                    .Value(g => g.Id, 1)
+                    .Value(p => p.Geometry, () => GeometryConstructors.STTileEnvelope(2, 1, 1))
+                    .Insert();
+
+                db.TestGeometries
+                    .Value(g => g.Id, 2)
+                    .Value(p => p.Geometry, () => GeometryConstructors.STTileEnvelope(3, 1, 1, GeometryConstructors.STMakeEnvelope(-180, -90, 180, 90, SRID4326)))
+                    .Insert();
+
+                var result1 = db.TestGeometries.Where(g => g.Id == 1);
+                Assert.AreEqual("POLYGON((-10018754.1713945 0,-10018754.1713945 10018754.1713945,0 10018754.1713945,0 0,-10018754.1713945 0))",
+                    result1.Select(g => g.Geometry.STAsText()).Single());
+                Assert.AreEqual(3857,
+                    result1.Select(g => g.Geometry.STSrId()).Single());
+
+                var result2 = db.TestGeometries.Where(g => g.Id == 2);
+                Assert.AreEqual("POLYGON((-135 45,-135 67.5,-90 67.5,-90 45,-135 45))",
+                    result2.Select(g => g.Geometry.STAsText()).Single());
+            }
+        }
     }
-}
+}

LinqToDBPostGisNetTopologySuite/GeometryConstructors.cs

@@ -70,7 +70,7 @@ public static NTSG STMakeEnvelope(double xmin, double ymin, double xmax, double
         /// <param name="ymin">Minimum Y coordinate</param>
         /// <param name="xmax">Maximum X coordinate</param>
         /// <param name="ymax">Maximum Y coordinate</param>
-        /// <param name="srid">Spatial Reference System Identifier</param>
+        /// <param name="srid">Spatial Reference System Identifier (SRID)</param>
         /// <returns>Constructed geometry</returns>
         [Sql.Function("ST_MakeEnvelope", ServerSideOnly = true)]
         public static NTSG STMakeEnvelope(double xmin, double ymin, double xmax, double ymax, int srid)
@@ -157,6 +157,20 @@ public static NTSG STMakePointM(double x, double y, double m)
             throw new InvalidOperationException();
         }
 
+        /// <summary>
+        /// Constructs Polygon geometry formed by given shell.
+        /// </summary>
+        /// <remarks>
+        /// See https://postgis.net/docs/manual-3.0/ST_MakePolygon.html
+        /// </remarks>
+        /// <param name="geometry">Input geometry (closed LineString)</param>
+        /// <returns>Geometry</returns>
+        [Sql.Function("ST_MakePolygon", ServerSideOnly = true)]
+        public static NTSG STMakePolygon(this NTSG geometry) // TODO: with interiorlinestrings
+        {
+            throw new InvalidOperationException();
+        }
+
         /// <summary>
         /// Constructs 2D Point geometry.
         /// </summary>
@@ -165,11 +179,59 @@ public static NTSG STMakePointM(double x, double y, double m)
         /// </remarks>
         /// <param name="x">X coordinate</param>
         /// <param name="y">Y coordinate</param>
-        /// <returns>Geometry (POINT)</returns>
+        /// <returns>Geometry (Point)</returns>
         [Sql.Function("ST_Point", ServerSideOnly = true)]
         public static NTSG STPoint(double x, double y)
         {
             throw new InvalidOperationException();
         }
+
+        /// <summary>
+        /// Constructs Polygon geometry from given LineString.
+        /// </summary>
+        /// <remarks>
+        /// See https://postgis.net/docs/manual-3.0/ST_Polygon.html
+        /// </remarks>
+        /// <param name="geometry">Input geometry (closed LineString)</param>
+        /// <param name="srid">Spatial Reference System Identifier (SRID)</param>
+        /// <returns>Geometry</returns>
+        [Sql.Function("ST_Polygon", ServerSideOnly = true)]
+        public static NTSG STPolygon(this NTSG geometry, int srid)
+        {
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Constructs rectangular Polygon in Web Mercator (SRID:3857) using XYZ tile system.
+        /// </summary>
+        /// <remarks>
+        /// See https://postgis.net/docs/manual-3.0/ST_TileEnvelope.html
+        /// </remarks>
+        /// <param name="tileZoom">Tile Z</param>
+        /// <param name="tileX">Tile X</param>
+        /// <param name="tileY">Tile Y</param>         
+        /// <returns>Geometry (Polygon)</returns>
+        [Sql.Function("ST_TileEnvelope", ServerSideOnly = true)]
+        public static NTSG STTileEnvelope(int tileZoom, int tileX, int tileY)
+        {
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Constructs rectangular Polygon in Web Mercator (SRID:3857) using XYZ tile system.
+        /// </summary>
+        /// <remarks>
+        /// See https://postgis.net/docs/manual-3.0/ST_TileEnvelope.html
+        /// </remarks>
+        /// <param name="tileZoom">Tile Z</param>
+        /// <param name="tileX">Tile X</param>
+        /// <param name="tileY">Tile Y</param>      
+        /// <param name="bounds">Bounds</param>
+        /// <returns>Geometry (Polygon)</returns>
+        [Sql.Function("ST_TileEnvelope", ServerSideOnly = true)]
+        public static NTSG STTileEnvelope(int tileZoom, int tileX, int tileY, NTSG bounds)
+        {
+            throw new InvalidOperationException();
+        }
     }
-}
+}

LinqToDBPostGisNetTopologySuite/LinqToDBPostGisNetTopologySuite.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>0.0.4</Version>
+    <Version>0.0.5</Version>
     <RepositoryUrl>https://github.com/apdevelop/linq2db-postgis-extensions</RepositoryUrl>
     <Authors>apdevelop</Authors>
     <Company>apdevelop</Company>

README.md

@@ -94,7 +94,7 @@ Depends on [linq2db](https://github.com/linq2db/linq2db), [Npgsql](https://githu
 ### TODOs
  * Implement full set of PostGIS methods.
  * Add support for PostGIS `geography` data type.
- * Test on various versions of PostgreSQL/PostGIS and platforms.
+ * Test on various versions of PostgreSQL/PostGIS and platforms (including .NET 5).
 
 ### References
 * [PostGIS Reference](https://postgis.net/docs/manual-3.0/reference.html)