Skip to content

Commit a9611fe

Browse files
peetwpeetw
authored
Merge pull request #116 from peetw/feature/update-nts
Update NetTopologySuite NuGet packages to v2
2 parents 8e7f774 + 241207e commit a9611fe

File tree

91 files changed

+675
-708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+675
-708
lines changed

‎NHibernate.Spatial.MsSql/NHibernate.Spatial.MsSql.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="NetTopologySuite.IO.SqlServerBytes" Version="[1.15, 2.0)" />
15+
<PackageReference Include="NetTopologySuite.IO.SqlServerBytes" Version="2.0.0" />
1616
<PackageReference Include="System.Data.SqlClient" Version="4.8.0" />
1717
</ItemGroup>
1818

‎NHibernate.Spatial.MsSql/Type/MsSqlGeometryType.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Data;
33
using System.Data.Common;
44
using System.Data.SqlClient;
5-
using GeoAPI.Geometries;
5+
using NetTopologySuite.Geometries;
66
using NetTopologySuite.IO;
77
using NHibernate.Engine;
88
using NHibernate.SqlTypes;
@@ -23,7 +23,7 @@ public MsSqlGeometryType()
2323

2424
protected override byte[] FromGeometry(object value)
2525
{
26-
var geometry = value as IGeometry;
26+
var geometry = value as Geometry;
2727
if (geometry == null)
2828
{
2929
return null;
@@ -35,7 +35,7 @@ protected override byte[] FromGeometry(object value)
3535
return bytes;
3636
}
3737

38-
protected override IGeometry ToGeometry(object value)
38+
protected override Geometry ToGeometry(object value)
3939
{
4040
var bytes = value as byte[];
4141
if (bytes == null || bytes.Length == 0)
@@ -58,7 +58,7 @@ public CustomGeometryType()
5858

5959
public override string Name => ReturnedClass.Name;
6060

61-
public override System.Type ReturnedClass => typeof(IGeometry);
61+
public override System.Type ReturnedClass => typeof(Geometry);
6262

6363
public override void Set(DbCommand cmd, object value, int index, ISessionImplementor session)
6464
{

‎NHibernate.Spatial.MySQL/Type/MySQL57GeometryAdapterType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
namespace NHibernate.Spatial.Type
2828
{
2929
/// <summary>
30-
/// This class maps MySQLDbType.Geometry to and from IGeometry
30+
/// This class maps MySQLDbType.Geometry to and from Geometry
3131
/// </summary>
3232
[Serializable]
3333
public class MySQL57GeometryAdapterType : ImmutableType

‎NHibernate.Spatial.MySQL/Type/MySQL57GeometryType.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1717

1818

19-
using GeoAPI.Geometries;
2019
using MySql.Data.MySqlClient;
2120
using MySql.Data.Types;
21+
using NetTopologySuite.Geometries;
2222
using NHibernate.Type;
2323

2424
namespace NHibernate.Spatial.Type
@@ -35,7 +35,7 @@ public MySQL57GeometryType()
3535
{
3636
}
3737

38-
protected override void SetDefaultSRID(IGeometry geometry)
38+
protected override void SetDefaultSRID(Geometry geometry)
3939
{
4040
base.SetDefaultSRID(geometry);
4141
if (geometry.SRID == -1)
@@ -51,7 +51,7 @@ protected override void SetDefaultSRID(IGeometry geometry)
5151
/// <returns></returns>
5252
protected override MySqlGeometry? FromGeometry(object value)
5353
{
54-
IGeometry geometry = value as IGeometry;
54+
Geometry geometry = value as Geometry;
5555
if (geometry == null)
5656
{
5757
return null;
@@ -75,7 +75,7 @@ protected override void SetDefaultSRID(IGeometry geometry)
7575
/// </summary>
7676
/// <param name="value">The database geometry value.</param>
7777
/// <returns></returns>
78-
protected override IGeometry ToGeometry(object value)
78+
protected override Geometry ToGeometry(object value)
7979
{
8080
MySqlGeometry? bytes = value as MySqlGeometry?;
8181

@@ -85,7 +85,7 @@ protected override IGeometry ToGeometry(object value)
8585
}
8686

8787
MySQLReader reader = new MySQLReader();
88-
IGeometry geometry = reader.Read(bytes.Value.Value);
88+
Geometry geometry = reader.Read(bytes.Value.Value);
8989
SetDefaultSRID(geometry);
9090
return geometry;
9191
}

‎NHibernate.Spatial.MySQL/Type/MySQLGeometryType.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// along with NHibernate.Spatial; if not, write to the Free Software
1616
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1717

18-
using GeoAPI.Geometries;
18+
using NetTopologySuite.Geometries;
1919

2020
namespace NHibernate.Spatial.Type
2121
{
@@ -38,7 +38,7 @@ public MySQLGeometryType()
3838
/// <returns></returns>
3939
protected override byte[] FromGeometry(object value)
4040
{
41-
IGeometry geometry = value as IGeometry;
41+
Geometry geometry = value as Geometry;
4242
if (geometry == null)
4343
{
4444
return null;
@@ -59,7 +59,7 @@ protected override byte[] FromGeometry(object value)
5959
/// </summary>
6060
/// <param name="value">The databse geometry value.</param>
6161
/// <returns></returns>
62-
protected override IGeometry ToGeometry(object value)
62+
protected override Geometry ToGeometry(object value)
6363
{
6464
byte[] bytes = value as byte[];
6565

@@ -69,7 +69,7 @@ protected override IGeometry ToGeometry(object value)
6969
}
7070

7171
MySQLReader reader = new MySQLReader();
72-
IGeometry geometry = reader.Read(bytes);
72+
Geometry geometry = reader.Read(bytes);
7373
this.SetDefaultSRID(geometry);
7474
return geometry;
7575
}

‎NHibernate.Spatial.MySQL/Type/MySQLReader.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
// along with NHibernate.Spatial; if not, write to the Free Software
1616
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1717

18-
using GeoAPI.Geometries;
18+
using NetTopologySuite.Geometries;
1919
using NetTopologySuite.IO;
2020
using System.IO;
2121

2222
namespace NHibernate.Spatial.Type
2323
{
2424
public class MySQLReader : WKBReader
2525
{
26-
public override IGeometry Read(Stream stream)
26+
public override Geometry Read(Stream stream)
2727
{
2828
// MySQL stores geometry values using the first 4 bytes to indicate the SRID
2929
// followed by the WKB representation of the value; see:

‎NHibernate.Spatial.MySQL/Type/MySQLWriter.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
// along with NHibernate.Spatial; if not, write to the Free Software
1616
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1717

18-
using GeoAPI.Geometries;
19-
using GeoAPI.IO;
18+
using NetTopologySuite.Geometries;
2019
using NetTopologySuite.IO;
2120
using System;
2221
using System.IO;
@@ -25,19 +24,19 @@ namespace NHibernate.Spatial.Type
2524
{
2625
public class MySQLWriter : WKBWriter
2726
{
28-
protected override int SetByteStream(IGeometry geometry)
27+
protected override int SetByteStream(Geometry geometry)
2928
{
3029
return base.SetByteStream(geometry) + 4; // sizeof(int)
3130
}
3231

33-
public override byte[] Write(IGeometry geometry)
32+
public override byte[] Write(Geometry geometry)
3433
{
3534
byte[] bytes = new byte[SetByteStream(geometry)];
3635
Write(geometry, new MemoryStream(bytes));
3736
return bytes;
3837
}
3938

40-
public override void Write(IGeometry geometry, Stream stream)
39+
public override void Write(Geometry geometry, Stream stream)
4140
{
4241
BinaryWriter writer;
4342
if (this.EncodingType == ByteOrder.LittleEndian)
@@ -62,7 +61,7 @@ public override void Write(IGeometry geometry, Stream stream)
6261
}
6362
}
6463

65-
protected void WriteGeometryCollectionEmpty(IGeometry geometry, BinaryWriter writer)
64+
protected void WriteGeometryCollectionEmpty(Geometry geometry, BinaryWriter writer)
6665
{
6766
WriteByteOrder(writer);
6867
if (geometry.Coordinate == null || Double.IsNaN(geometry.Coordinate.Z))

‎NHibernate.Spatial.PostGis/NHibernate.Spatial.PostGis.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="NetTopologySuite.IO.PostGis" Version="[1.15, 2.0)" />
24+
<PackageReference Include="NetTopologySuite.IO.PostGis" Version="2.0.0" />
2525
<PackageReference Include="Npgsql" Version="3.2.7" />
2626
</ItemGroup>
2727

‎NHibernate.Spatial.PostGis/Type/PostGisGeometryType.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@
1515
// along with NHibernate.Spatial; if not, write to the Free Software
1616
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1717

18-
using GeoAPI.Geometries;
1918
using NetTopologySuite.Geometries;
2019
using NetTopologySuite.IO;
2120
using System;
22-
using System.Data;
2321
using System.Data.Common;
2422
using NHibernate.Engine;
2523
using NHibernate.SqlTypes;
@@ -49,7 +47,7 @@ public PostGisGeometryType()
4947
/// <returns></returns>
5048
protected override byte[] FromGeometry(object value)
5149
{
52-
IGeometry geometry = value as IGeometry;
50+
Geometry geometry = value as Geometry;
5351
if (geometry == null)
5452
{
5553
return null;
@@ -59,7 +57,7 @@ protected override byte[] FromGeometry(object value)
5957
// and parses WKT of empty geometries always as GeometryCollection
6058
// (ie. "select AsText(GeomFromText('LINESTRING EMPTY', -1)) = 'GEOMETRYCOLLECTION EMPTY'").
6159
// Force GeometryCollection.Empty to avoid the error.
62-
if (!(geometry is IGeometryCollection) && geometry.IsEmpty)
60+
if (!(geometry is GeometryCollection) && geometry.IsEmpty)
6361
{
6462
geometry = GeometryCollection.Empty;
6563
}
@@ -92,7 +90,7 @@ protected override byte[] FromGeometry(object value)
9290
/// </summary>
9391
/// <param name="value">The databse geometry value.</param>
9492
/// <returns></returns>
95-
protected override IGeometry ToGeometry(object value)
93+
protected override Geometry ToGeometry(object value)
9694
{
9795
var bytes = value as byte[];
9896
if (bytes == null)
@@ -101,7 +99,7 @@ protected override IGeometry ToGeometry(object value)
10199
}
102100

103101
PostGisReader reader = new PostGisReader();
104-
IGeometry geometry = reader.Read(bytes);
102+
Geometry geometry = reader.Read(bytes);
105103
this.SetDefaultSRID(geometry);
106104
return geometry;
107105
}
@@ -177,7 +175,7 @@ public override object FromStringValue(string xml)
177175
return ToByteArray(xml);
178176
}
179177

180-
public override System.Type ReturnedClass => typeof(IGeometry);
178+
public override System.Type ReturnedClass => typeof(Geometry);
181179

182180
public override void Set(DbCommand cmd, object value, int index, ISessionImplementor session)
183181
{

‎NHibernate.Spatial/Criterion/Lambda/LambdaSpatialRestrictionBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using GeoAPI.Geometries;
1+
using NetTopologySuite.Geometries;
22
using NHibernate.Criterion;
33

44
namespace NHibernate.Spatial.Criterion.Lambda
@@ -39,7 +39,7 @@ public LambdaSpatialRestrictionBuilder Not
3939
/// <summary>
4040
/// Apply a "filter" constraint to the named property
4141
/// </summary>
42-
public AbstractCriterion Filter(IGeometry value)
42+
public AbstractCriterion Filter(Geometry value)
4343
{
4444
return this.Process(SpatialRestrictions.Filter(this.propertyName, value));
4545
}

0 commit comments

Comments
 (0)