Fix build warnings

peetw · peetw · commit c295cf460add · 2018-11-09T11:22:20.000Z
diff --git a/NHibernate.Spatial/Type/GeometryTypeBase.cs b/NHibernate.Spatial/Type/GeometryTypeBase.cs
@@ -235,7 +235,7 @@ bool IUserType.Equals(object a, object b)
 			}
 			if (ga == null && gb == null)
 			{
-				return Util.EqualsHelper.Equals((T)a, (T)b);
+			    return Equals((T) a, (T) b);
 			}
 			return false;
 		}
diff --git a/NetTopologySuite.TestRunner/Functions/GeometryFunctions.cs b/NetTopologySuite.TestRunner/Functions/GeometryFunctions.cs
@@ -68,7 +68,7 @@ public static IGeometry getGeometryN(IGeometry g, int i)
         public static IGeometry getCoordinates(IGeometry g)
         {
             var pts = g.Coordinates;
-            return g.Factory.CreateMultiPoint(pts);
+            return g.Factory.CreateMultiPointFromCoords(pts);
         }
     }
 }
diff --git a/NetTopologySuite.TestRunner/Functions/PolygonizeFunctions.cs b/NetTopologySuite.TestRunner/Functions/PolygonizeFunctions.cs
@@ -2,8 +2,8 @@
 using NetTopologySuite.Geometries;
 using NetTopologySuite.Geometries.Utilities;
 using NetTopologySuite.Operation.Polygonize;
-using NetTopologySuite.Utilities;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Open.Topology.TestRunner.Functions
 {
@@ -24,17 +24,22 @@ public static IGeometry polygonizeDangles(IGeometry g)
             var lines = LineStringExtracter.GetLines(g);
             Polygonizer polygonizer = new Polygonizer();
             polygonizer.Add(lines);
-            var geom = polygonizer.GetDangles();
-            return g.Factory.BuildGeometry(CollectionUtil.Cast<ILineString, IGeometry>(geom));
+            var geomList = polygonizer.GetDangles()
+                .Select(x => (IGeometry) x)
+                .ToList();
+
+            return g.Factory.BuildGeometry(geomList);
         }
 
         public static IGeometry polygonizeCutEdges(IGeometry g)
         {
             var lines = LineStringExtracter.GetLines(g);
             Polygonizer polygonizer = new Polygonizer();
             polygonizer.Add(lines);
-            var geom = polygonizer.GetCutEdges();
-            return g.Factory.BuildGeometry(CollectionUtil.Cast<ILineString, IGeometry>(geom));
+            var geomList = polygonizer.GetCutEdges()
+                .Select(x => (IGeometry) x)
+                .ToList();
+            return g.Factory.BuildGeometry(geomList);
         }
 
         public static IGeometry polygonizeInvalidRingLines(IGeometry g)
@@ -51,11 +56,12 @@ public static IGeometry polygonizeAllErrors(IGeometry g)
             var lines = LineStringExtracter.GetLines(g);
             Polygonizer polygonizer = new Polygonizer();
             polygonizer.Add(lines);
-            var errs = new List<ILineString>();
-            errs.AddRange(polygonizer.GetDangles());
-            errs.AddRange(polygonizer.GetCutEdges());
-            errs.AddRange(CollectionUtil.Cast<IGeometry, ILineString>(polygonizer.GetInvalidRingLines()));
-            return g.Factory.BuildGeometry(CollectionUtil.Cast<ILineString, IGeometry>(errs));
+            var geomList = new List<IGeometry>();
+            geomList.AddRange(polygonizer.GetDangles());
+            geomList.AddRange(polygonizer.GetCutEdges());
+            geomList.AddRange(polygonizer.GetInvalidRingLines());
+
+            return g.Factory.BuildGeometry(geomList);
         }
     }
 }
diff --git a/NetTopologySuite.TestRunner/XmlTest.cs b/NetTopologySuite.TestRunner/XmlTest.cs
@@ -871,7 +871,7 @@ protected virtual bool TestDensify()
 			if (geom != null)
 			{
 				var res = NetTopologySuite.Densify.Densifier.Densify(geom, dArg);
-				return res.Equals(geoResult);
+				return res.EqualsTopologically(geoResult);
 			}
 			return false;
 		}
