Skip to content

Commit

Permalink
Wkb support for Z coordinates / SqlTypes version fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@xfischer
xfischer committed Jun 4, 2020
1 parent adf2d0b commit 66d6bd3
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ DbGeography dbGeographyPoint = point.ToDbGeography();


## GeoJSON.Net.Contrib.Wkb
Allows conversion from / to Wkb binary types. Only 2D geometries are supported, attempting to convert a 3D geometry will throw an `Exception`.
Allows conversion from / to Wkb binary types. Only X,Y,Z coordinates are supported, attempting to convert a geometry with M coordinates will throw an `Exception`.

[NuGet package](https://www.nuget.org/packages/GeoJSON.Net.Contrib.Wkb):
`Install-Package GeoJSON.Net.Contrib.Wkb`
Expand Down
2 changes: 1 addition & 1 deletion src/GeoJSON.Net.Contrib.MsSqlSpatial/GeoJSON.Net.Contrib.MsSqlSpatial.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<PackageReference Include="GeoJSON.Net" version="1.2.15" />
<PackageReference Include="Microsoft.SqlServer.Types" version="14.0.314.7" />
<PackageReference Include="Microsoft.SqlServer.Types" version="14.0.314.76" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/GeoJSON.Net.Contrib.Wkb/GeoJSON.Net.Contrib.Wkb.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net45</TargetFrameworks>
<Description>Provides GeoJSON.Net Converters from / to Wkb binary format.</Description>
<Authors>Alvaro Montero Gonzalez</Authors>
<Authors>Alvaro Montero Gonzalez, Stijn Herreman, Trevor Thoele</Authors>
<Company>GeoJSON.Net</Company>
<Copyright>Copyright © Alvaro Montero Gonzalez, Joerg Battermann, Matt Hunt, Xavier Fischer and Contributors, 2014 - 2019</Copyright>
<Copyright>Copyright © Alvaro Montero Gonzalez, Joerg Battermann, Matt Hunt, Xavier Fischer and Contributors, 2014 - 2020</Copyright>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>0.1.7</Version>
<PackageProjectUrl>https://github.com/GeoJSON-Net/GeoJSON.Net.Contrib</PackageProjectUrl>
<RepositoryUrl>https://github.com/GeoJSON-Net/GeoJSON.Net.Contrib.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>geojson;geo;json;geolocation;spatial;gis;wkb</PackageTags>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageReleaseNotes>Updated to GeoJson 1.2.15</PackageReleaseNotes>
<PackageReleaseNotes>Added support for Z coordinates (Thanks to Stijn Herreman and Trevor Thoele)</PackageReleaseNotes>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions .../GeoJSON.Net.Contrib.EntityFramework.Test/GeoJSON.Net.Contrib.EntityFramework.Test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@
<HintPath>..\..\src\packages\GeoJSON.Net.1.2.15\lib\net45\GeoJSON.Net.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\src\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
<HintPath>..\..\src\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
Expand Down
2 changes: 1 addition & 1 deletion test/GeoJSON.Net.Contrib.EntityFramework.Test/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<packages>
<package id="EntityFramework" version="6.1.3" targetFramework="net452" />
<package id="GeoJSON.Net" version="1.2.15" targetFramework="net452" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
<package id="xunit" version="2.2.0" targetFramework="net452" />
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
<package id="xunit.assert" version="2.2.0" targetFramework="net452" />
Expand Down
3 changes: 1 addition & 2 deletions test/GeoJSON.Net.Contrib.MsSqlSpatial.Test/GeoJSON.Net.Contrib.MsSqlSpatial.Test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\src\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
<HintPath>..\..\src\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
Expand Down
2 changes: 1 addition & 1 deletion test/GeoJSON.Net.Contrib.MsSqlSpatial.Test/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="GeoJSON.Net" version="1.2.15" targetFramework="net45" />
<package id="Microsoft.SqlServer.Types" version="14.0.314.76" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
</packages>
3 changes: 1 addition & 2 deletions test/GeoJSON.Net.Contrib.Wkb.Test/GeoJSON.Net.Contrib.Wkb.Test.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@
<HintPath>..\..\src\packages\GeoJSON.Net.1.2.15\lib\net45\GeoJSON.Net.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\src\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
<HintPath>..\..\src\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion test/GeoJSON.Net.Contrib.Wkb.Test/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GeoJSON.Net" version="1.2.15" targetFramework="net452" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
<package id="xunit" version="2.2.0" targetFramework="net452" />
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
<package id="xunit.assert" version="2.2.0" targetFramework="net452" />
Expand Down

1 comment on commit 66d6bd3

@xfischer
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Closes #29
NuGet https://www.nuget.org/packages/GeoJSON.Net.Contrib.Wkb/0.1.7 released

Please sign in to comment.