Bumping develop dependencies and tests up-to-date

samples/Sample.GeoFilter/Sample.GeoFilter.csproj

@@ -9,7 +9,7 @@
     <ProjectReference Include="..\..\src\OsmSharp.Geo\OsmSharp.Geo.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="3.0.0" />
+    <PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="4.0.0" />
   </ItemGroup>
   <ItemGroup>
     <None Remove="polygon.geojson" />

samples/Sample.GeometryStream.Shape/Program.cs

@@ -23,6 +23,7 @@
 using NetTopologySuite.Features;
 using NetTopologySuite.Geometries;
 using NetTopologySuite.IO;
+using NetTopologySuite.IO.Esri;
 using OsmSharp;
 using OsmSharp.Geo;
 using OsmSharp.Streams;
@@ -79,12 +80,7 @@ where feature.Geometry is LineString
             }
 
             // convert to shape.
-            var header = ShapefileDataWriter.GetHeader(featureCollection.First(), featureCollection.Count);
-            var shapeWriter = new ShapefileDataWriter("luxembourg.shp", new GeometryFactory())
-            {
-                Header = header
-            };
-            shapeWriter.Write(featureCollection);
+            Shapefile.WriteAllFeatures(featureCollection.Take(1), "luxembourg.shp");
         }
     }
 }

samples/Sample.GeometryStream.Shape/Sample.GeometryStream.Shape.csproj

@@ -9,6 +9,6 @@
     <ProjectReference Include="..\..\src\OsmSharp.Geo\OsmSharp.Geo.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NetTopologySuite.IO.ShapeFile" Version="2.1.0" />
+    <PackageReference Include="NetTopologySuite.IO.Esri.Shapefile" Version="1.2.0" />
   </ItemGroup>
 </Project>

samples/Sample.GeometryStream/Sample.GeometryStream.csproj

@@ -9,6 +9,6 @@
         <ProjectReference Include="..\..\src\OsmSharp.Geo\OsmSharp.Geo.csproj" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="3.0.0" />
+        <PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="4.0.0" />
     </ItemGroup>
 </Project>

src/OsmSharp.Geo/OsmSharp.Geo.csproj

@@ -1,19 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../../OsmSharp.Common.props" />
-
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <AssemblyName>OsmSharp.Geo</AssemblyName>
-    <PackageId>OsmSharp.Geo</PackageId>
-    <Title>OsmSharp.Geo</Title>
-    <Description> OsmSharp.Geo enables using OSM-data in NTS.</Description>
-    <PackageTags>openstreetmap, osm, NTS</PackageTags>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OsmSharp\OsmSharp.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="NetTopologySuite" Version="2.5.0" />
-    <PackageReference Include="NetTopologySuite.Features" Version="2.1.0" />
-  </ItemGroup>
+	<Import Project="../../OsmSharp.Common.props" />
+
+	<PropertyGroup>
+		<TargetFramework>netstandard2.0</TargetFramework>
+		<LangVersion>latest</LangVersion>
+		<AssemblyName>OsmSharp.Geo</AssemblyName>
+		<PackageId>OsmSharp.Geo</PackageId>
+		<Title>OsmSharp.Geo</Title>
+		<Description> OsmSharp.Geo enables using OSM-data in NTS.</Description>
+		<PackageTags>openstreetmap, osm, NTS</PackageTags>
+	</PropertyGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\OsmSharp\OsmSharp.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="NetTopologySuite" Version="2.6.0" />
+		<PackageReference Include="NetTopologySuite.Features" Version="2.2.0" />
+	</ItemGroup>
 </Project>

src/OsmSharp/API/Osm.cs

@@ -32,6 +32,8 @@ namespace OsmSharp.API
     [JsonConverter(typeof(OsmJsonConverter))]
     public partial class Osm
     {
+        public const int MAX_DECIMAL_PRECISION = 7;
+
         /// <summary>
         /// Gets or sets the generator.
         /// </summary>
@@ -40,7 +42,7 @@ public partial class Osm
         /// <summary>
         /// Gets or sets the version #.
         /// </summary>
-        public double? Version { get; set; }
+        public System.Version Version { get; set; }
 
         /// <summary>
         /// Gets or sets the capabilities.

src/OsmSharp/Changesets/DiffResult.cs

@@ -37,7 +37,7 @@ public partial class DiffResult
         /// <summary>
         /// Gets or sets the version #.
         /// </summary>
-        public double? Version { get; set; }
+        public System.Version Version { get; set; }
 
         /// <summary>
         /// Gets or sets the results array.

src/OsmSharp/Changesets/OsmChange.cs

@@ -50,7 +50,7 @@ public partial class OsmChange
         /// <summary>
         /// Gets or sets the version.
         /// </summary>
-        public double? Version { get; set; }
+        public System.Version Version { get; set; }
 
         /// <summary>
         /// Gets or sets the create change array.

src/OsmSharp/Changesets/OsmChangeExtensions.cs

@@ -125,7 +125,7 @@ public static OsmChange Squash(this IEnumerable<OsmChange> changes)
                 Modify = mutations.Values.Where(x => x.create == false && x.delete == false).Select(x => x.osmGeo)
                     .ToArray(),
                 Generator = "OsmSharp",
-                Version = 6
+                Version = System.Version.Parse("0.6")
             };
         }
 