@@ -1091,22 +1091,22 @@ protected virtual bool TestEquals()
 			{
 				if (_objArgument1 == null)
 				{
-					return _objGeometryA.Equals(_objGeometryB) == bResult;
+					return _objGeometryA.EqualsTopologically(_objGeometryB) == bResult;
 				}
 				else
 				{
-					return _objGeometryA.Equals((Geometry)_objArgument1) == bResult;
+					return _objGeometryA.EqualsTopologically((Geometry)_objArgument1) == bResult;
 				}
 			}
 			else if (_objGeometryB != null)
 			{
 				if (_objArgument1 == null)
 				{
-					return _objGeometryB.Equals(_objGeometryA) == bResult;
+					return _objGeometryB.EqualsTopologically(_objGeometryA) == bResult;
 				}
 				else
 				{
-					return _objGeometryB.Equals((Geometry)_objArgument1) == bResult;
+					return _objGeometryB.EqualsTopologically((Geometry)_objArgument1) == bResult;
 				}
 			}
 
@@ -1817,7 +1817,7 @@ protected virtual bool TestMinClearanceLine()
 			{
 				MinimumClearance c = new MinimumClearance(_objGeometryA);
 				IGeometry gClearance = c.GetLine();
-				return gResult.Equals(gClearance);
+				return gResult.EqualsTopologically(gClearance);
 			}
 			return false;
 		}
@@ -1830,8 +1830,8 @@ private bool CompareGeometries(Geometry a, Geometry b)
 		{
 			if (a != null && b != null && a.GetType().Name == b.GetType().Name)
 			{
-				Geometry aClone = (Geometry)a.Clone();
-				Geometry bClone = (Geometry)b.Clone();
+			    Geometry aClone = (Geometry) a.Copy();
+			    Geometry bClone = (Geometry) b.Copy();
 
 				aClone.Normalize();
 				bClone.Normalize();
diff --git a/Tests.NHibernate.Spatial.MsSql2008/MsSql2008ConformanceItemsFixture.cs b/Tests.NHibernate.Spatial.MsSql2008/MsSql2008ConformanceItemsFixture.cs
@@ -31,7 +31,7 @@ from t in session.Query<RoadSegment>()
             IGeometry geometry = query.Single();
             IGeometry expected = Wkt.Read("POINT( 0 18 )");
 
-            Assert.IsTrue(expected.Equals(geometry));
+            Assert.IsTrue(expected.EqualsTopologically(geometry));
         }
 
         /// <summary>
@@ -48,7 +48,7 @@ from t in session.Query<Lake>()
             IGeometry geometry = query.Single();
             IGeometry expected = Wkt.Read("LINESTRING(59 18, 67 18, 67 13, 59 13, 59 18)");
 
-            Assert.IsTrue(expected.Equals(geometry));
+            Assert.IsTrue(expected.EqualsTopologically(geometry));
         }
 
         /// <summary>
@@ -65,7 +65,7 @@ from t in session.Query<DividedRoute>()
             IGeometry geometry = query.Single();
             IGeometry expected = Wkt.Read("LINESTRING( 16 0, 16 23, 16 48 )");
 
-            Assert.IsTrue(expected.Equals(geometry));
+            Assert.IsTrue(expected.EqualsTopologically(geometry));
         }
 
         /// <summary>
diff --git a/Tests.NHibernate.Spatial.MySQL/MySQLConformanceItemsFixture.cs b/Tests.NHibernate.Spatial.MySQL/MySQLConformanceItemsFixture.cs
@@ -31,7 +31,7 @@ from t in session.Query<RoadSegment>()
             IGeometry geometry = query.Single();
             IGeometry expected = Wkt.Read("POINT( 0 18 )");
 
-            Assert.IsTrue(expected.Equals(geometry));
+            Assert.IsTrue(expected.EqualsTopologically(geometry));
         }
 
         /// <summary>
