Make CoordinateConverter constructors public

fixes #30
NetTopologySuite · May 6, 2019 · 0ed24ec · 0ed24ec
1 parent 7d72f7c
commit 0ed24ec
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/NetTopologySuite.IO.GeoJSON.Test/Issues/NetTopologySuite.IO.GeoJSON/GitHubIssues.cs b/NetTopologySuite.IO.GeoJSON.Test/Issues/NetTopologySuite.IO.GeoJSON/GitHubIssues.cs
@@ -5,6 +5,8 @@
 using GeoAPI.Geometries;
 using NetTopologySuite.Features;
 using NetTopologySuite.Geometries;
+using NetTopologySuite.IO.Converters;
+using NetTopologySuite.Triangulate;
 using Newtonsoft.Json;
 using NUnit.Framework;
 
@@ -375,5 +377,25 @@ public void TestInputDimension()
             geom = serializer2.Deserialize<IGeometry>(reader);
             Assert.That(geom.AsText(), Is.EqualTo("POLYGON ((0 0, 10.1 0, 10 10.1, 0.1 10, 0 0))"));
         }
+
+        [Test, GeoJsonIssueNumber(30)]
+        public void TestAddToSerializerSettings()
+        {
+            var jss = new JsonSerializerSettings();
+            var factory = new GeometryFactory(new PrecisionModel(1E6),4326);
+            const int dimension = 2;
+            Assert.That(() =>
+            {
+                // see https://github.com/NetTopologySuite/NetTopologySuite.IO.GeoJSON/blob/v1.15.2/NetTopologySuite.IO.GeoJSON/GeoJsonSerializer.cs#L64
+                jss.Converters.Add(new ICRSObjectConverter());
+                jss.Converters.Add(new FeatureCollectionConverter());
+                jss.Converters.Add(new FeatureConverter());
+                jss.Converters.Add(new AttributesTableConverter());
+                jss.Converters.Add(new GeometryConverter(factory, dimension));
+                jss.Converters.Add(new GeometryArrayConverter(factory, dimension));
+                jss.Converters.Add(new CoordinateConverter(factory.PrecisionModel, dimension));
+                jss.Converters.Add(new EnvelopeConverter());
+            }, Throws.Nothing);
+        }
     }
 }
diff --git a/NetTopologySuite.IO.GeoJSON/Converters/CoordinateConverters.cs b/NetTopologySuite.IO.GeoJSON/Converters/CoordinateConverters.cs
@@ -19,7 +19,7 @@ public class CoordinateConverter : JsonConverter
         /// <summary>
         /// Creates an instance of this class using a floating precision model and <see cref="GeoJsonSerializer.DefaultDimension"/> output dimensions
         /// </summary>
-        internal CoordinateConverter()
+        public CoordinateConverter()
             : this(GeometryFactory.Floating.PrecisionModel)
         { }
 
@@ -28,7 +28,7 @@ internal CoordinateConverter()
         /// </summary>
         /// <param name="precisionModel">The precision model to use for writing</param>
         /// <param name="dimension">The number of dimensions</param>
-        internal CoordinateConverter(IPrecisionModel precisionModel, int dimension = GeoJsonSerializer.DefaultDimension)
+        public CoordinateConverter(IPrecisionModel precisionModel, int dimension = GeoJsonSerializer.DefaultDimension)
         {
             _precisionModel = precisionModel;
             _dimension = dimension;

diff --git a/SharedAssemblyVersion.cs b/SharedAssemblyVersion.cs
@@ -4,4 +4,4 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("1.15.0")]
-[assembly: AssemblyFileVersion("1.15.3")]
+[assembly: AssemblyFileVersion("1.15.4")]