@@ -240,7 +240,7 @@ public static OsmChange Diff(this IEnumerable<OsmGeo> source, IEnumerable<OsmGeo
             return new OsmChange()
             {
                 Generator = "OsmSharp",
-                Version = 6,
+                Version = System.Version.Parse("0.6"),
                 Create = create.ToArray(),
                 Delete = delete.ToArray(),
                 Modify = modify.ToArray()

src/OsmSharp/Db/HistoryDb.cs

@@ -352,7 +352,7 @@ public DiffResultResult ApplyChangeset(long id, OsmChange changeset)
             {
                 Results = results.ToArray(),
                 Generator = "OsmSharp",
-                Version = 0.6f
+                Version = System.Version.Parse("0.6")
             }, DiffResultStatus.BestEffortOK);
         }
 

src/OsmSharp/IO/Json/Converters/OsmGeoJsonConverter.cs

@@ -4,6 +4,7 @@
 using System.Runtime.InteropServices;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using OsmSharp.API;
 using OsmSharp.Tags;
 
 namespace OsmSharp.IO.Json.Converters
@@ -170,8 +171,15 @@ public override void Write(Utf8JsonWriter writer, OsmGeo value, JsonSerializerOp
             {
                 case Node n:
                     writer.WriteString("type", "node");
-                    if (n.Latitude.HasValue) writer.WriteNumber("lat", n.Latitude.Value);
-                    if (n.Longitude.HasValue) writer.WriteNumber("lon", n.Longitude.Value);
+                    if (n.Latitude.HasValue) {
+                        writer.WritePropertyName("lat");
+                        writer.WriteRawValue(Math.Round(n.Latitude.Value, Osm.MAX_DECIMAL_PRECISION).ToInvariantString());
+                    }
+                    if (n.Longitude.HasValue)
+                    {
+                        writer.WritePropertyName("lon");
+                        writer.WriteRawValue(Math.Round(n.Longitude.Value, Osm.MAX_DECIMAL_PRECISION).ToInvariantString());
+                    }
                     break;
                 case Way w:
                     writer.WriteString("type", "way");

src/OsmSharp/IO/Json/Converters/OsmJsonConverter.cs

@@ -9,7 +9,7 @@ namespace OsmSharp.IO.Json.Converters
     public class OsmJsonConverter : JsonConverter<Osm>
     {
         private readonly OsmGeoJsonConverter _osmGeoJsonConverter = new OsmGeoJsonConverter();
-        
+
         public override Osm Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             if (reader.TokenType != JsonTokenType.StartObject)
@@ -21,7 +21,7 @@ public override Osm Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSeri
             List<Node> nodes = null;
             List<Way> ways = null;
             List<Relation> relations = null;
-            
+
             while (reader.Read())
             {
                 if (reader.TokenType == JsonTokenType.EndObject)
@@ -41,11 +41,11 @@ public override Osm Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSeri
                     switch (propertyName)
                     {
                         case "version":
-                            osm.Version = reader.GetDouble();
+                            osm.Version = System.Version.Parse(Math.Round(reader.GetDouble(), 1).ToInvariantString());
                             break;
                         case "generator":
                             osm.Generator = reader.GetString();
-                            break; 
+                            break;
                         case "elements":
                             reader.Read();
                             while (reader.TokenType != JsonTokenType.EndArray)
@@ -82,43 +82,46 @@ public override Osm Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSeri
         public override void Write(Utf8JsonWriter writer, Osm value, JsonSerializerOptions options)
         {
             writer.WriteStartObject();
-
-            if (value.Version.HasValue) writer.WriteNumber("version", value.Version.Value);
+
+            if (value.Version != null) {
+                writer.WritePropertyName("version");
+                writer.WriteRawValue(value.Version.ToString());
+            };
             if (value.Generator != null) writer.WriteString("generator", value.Generator);
 
             if (value.Nodes != null || value.Ways != null || value.Relations != null)
             {
                 writer.WritePropertyName("elements");
-                
+
                 writer.WriteStartArray();
-                
+
                 if (value.Nodes != null)
                 {
                     foreach (var n in value.Nodes)
                     {
                         _osmGeoJsonConverter.Write(writer, n, options);
                     }
                 }
-                
+
                 if (value.Ways != null)
                 {
                     foreach (var w in value.Ways)
                     {
                         _osmGeoJsonConverter.Write(writer, w, options);
                     }
                 }
-                
+
                 if (value.Relations != null)
                 {
                     foreach (var r in value.Relations)
                     {
                         _osmGeoJsonConverter.Write(writer, r, options);
                     }
                 }
-                
+
                 writer.WriteEndArray();
             }
-            
+
             writer.WriteEndObject();
         }
     }

src/OsmSharp/IO/Xml/API/Osm.Xml.cs

@@ -43,7 +43,9 @@ XmlSchema IXmlSerializable.GetSchema()
 
         void IXmlSerializable.ReadXml(XmlReader reader)
         {
-            this.Version = reader.GetAttributeDouble("version");
+            var version = reader.GetAttribute("version");
+            if (!string.IsNullOrWhiteSpace(version))
+                this.Version = System.Version.Parse(version);
             this.Generator = reader.GetAttribute("generator");
 
             List<Node> nodes = null;
@@ -205,7 +207,7 @@ void IXmlSerializable.ReadXml(XmlReader reader)
 
         void IXmlSerializable.WriteXml(XmlWriter writer)
         {
-            writer.WriteAttribute("version", this.Version);
+            writer.WriteAttribute("version", this.Version?.ToInvariantString());
             writer.WriteAttribute("generator", this.Generator);
 
             writer.WriteElement("user", this.User);

src/OsmSharp/IO/Xml/Changesets/Changeset.Xml.cs

@@ -25,6 +25,7 @@
 using System.Xml;
 using System.Xml.Schema;
 using System.Xml.Serialization;
+using OsmSharp.API;
 using OsmSharp.IO.Xml;
 using OsmSharp.Tags;
 
@@ -100,10 +101,22 @@ void IXmlSerializable.WriteXml(XmlWriter writer)
             writer.WriteAttribute("created_at", this.CreatedAt);
             writer.WriteAttribute("closed_at", this.ClosedAt);
             writer.WriteAttribute("open", this.Open);
-            writer.WriteAttribute("min_lon", this.MinLongitude);
-            writer.WriteAttribute("min_lat", this.MinLatitude);
-            writer.WriteAttribute("max_lon", this.MaxLongitude);
-            writer.WriteAttribute("max_lat", this.MaxLatitude);
+            if (this.MinLongitude.HasValue)
+            {
+                writer.WriteAttribute("min_lon", Math.Round(this.MinLongitude.Value, Osm.MAX_DECIMAL_PRECISION).ToInvariantString());
+            }
+            if (this.MinLatitude.HasValue)
+            {
+                writer.WriteAttribute("min_lat", Math.Round(this.MinLatitude.Value, Osm.MAX_DECIMAL_PRECISION).ToInvariantString());
+            }
+            if (this.MaxLongitude.HasValue)
+            {
+                writer.WriteAttribute("max_lon", Math.Round(this.MaxLongitude.Value, Osm.MAX_DECIMAL_PRECISION).ToInvariantString());
+            }
+            if (this.MaxLatitude.HasValue)
+            {
+                writer.WriteAttribute("max_lat", Math.Round(this.MaxLatitude.Value, Osm.MAX_DECIMAL_PRECISION).ToInvariantString());
+            }
             writer.WriteAttribute("comments_count", this.CommentsCount);
             writer.WriteAttribute("changes_count", this.ChangesCount);
 

src/OsmSharp/IO/Xml/Changesets/DiffResult.Xml.cs

@@ -45,7 +45,9 @@ void IXmlSerializable.ReadXml(XmlReader reader)
         {
             reader.MoveToContent();
 
-            this.Version = reader.GetAttributeDouble("version");
+            var version = reader.GetAttribute("version");
+            if (!string.IsNullOrWhiteSpace(version))
+                this.Version = System.Version.Parse(version);
             this.Generator = reader.GetAttribute("generator");
 
             List<OsmGeoResult> results = null;
@@ -107,9 +109,9 @@ void IXmlSerializable.WriteXml(XmlWriter writer)
             {
                 writer.WriteAttributeString("generator", this.Generator);
             }
-            if (this.Version.HasValue)
+            if (this.Version != null)
             {
-                writer.WriteAttributeString("version", this.Version.Value.ToInvariantString());
+                writer.WriteAttributeString("version", this.Version.ToInvariantString());
             }
 
             if (this.Results != null)
@@ -200,7 +202,7 @@ void IXmlSerializable.WriteXml(XmlWriter writer)
         /// </summary>
         public static OsmGeoResult CreateModification(OsmGeo modify, long newVersion)
         {
-            switch(modify.Type)
+            switch (modify.Type)
             {
                 case OsmGeoType.Node:
                     return new NodeResult()