@@ -48,7 +48,7 @@ from t in session.Query<Lake>()
             IGeometry geometry = query.Single();
             IGeometry expected = Wkt.Read("LINESTRING(59 18, 67 18, 67 13, 59 13, 59 18)");
 
-            Assert.IsTrue(expected.Equals(geometry));
+            Assert.IsTrue(expected.EqualsTopologically(geometry));
         }
 
         /// <summary>
@@ -65,7 +65,7 @@ from t in session.Query<DividedRoute>()
             IGeometry geometry = query.Single();
             IGeometry expected = Wkt.Read("LINESTRING( 16 0, 16 23, 16 48 )");
 
-            Assert.IsTrue(expected.Equals(geometry));
+            Assert.IsTrue(expected.EqualsTopologically(geometry));
         }
 
         /// <summary>
diff --git a/Tests.NHibernate.Spatial.PostGis/PostGisConformanceItemsFixture.cs b/Tests.NHibernate.Spatial.PostGis/PostGisConformanceItemsFixture.cs
@@ -31,7 +31,7 @@ from t in session.Query<RoadSegment>()
             IGeometry geometry = query.Single();
             IGeometry expected = Wkt.Read("POINT( 0 18 )");
 
-            Assert.IsTrue(expected.Equals(geometry));
+            Assert.IsTrue(expected.EqualsTopologically(geometry));
         }
 
         /// <summary>
@@ -48,7 +48,7 @@ from t in session.Query<Lake>()
             IGeometry geometry = query.Single();
             IGeometry expected = Wkt.Read("LINESTRING(59 18, 67 18, 67 13, 59 13, 59 18)");
 
-            Assert.IsTrue(expected.Equals(geometry));
+            Assert.IsTrue(expected.EqualsTopologically(geometry));
         }
 
         /// <summary>
@@ -65,7 +65,7 @@ from t in session.Query<DividedRoute>()
             IGeometry geometry = query.Single();
             IGeometry expected = Wkt.Read("LINESTRING( 16 0, 16 23, 16 48 )");
 
-            Assert.IsTrue(expected.Equals(geometry));
+            Assert.IsTrue(expected.EqualsTopologically(geometry));
         }
 
         /// <summary>
