Skip to content

Handle ordinates for empty IGeometryCollection #2258

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

Merged
austindrenski merged 1 commit into from
Dec 10, 2018
Merged

Handle ordinates for empty IGeometryCollection #2258

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
4 changes: 2 additions & 2 deletions src/Npgsql.NetTopologySuite/NpgsqlPostGisWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,8 +508,8 @@ private static Ordinates CheckOrdinates(IGeometry geometry)
return CheckOrdinates(((ILineString)geometry).CoordinateSequence);
if (geometry is IPolygon)
return CheckOrdinates((((IPolygon)geometry).ExteriorRing).CoordinateSequence);
if (geometry is IGeometryCollection)
return CheckOrdinates(geometry.GetGeometryN(0));
if (geometry is IGeometryCollection collection)
return collection.Count == 0 ? Ordinates.None : CheckOrdinates(collection.GetGeometryN(0));

Assert.ShouldNeverReachHere();
return Ordinates.None;
Expand Down
6 changes: 6 additions & 0 deletions test/Npgsql.PluginTests/NetTopologySuiteTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,12 @@ public static IEnumerable TestCases {
"st_multi(st_makepolygon(st_makeline(ARRAY[st_makepoint(1,1),st_makepoint(2,2),st_makepoint(3,3),st_makepoint(1,1)])))"
);

yield return new TestCaseData(
Ordinates.None,
GeometryCollection.Empty,
"st_geomfromtext('GEOMETRYCOLLECTION EMPTY')"
);

yield return new TestCaseData(
Ordinates.None,
new GeometryCollection(new IGeometry[]
Expand Down