Remove the now-redundant GeometryServiceProvider.

Related: NetTopologySuite/GeoAPI#53
NetTopologySuite · Apr 6, 2019 · 711edaf · 711edaf
1 parent 0a28530
commit 711edaf
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 96 deletions.
diff --git a/NetTopologySuite.Samples.Console/Tests/GeometryServicesTest.cs b/NetTopologySuite.Samples.Console/Tests/GeometryServicesTest.cs
@@ -8,7 +8,7 @@ public class GeometryServicesTest
         [Test]
         public void TestCreateWithSameParametersReturnsSameInstance()
         {
-            var s = GeometryServiceProvider.Instance;
+            var s = NtsGeometryServices.Instance;
 
             var gf1 = s.CreateGeometryFactory();
             var gf2 = s.CreateGeometryFactory();
@@ -44,7 +44,7 @@ public void TestCreateWithSameParametersReturnsSameInstance()
         [Test]
         public void TestCreateWithDifferentParametersReturnsDifferentInstance()
         {
-            var s = GeometryServiceProvider.Instance;
+            var s = NtsGeometryServices.Instance;
 
             var gf1 = s.CreateGeometryFactory(31466);
             var gf2 = s.CreateGeometryFactory(31467);
@@ -61,4 +61,4 @@ public void TestCreateWithDifferentParametersReturnsDifferentInstance()
             Assert.IsFalse(ReferenceEquals(gf1, gf2));
         }
     }
