Skip to content

Handle OSM JSON version as string #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
charliesheh wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Handle OSM JSON version as string #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/OsmSharp/IO/Json/Converters/OsmJsonConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ public override Osm Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSeri
switch (propertyName)
{
case "version":
osm.Version = reader.GetDouble();
osm.Version = reader.TokenType switch
{
JsonTokenType.Number => reader.GetDouble(),
JsonTokenType.String => double.Parse(reader.GetString()),
_ => throw new JsonException()
};
break;
case "generator":
osm.Generator = reader.GetString();
Expand Down
12 changes: 12 additions & 0 deletions test/OsmSharp.Test/IO/Json/API/OsmTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,17 @@ public void Osm_FromJson_Complete_ShouldReadCompleteJson()
Assert.AreEqual(1, osm.Ways.Length);
Assert.AreEqual(1, osm.Relations.Length);
}

[Test]
public void Osm_FromJson_VersionAsString_ShouldReadVersion()
{
var osm = JsonSerializer.Deserialize<Osm>(
"{\"version\":\"0.6\",\"generator\":\"OsmSharp\",\"elements\":[]}"
);

Assert.NotNull(osm);
Assert.AreEqual(0.6, osm.Version);
Assert.AreEqual("OsmSharp", osm.Generator);
}
}
}