Stop using Encoding when we already have a string

Everything that has an unnecessary Encoding is now marked Obsolete.
Fixes #33

Author: airbreather

ProjNet.Tests/CoordinateSystemServicesTest.cs

@@ -3,7 +3,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Xml.Linq;
 using NUnit.Framework;
@@ -17,7 +16,7 @@ public class CoordinateSystemServicesTest
         [Test]
         public void TestConstructor()
         {
-            var css = new CoordinateSystemServices(new CoordinateSystemFactory(Encoding.UTF8),
+            var css = new CoordinateSystemServices(new CoordinateSystemFactory(),
                 new CoordinateTransformationFactory());
 
             Assert.IsNotNull(css.GetCoordinateSystem(4326));
@@ -30,7 +29,7 @@ public void TestConstructorLoadXml(string xmlPath)
             if (!File.Exists(xmlPath))
                 throw new IgnoreException("Specified file not found");
 
-            var css = new CoordinateSystemServices(new CoordinateSystemFactory(Encoding.UTF8),
+            var css = new CoordinateSystemServices(new CoordinateSystemFactory(),
                 new CoordinateTransformationFactory(), LoadXml(xmlPath));
 
             Assert.IsNotNull(css.GetCoordinateSystem(4326));
@@ -46,7 +45,7 @@ public void TestConstructorLoadCsv(string csvPath)
                 if (!File.Exists(csvPath))
                     throw new IgnoreException("Specified file not found");
 
-            var css = new CoordinateSystemServices(new CoordinateSystemFactory(Encoding.UTF8),
+            var css = new CoordinateSystemServices(new CoordinateSystemFactory(),
                 new CoordinateTransformationFactory(), LoadCsv(csvPath));
 
             Assert.IsNotNull(css.GetCoordinateSystem(4326));

ProjNet.Tests/CoordinateTransformTests.cs

@@ -861,8 +861,8 @@ public void Test_EPSG_21780_PrimeMeredianTransformation()
             double[] sourceCoord = new double[] { 160443.329034, 23582.55586 };
             double[] expectedTargetCoord = new double[] { 9.5553588867188, 47.145080566406 };
 
-            ICoordinateSystem cs1 = ProjNet.Converters.WellKnownText.CoordinateSystemWktReader.Parse(wkt21780, System.Text.Encoding.Default) as ICoordinateSystem;
-            ICoordinateSystem cs2 = ProjNet.Converters.WellKnownText.CoordinateSystemWktReader.Parse(wkt4326, System.Text.Encoding.Default) as ICoordinateSystem;
+            ICoordinateSystem cs1 = ProjNet.Converters.WellKnownText.CoordinateSystemWktReader.Parse(wkt21780) as ICoordinateSystem;
+            ICoordinateSystem cs2 = ProjNet.Converters.WellKnownText.CoordinateSystemWktReader.Parse(wkt4326) as ICoordinateSystem;
             CoordinateTransformationFactory ctf = new CoordinateTransformationFactory();
             var ict = ctf.CreateFromCoordinateSystems(cs1, cs2);
 

ProjNet.Tests/WKT/WKTMathTransformParserTests.cs

@@ -34,7 +34,7 @@ public void ParseAffineTransformWkt ()
             try
             {
                 //TODO replace with MathTransformFactory implementation
-                mt = MathTransformWktReader.Parse (wkt, System.Text.Encoding.Unicode);
+                mt = MathTransformWktReader.Parse (wkt);
             }
             catch (Exception ex)
             {
@@ -69,7 +69,7 @@ public void TestMathTransformWktReaderExponencialNumberParsingIssue(string wkt)
             try
             {
                 //TODO replace with MathTransformFactory implementation
-                mt = MathTransformWktReader.Parse (wkt, System.Text.Encoding.Unicode);
+                mt = MathTransformWktReader.Parse (wkt);
             }
             catch (ArgumentException ex)
             {

ProjNet/CoordinateSystems/CoordinateSystemFactory.cs

@@ -40,15 +40,14 @@ namespace ProjNet.CoordinateSystems
     /// </remarks>
     public class CoordinateSystemFactory : ICoordinateSystemFactory
     {
+        [Obsolete("The encoding is no longer used and will be removed in a future release.")]
         public Encoding Encoding { get; private set; }
 
-        public CoordinateSystemFactory() : this(Encoding.UTF8) { }
+        public CoordinateSystemFactory() { }
 
+        [Obsolete("The encoding is no longer used and will be removed in a future release.")]
         public CoordinateSystemFactory(Encoding encoding)
         {
-            if (encoding == null) 
-                throw new ArgumentNullException("encoding");
-
             Encoding = encoding;
         }
 
@@ -71,7 +70,7 @@ public ICoordinateSystem CreateFromXml(string xml)
         /// <returns>The resulting spatial reference object</returns>
         public ICoordinateSystem CreateFromWkt(string WKT)
         {
-            IInfo info = CoordinateSystemWktReader.Parse(WKT, Encoding);
+            IInfo info = CoordinateSystemWktReader.Parse(WKT);
             return info as ICoordinateSystem;
         }
 

ProjNet/IO/CoordinateSystems/CoordinateSystemWktReader.cs

@@ -54,19 +54,24 @@ public static class CoordinateSystemWktReader
         /// Reads and parses a WKT-formatted projection string.
         /// </summary>
         /// <param name="wkt">String containing WKT.</param>
-        /// <param name="encoding">The encoding to use.</param>
+        /// <param name="encoding">The parameter is not used.</param>
         /// <returns>Object representation of the WKT.</returns>
         /// <exception cref="System.ArgumentException">If a token is not recognised.</exception>
-        public static IInfo Parse(string wkt, Encoding encoding)
+        [Obsolete("The encoding is no longer used and will be removed in a future release.")]
+        public static IInfo Parse(string wkt, Encoding encoding) => Parse(wkt);
+
+        /// <summary>
+        /// Reads and parses a WKT-formatted projection string.
+        /// </summary>
+        /// <param name="wkt">String containing WKT.</param>
+        /// <returns>Object representation of the WKT.</returns>
+        /// <exception cref="System.ArgumentException">If a token is not recognised.</exception>
+        public static IInfo Parse(string wkt)
         {
             if (String.IsNullOrEmpty(wkt))
                 throw new ArgumentNullException("wkt");
-            if (encoding == null)
-                throw new ArgumentNullException("encoding");
 
-            byte[] arr = encoding.GetBytes(wkt);
-            using (Stream stream = new MemoryStream(arr))
-            using (TextReader reader = new StreamReader(stream, encoding))
+            using (TextReader reader = new StringReader(wkt))
             {
                 WktStreamTokenizer tokenizer = new WktStreamTokenizer(reader);
                 tokenizer.NextToken();

ProjNet/IO/CoordinateSystems/MathTransformWktReader.cs

@@ -55,19 +55,24 @@ public static class MathTransformWktReader
         /// Reads and parses a WKT-formatted projection string.
         /// </summary>
         /// <param name="wkt">String containing WKT.</param>
-        /// <param name="encoding">The encoding to use.</param>
+        /// <param name="encoding">The parameter is not used.</param>
         /// <returns>Object representation of the WKT.</returns>
         /// <exception cref="System.ArgumentException">If a token is not recognised.</exception>
-        public static IMathTransform Parse (string wkt, Encoding encoding)
+        [Obsolete("The encoding is no longer used and will be removed in a future release.")]
+        public static IMathTransform Parse (string wkt, Encoding encoding) => Parse(wkt);
+
+        /// <summary>
+        /// Reads and parses a WKT-formatted projection string.
+        /// </summary>
+        /// <param name="wkt">String containing WKT.</param>
+        /// <returns>Object representation of the WKT.</returns>
+        /// <exception cref="System.ArgumentException">If a token is not recognised.</exception>
+        public static IMathTransform Parse (string wkt)
         {
             if (String.IsNullOrEmpty (wkt))
                 throw new ArgumentNullException ("wkt");
-            if (encoding == null)
-                throw new ArgumentNullException ("encoding");
 
-            byte[] arr = encoding.GetBytes (wkt);
-            using (Stream stream = new MemoryStream (arr))
-            using (TextReader reader = new StreamReader (stream, encoding))
+            using (TextReader reader = new StringReader (wkt))
             {
                 WktStreamTokenizer tokenizer = new WktStreamTokenizer (reader);
                 tokenizer.NextToken ();