-}
+}
diff --git a/NetTopologySuite.Tests.NUnit/GeometryServiceProviderTest.cs b/NetTopologySuite.Tests.NUnit/GeometryServiceProviderTest.cs
@@ -8,20 +8,6 @@ namespace NetTopologySuite.Tests.NUnit
     [TestFixture]
     public class GeometryServiceProviderTest
     {
-        [Test]
-        public void TestUninitialized()
-        {
-            var nts = new NtsGeometryServices();
-            var ntsFromAbstract = GeometryServiceProvider.Instance;
-
-            Assert.IsNotNull(ntsFromAbstract);
-            Assert.IsNotNull(ntsFromAbstract.DefaultCoordinateSequenceFactory);
-            Assert.IsNotNull(ntsFromAbstract.DefaultPrecisionModel);
-
-            Assert.IsTrue(nts.DefaultCoordinateSequenceFactory == ntsFromAbstract.DefaultCoordinateSequenceFactory);
-            Assert.IsTrue(nts.DefaultPrecisionModel.Equals(ntsFromAbstract.DefaultPrecisionModel));
-        }
-
         [Test]
         public void TestInitialized()
         {
@@ -30,8 +16,6 @@ public void TestInitialized()
                     NetTopologySuite.Geometries.Implementation.DotSpatialAffineCoordinateSequenceFactory.Instance,
                     new PrecisionModel(10d), 4326);
 
-            Assert.Throws<ArgumentNullException>(() => GeometryServiceProvider.Instance = null);
-
             var factory = nts.CreateGeometryFactory();
 
             Assert.IsNotNull(factory);
@@ -65,7 +49,7 @@ public void TestThreading()
 
                 WaitHandle.WaitAll(waitHandles);
                 Console.WriteLine("\nDone!");
-                Assert.LessOrEqual(srids.Length * precisionModels.Length, ((NtsGeometryServices)GeometryServiceProvider.Instance).NumFactories,
+                Assert.LessOrEqual(srids.Length * precisionModels.Length, ((NtsGeometryServices)NtsGeometryServices.Instance).NumFactories,
                     "Too many factories created!");
                 Assert.IsTrue(true);
             }
@@ -91,7 +75,7 @@ private static void TestFacories(object info)
                 int srid = srids[rnd.Next(0, srids.Length)];
                 var precisionModel = precisionModels[rnd.Next(0, precisionModels.Length)];
 
-                var factory = GeometryServiceProvider.Instance.CreateGeometryFactory(precisionModel, srid);
+                var factory = NtsGeometryServices.Instance.CreateGeometryFactory(precisionModel, srid);
                 if (verbose)
                 {
                     Console.WriteLine("Thread_{0}: SRID: {1}; PM({2}, {3})", Thread.CurrentThread.ManagedThreadId,

diff --git a/NetTopologySuite.Tests.NUnit/IO/WKTReadWriteTest.cs b/NetTopologySuite.Tests.NUnit/IO/WKTReadWriteTest.cs
@@ -160,7 +160,7 @@ public void TestThreading()
 
         public void DoTestThreading()
         {
-            var services = GeometryServiceProvider.Instance;
+            var services = NtsGeometryServices.Instance;
             services.CreateGeometryFactory();
             int before = ((NtsGeometryServices) services).NumFactories;
 

diff --git a/NetTopologySuite/Geometries/Geometry.cs b/NetTopologySuite/Geometries/Geometry.cs
@@ -201,7 +201,7 @@ public int SRID
                 _srid = value;
 
                 // Adjust the geometry factory
-                _factory = GeometryServiceProvider.Instance.CreateGeometryFactory(
+                _factory = NtsGeometryServices.Instance.CreateGeometryFactory(
                     _factory.PrecisionModel, value, _factory.CoordinateSequenceFactory);
 
                 var collection = this as IGeometryCollection;

diff --git a/NetTopologySuite/GeometryServiceProvider.cs b/NetTopologySuite/GeometryServiceProvider.cs
diff --git a/NetTopologySuite/IO/WKBReader.cs b/NetTopologySuite/IO/WKBReader.cs
@@ -93,7 +93,7 @@ private static int HexToInt(char hex)
         /// <summary>
         /// Initialize reader with a standard <see cref="IGeometryFactory"/>.
         /// </summary>
-        public WKBReader() : this(GeometryServiceProvider.Instance) { }
+        public WKBReader() : this(NtsGeometryServices.Instance) { }
 
         /// <summary>
         /// Initialize reader with the given <c>GeometryFactory</c>.
@@ -102,7 +102,7 @@ public WKBReader() : this(GeometryServiceProvider.Instance) { }
         [Obsolete]
         public WKBReader(IGeometryFactory factory)
         {
-            _geometryServices = GeometryServiceProvider.Instance;
+            _geometryServices = NtsGeometryServices.Instance;
 
             _factory = factory;
             _sequenceFactory = factory.CoordinateSequenceFactory;
@@ -114,7 +114,7 @@ public WKBReader(IGeometryFactory factory)
 
         public WKBReader(IGeometryServices services)
         {
-            services = services ?? GeometryServiceProvider.Instance;
+            services = services ?? NtsGeometryServices.Instance;
             _geometryServices = services;
             _precisionModel = services.DefaultPrecisionModel;
             _sequenceFactory = services.DefaultCoordinateSequenceFactory;

diff --git a/NetTopologySuite/IO/WKTReader.cs b/NetTopologySuite/IO/WKTReader.cs
@@ -52,7 +52,7 @@ public class WKTReader : ITextGeometryReader
         /// <summary>
         /// Creates a <c>WKTReader</c> that creates objects using a basic GeometryFactory.
         /// </summary>
-        public WKTReader() : this(GeometryServiceProvider.Instance.CreateGeometryFactory()) { }
+        public WKTReader() : this(NtsGeometryServices.Instance.CreateGeometryFactory()) { }
 
         /// <summary>
         /// Creates a <c>WKTReader</c> that creates objects using the given
@@ -92,7 +92,7 @@ public bool IsOldNtsMultiPointSyntaxAllowed
         /// </summary>
         public IGeometryFactory Factory
         {
-            get => GeometryServiceProvider.Instance.CreateGeometryFactory(_precisionModel, DefaultSRID, _coordinateSequencefactory);
+            get => NtsGeometryServices.Instance.CreateGeometryFactory(_precisionModel, DefaultSRID, _coordinateSequencefactory);
             set
             {
                 if (value != null)
@@ -751,7 +751,7 @@ internal IGeometry ReadGeometryTaggedText(TokenStream tokens)
             // differently than JTS's, so this is actually how we have to do it to match the output
             // from JTS (which could hypothetically return a collection whose inner elements have
             // different SRIDs than the collection itself if that's how it's specified).
-            var factory = GeometryServiceProvider.Instance.CreateGeometryFactory(_precisionModel, srid,
+            var factory = NtsGeometryServices.Instance.CreateGeometryFactory(_precisionModel, srid,
                 csFactory);
 
             if (type.StartsWith("POINT", StringComparison.OrdinalIgnoreCase))

diff --git a/NetTopologySuite/NetTopologySuiteBootstrapper.cs b/NetTopologySuite/NetTopologySuiteBootstrapper.cs