Implement Relate spatial restriction criteria

Author: peetw

NHibernate.Spatial.MsSql/Dialect/MsSql2012FunctionRegistration.cs

@@ -450,6 +450,8 @@ public SqlString GetSpatialRelationString(object geometry, SpatialRelation relat
                         .Add(" THEN 1 ELSE 0 END")
                         .Add(criterion ? " = 1" : "")
                         .ToSqlString();
+                case SpatialRelation.Relate:
+                    return GetSpatialRelateString(geometry, anotherGeometry, parameter, true, criterion);
                 default:
                     throw new ArgumentOutOfRangeException(nameof(relation), relation, "Unsupported spatial relation");
             }

NHibernate.Spatial.PostGis/Dialect/PostGis20Dialect.cs

@@ -351,6 +351,18 @@ public SqlString GetSpatialRelationString(object geometry, SpatialRelation relat
                         .Add(parameter.ToString())
                         .Add(")")
                         .ToSqlString();
+                case SpatialRelation.Relate:
+                    return new SqlStringBuilder()
+                        .Add(SpatialDialect.IsoPrefix)
+                        .Add(relation.ToString())
+                        .Add("(")
+                        .AddObject(geometry)
+                        .Add(", ")
+                        .AddObject(anotherGeometry)
+                        .Add(", '")
+                        .Add(parameter.ToString())
+                        .Add("')")
+                        .ToSqlString();
                 default:
                     throw new ArgumentOutOfRangeException(nameof(relation), relation, "Unsupported spatial relation");
             }

NHibernate.Spatial/Criterion/SpatialRestrictions.cs

@@ -197,8 +197,7 @@ public static SpatialRelationCriterion Overlaps(string propertyName, object anot
         /// <returns></returns>
         public static SpatialRelationCriterion Relate(string propertyName, object anotherGeometry, string intersectionPatternMatrix)
         {
-            // TODO: Implement
-            throw new NotImplementedException();
+            return new SpatialRelationCriterion(propertyName, SpatialRelation.Relate, anotherGeometry, intersectionPatternMatrix);
         }
 
         /// <summary>

NHibernate.Spatial/SpatialRelation.cs

@@ -67,6 +67,11 @@ public enum SpatialRelation
         /// </summary>
         Overlaps,
 
+        /// <summary>
+        ///
+        /// </summary>
+        Relate,
+
         /// <summary>
         ///
         /// </summary>
@@ -75,6 +80,6 @@ public enum SpatialRelation
         /// <summary>
         ///
         /// </summary>
-        Within,
+        Within
     }
 }

Tests.NHibernate.Spatial/NtsTestCases/NtsTestCasesFixture.cs

@@ -396,7 +396,9 @@ public virtual void BooleanRelate()
             var results = _session.CreateCriteria(typeof(NtsTestCase))
                 .Add(Restrictions.Eq("Operation", "Relate"))
                 .SetProjection(Projections.ProjectionList()
+                    .Add(Projections.Property("Id"))
                     .Add(Projections.Property("Description"))
+                    .Add(Projections.Property("Parameter"))
                     .Add(Projections.Property("BooleanResult"))
                     .Add(SpatialProjections.Relate("GeometryA", "GeometryB", "Parameter"))
                 )
@@ -406,11 +408,22 @@ public virtual void BooleanRelate()
 
             foreach (object[] result in results)
             {
-                string description = (string) result[0];
-                bool expected = (bool) result[1];
-                bool operation = (bool) result[2];
+                long id = (long) result[0];
+                string description = (string) result[1];
+                string parameter = (string) result[2];
+                bool expected = (bool) result[3];
+                bool operation = (bool) result[4];
 
                 Assert.AreEqual(expected, operation);
+
+                // Spatial restriction
+                long rowCount = _session.CreateCriteria(typeof(NtsTestCase))
+                    .Add(Restrictions.Eq("Id", id))
+                    .Add(SpatialRestrictions.Relate("GeometryA", "GeometryB", parameter))
+                    .SetProjection(Projections.RowCountInt64())
+                    .UniqueResult<long>();
+
+                Assert.AreEqual(expected, Convert.ToBoolean(rowCount));
             }
         }