Skip to content

Commit 66d6bd3

Browse files
xfischerxfischer
committed
Wkb support for Z coordinates / SqlTypes version fixed
1 parent adf2d0b commit 66d6bd3

File tree

9 files changed

+11
-14
lines changed

9 files changed

+11
-14
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ DbGeography dbGeographyPoint = point.ToDbGeography();
6767

6868

6969
## GeoJSON.Net.Contrib.Wkb
70-
Allows conversion from / to Wkb binary types. Only 2D geometries are supported, attempting to convert a 3D geometry will throw an `Exception`.
70+
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`.
7171

7272
[NuGet package](https://www.nuget.org/packages/GeoJSON.Net.Contrib.Wkb):
7373
`Install-Package GeoJSON.Net.Contrib.Wkb`

‎src/GeoJSON.Net.Contrib.MsSqlSpatial/GeoJSON.Net.Contrib.MsSqlSpatial.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="GeoJSON.Net" version="1.2.15" />
21-
<PackageReference Include="Microsoft.SqlServer.Types" version="14.0.314.7" />
21+
<PackageReference Include="Microsoft.SqlServer.Types" version="14.0.314.76" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎src/GeoJSON.Net.Contrib.Wkb/GeoJSON.Net.Contrib.Wkb.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;netstandard2.1;net45</TargetFrameworks>
55
<Description>Provides GeoJSON.Net Converters from / to Wkb binary format.</Description>
6-
<Authors>Alvaro Montero Gonzalez</Authors>
6+
<Authors>Alvaro Montero Gonzalez, Stijn Herreman, Trevor Thoele</Authors>
77
<Company>GeoJSON.Net</Company>
8-
<Copyright>Copyright © Alvaro Montero Gonzalez, Joerg Battermann, Matt Hunt, Xavier Fischer and Contributors, 2014 - 2019</Copyright>
8+
<Copyright>Copyright © Alvaro Montero Gonzalez, Joerg Battermann, Matt Hunt, Xavier Fischer and Contributors, 2014 - 2020</Copyright>
99
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1010
<Version>0.1.7</Version>
1111
<PackageProjectUrl>https://github.com/GeoJSON-Net/GeoJSON.Net.Contrib</PackageProjectUrl>
1212
<RepositoryUrl>https://github.com/GeoJSON-Net/GeoJSON.Net.Contrib.git</RepositoryUrl>
1313
<RepositoryType>git</RepositoryType>
1414
<PackageTags>geojson;geo;json;geolocation;spatial;gis;wkb</PackageTags>
1515
<PackageLicenseExpression>MIT</PackageLicenseExpression>
16-
<PackageReleaseNotes>Updated to GeoJson 1.2.15</PackageReleaseNotes>
16+
<PackageReleaseNotes>Added support for Z coordinates (Thanks to Stijn Herreman and Trevor Thoele)</PackageReleaseNotes>
1717
</PropertyGroup>
1818

1919
<ItemGroup>

‎test/GeoJSON.Net.Contrib.EntityFramework.Test/GeoJSON.Net.Contrib.EntityFramework.Test.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@
5050
<HintPath>..\..\src\packages\GeoJSON.Net.1.2.15\lib\net45\GeoJSON.Net.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
53-
<HintPath>..\..\src\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
54-
<Private>True</Private>
53+
<HintPath>..\..\src\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
5554
</Reference>
5655
<Reference Include="System" />
5756
<Reference Include="System.ComponentModel.DataAnnotations" />

‎test/GeoJSON.Net.Contrib.EntityFramework.Test/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="EntityFramework" version="6.1.3" targetFramework="net452" />
44
<package id="GeoJSON.Net" version="1.2.15" targetFramework="net452" />
5-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
5+
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
66
<package id="xunit" version="2.2.0" targetFramework="net452" />
77
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
88
<package id="xunit.assert" version="2.2.0" targetFramework="net452" />

‎test/GeoJSON.Net.Contrib.MsSqlSpatial.Test/GeoJSON.Net.Contrib.MsSqlSpatial.Test.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@
4848
<Private>True</Private>
4949
</Reference>
5050
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
51-
<HintPath>..\..\src\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
52-
<Private>True</Private>
51+
<HintPath>..\..\src\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
5352
</Reference>
5453
<Reference Include="System" />
5554
<Reference Include="System.Core">

‎test/GeoJSON.Net.Contrib.MsSqlSpatial.Test/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="GeoJSON.Net" version="1.2.15" targetFramework="net45" />
44
<package id="Microsoft.SqlServer.Types" version="14.0.314.76" targetFramework="net45" />
5-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
5+
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
66
</packages>

‎test/GeoJSON.Net.Contrib.Wkb.Test/GeoJSON.Net.Contrib.Wkb.Test.csproj

+1-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@
4242
<HintPath>..\..\src\packages\GeoJSON.Net.1.2.15\lib\net45\GeoJSON.Net.dll</HintPath>
4343
</Reference>
4444
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
45-
<HintPath>..\..\src\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
46-
<Private>True</Private>
45+
<HintPath>..\..\src\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
4746
</Reference>
4847
<Reference Include="System" />
4948
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">

‎test/GeoJSON.Net.Contrib.Wkb.Test/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="GeoJSON.Net" version="1.2.15" targetFramework="net452" />
4-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
4+
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
55
<package id="xunit" version="2.2.0" targetFramework="net452" />
66
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
77
<package id="xunit.assert" version="2.2.0" targetFramework="net452" />

0 commit comments

Comments
 (0)