Merge branch 'master' into develop

Author: airbreather

doc/release-notes.md

@@ -3,6 +3,9 @@
 ## [0.4.0](https://github.com/NetTopologySuite/NetTopologySuite.IO.GPX/milestone/7)
 *Nothing yet...*
 
+## [0.3.2](https://github.com/NetTopologySuite/NetTopologySuite.IO.GPX/milestone/9)
+- The opt-in `GpxReaderSettings.AllowMissingVersionAttribute` property added in 0.3.1 has been replaced by `IgnoreVersionAttribute`, which enables the same situations as `AllowMissingVersionAttribute` did, plus situations where `version` was specified as something other than `version='1.1'` ([#28](https://github.com/NetTopologySuite/NetTopologySuite.IO.GPX/issues/28)).
+
 ## [0.3.1](https://github.com/NetTopologySuite/NetTopologySuite.IO.GPX/milestone/8)
 - `GpxReaderSettings` now has an opt-in `AllowMissingVersionAttribute` property, to allow reading files without a `version` attribute ([#27](https://github.com/NetTopologySuite/NetTopologySuite.IO.GPX/issues/27)).
 

src/NetTopologySuite.IO.GPX/GpxReader.cs

@@ -100,14 +100,14 @@ public static void Read(XmlReader reader, GpxReaderSettings settings, GpxVisitor
             settings = settings ?? new GpxReaderSettings();
             while (reader.ReadToFollowing("gpx", Helpers.GpxNamespace))
             {
-                bool versionAccepted = settings.AllowMissingVersionAttribute;
+                string version = null;
                 string creator = settings.DefaultCreatorIfMissing;
                 for (bool hasAttribute = reader.MoveToFirstAttribute(); hasAttribute; hasAttribute = reader.MoveToNextAttribute())
                 {
                     switch (reader.Name)
                     {
                         case "version":
-                            versionAccepted = reader.Value == "1.1";
+                            version = reader.Value;
                             break;
 
                         case "creator":
@@ -116,7 +116,7 @@ public static void Read(XmlReader reader, GpxReaderSettings settings, GpxVisitor
                     }
                 }
 
-                if (!versionAccepted)
+                if (version != "1.1" && !settings.IgnoreVersionAttribute)
                 {
                     throw new XmlException("'version' must be '1.1'");
                 }

src/NetTopologySuite.IO.GPX/GpxReaderSettings.cs

@@ -34,10 +34,10 @@ public sealed class GpxReaderSettings
         public string DefaultCreatorIfMissing { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether or not to ignore a missing <c>version="1.1"</c>
-        /// declaration, even though such files would not pass XSD validation (see
-        /// NetTopologySuite/NetTopologySuite.IO.GPX#27).
+        /// Gets or sets a value indicating whether or not to ignore files that do not contain
+        /// <c>version="1.1"</c> exactly, even though such files would not pass XSD validation (see
+        /// NetTopologySuite/NetTopologySuite.IO.GPX#27 and #28).
         /// </summary>
-        public bool AllowMissingVersionAttribute { get; set; }
+        public bool IgnoreVersionAttribute { get; set; }
     }
 }

tests/NetTopologySuite.IO.GPX.Tests/GpxFileTests.cs

@@ -182,11 +182,10 @@ public void RoundTripForValuesVeryNearZeroShouldSucceed()
         [InlineData("<trk><trkseg><trkpt lat='1' lon='1'><ele>Infinity</ele></trkpt></trkseg></trk>")]
         public void ParseWithInfiniteWaypointElevationShouldFail(string inner)
         {
-            Assert.ThrowsAny<XmlException>(() => GpxFile.Parse("<gpx xmlns='http://www.topografix.com/GPX/1/1' version='1.1' creator='airbreather'>" + inner + "</gpx>", null));
+            Assert.ThrowsAny<XmlException>(() => GpxFile.Parse($"<gpx xmlns='http://www.topografix.com/GPX/1/1' version='1.1' creator='airbreather'>{inner}</gpx>", null));
         }
 
         [Theory]
-        [GitHubIssue(23, 27)]
         [InlineData("<gpx xmlns='http://www.topografix.com/GPX/1/1' />")]
         [InlineData("<gpx xmlns='http://www.topografix.com/GPX/1/1' version='1.1' />")]
         [InlineData("<gpx xmlns='http://www.topografix.com/GPX/1/1' creator='someone' />")]
@@ -219,7 +218,21 @@ public void MissingVersionShouldBeValid_OptIn()
 ";
             Assert.ThrowsAny<XmlException>(() => GpxFile.Parse(GpxText, null));
 
-            var settings = new GpxReaderSettings { AllowMissingVersionAttribute = true };
+            var settings = new GpxReaderSettings { IgnoreVersionAttribute = true };
+            var file = GpxFile.Parse(GpxText, settings);
+            Assert.Equal("someone", file.Metadata.Creator);
+        }
+
+        [Fact]
+        [GitHubIssue(28)]
+        public void DifferentVersionShouldBeValid_OptIn()
+        {
+            const string GpxText = @"
+<gpx xmlns='http://www.topografix.com/GPX/1/1' version='1.2' creator='someone' />
+";
+            Assert.ThrowsAny<XmlException>(() => GpxFile.Parse(GpxText, null));
+
+            var settings = new GpxReaderSettings { IgnoreVersionAttribute = true };
             var file = GpxFile.Parse(GpxText, settings);
             Assert.Equal("someone", file.Metadata.Creator);
         }