diff --git a/Tests.NHibernate.Spatial/OgcSfSql11Compliance/ConformanceItemsFixture.cs b/Tests.NHibernate.Spatial/OgcSfSql11Compliance/ConformanceItemsFixture.cs
diff --git a/Tests.NHibernate.Spatial/ProjectionsFixture.cs b/Tests.NHibernate.Spatial/ProjectionsFixture.cs
diff --git a/Tests.NHibernate.Spatial/RandomGeometries/SpatialQueriesFixture.cs b/Tests.NHibernate.Spatial/RandomGeometries/SpatialQueriesFixture.cs

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ bool IUserType.Equals(object a, object b)`
`235`	`235`	`}`
`236`	`236`	`if (ga == null && gb == null)`
`237`	`237`	`{`
`238`		`- return Util.EqualsHelper.Equals((T)a, (T)b);`
	`238`	`+ return Equals((T) a, (T) b);`
`239`	`239`	`}`
`240`	`240`	`return false;`
`241`	`241`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public static IGeometry getGeometryN(IGeometry g, int i)`
`68`	`68`	`public static IGeometry getCoordinates(IGeometry g)`
`69`	`69`	`{`
`70`	`70`	`var pts = g.Coordinates;`
`71`		`- return g.Factory.CreateMultiPoint(pts);`
	`71`	`+ return g.Factory.CreateMultiPointFromCoords(pts);`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -871,7 +871,7 @@ protected virtual bool TestDensify()`
`871`	`871`	`if (geom != null)`
`872`	`872`	`{`
`873`	`873`	`var res = NetTopologySuite.Densify.Densifier.Densify(geom, dArg);`
`874`		`- return res.Equals(geoResult);`
	`874`	`+ return res.EqualsTopologically(geoResult);`
`875`	`875`	`}`
`876`	`876`	`return false;`
`877`	`877`	`}`
`@@ -1091,22 +1091,22 @@ protected virtual bool TestEquals()`
`1091`	`1091`	`{`
`1092`	`1092`	`if (_objArgument1 == null)`
`1093`	`1093`	`{`
`1094`		`- return _objGeometryA.Equals(_objGeometryB) == bResult;`
	`1094`	`+ return _objGeometryA.EqualsTopologically(_objGeometryB) == bResult;`
`1095`	`1095`	`}`
`1096`	`1096`	`else`
`1097`	`1097`	`{`
`1098`		`- return _objGeometryA.Equals((Geometry)_objArgument1) == bResult;`
	`1098`	`+ return _objGeometryA.EqualsTopologically((Geometry)_objArgument1) == bResult;`
`1099`	`1099`	`}`
`1100`	`1100`	`}`
`1101`	`1101`	`else if (_objGeometryB != null)`
`1102`	`1102`	`{`
`1103`	`1103`	`if (_objArgument1 == null)`
`1104`	`1104`	`{`
`1105`		`- return _objGeometryB.Equals(_objGeometryA) == bResult;`
	`1105`	`+ return _objGeometryB.EqualsTopologically(_objGeometryA) == bResult;`
`1106`	`1106`	`}`
`1107`	`1107`	`else`
`1108`	`1108`	`{`
`1109`		`- return _objGeometryB.Equals((Geometry)_objArgument1) == bResult;`
	`1109`	`+ return _objGeometryB.EqualsTopologically((Geometry)_objArgument1) == bResult;`
`1110`	`1110`	`}`
`1111`	`1111`	`}`
`1112`	`1112`
`@@ -1817,7 +1817,7 @@ protected virtual bool TestMinClearanceLine()`
`1817`	`1817`	`{`
`1818`	`1818`	`MinimumClearance c = new MinimumClearance(_objGeometryA);`
`1819`	`1819`	`IGeometry gClearance = c.GetLine();`
`1820`		`- return gResult.Equals(gClearance);`
	`1820`	`+ return gResult.EqualsTopologically(gClearance);`
`1821`	`1821`	`}`
`1822`	`1822`	`return false;`
`1823`	`1823`	`}`
`@@ -1830,8 +1830,8 @@ private bool CompareGeometries(Geometry a, Geometry b)`
`1830`	`1830`	`{`
`1831`	`1831`	`if (a != null && b != null && a.GetType().Name == b.GetType().Name)`
`1832`	`1832`	`{`
`1833`		`- Geometry aClone = (Geometry)a.Clone();`
`1834`		`- Geometry bClone = (Geometry)b.Clone();`
	`1833`	`+ Geometry aClone = (Geometry) a.Copy();`
	`1834`	`+ Geometry bClone = (Geometry) b.Copy();`
`1835`	`1835`
`1836`	`1836`	`aClone.Normalize();`
`1837`	`1837`	`bClone.Normalize();`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ from t in session.Query<RoadSegment>()`
`31`	`31`	`IGeometry geometry = query.Single();`
`32`	`32`	`IGeometry expected = Wkt.Read("POINT( 0 18 )");`
`33`	`33`
`34`		`- Assert.IsTrue(expected.Equals(geometry));`
	`34`	`+ Assert.IsTrue(expected.EqualsTopologically(geometry));`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/// <summary>`
`@@ -48,7 +48,7 @@ from t in session.Query<Lake>()`
`48`	`48`	`IGeometry geometry = query.Single();`
`49`	`49`	`IGeometry expected = Wkt.Read("LINESTRING(59 18, 67 18, 67 13, 59 13, 59 18)");`
`50`	`50`
`51`		`- Assert.IsTrue(expected.Equals(geometry));`
	`51`	`+ Assert.IsTrue(expected.EqualsTopologically(geometry));`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/// <summary>`
`@@ -65,7 +65,7 @@ from t in session.Query<DividedRoute>()`
`65`	`65`	`IGeometry geometry = query.Single();`
`66`	`66`	`IGeometry expected = Wkt.Read("LINESTRING( 16 0, 16 23, 16 48 )");`
`67`	`67`
`68`		`- Assert.IsTrue(expected.Equals(geometry));`
	`68`	`+ Assert.IsTrue(expected.EqualsTopologically(geometry));`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/// <summary>`