Skip to content

[GH-3200] Serialize empty Geography LineStrings as valid WKB #3205

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

Closed
jiayuasu wants to merge 1 commit into from
+30 −0
Closed

[GH-3200] Serialize empty Geography LineStrings as valid WKB #3205

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: 4 additions & 0 deletions common/src/main/java/org/apache/sedona/common/S2Geography/WKBWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,10 @@ private void writePolyline(int geometryType, SinglePolylineGeography polyline, O
writeByteOrder(os);
writeGeometryType(geometryType, polyline, os);
List<S2Polyline> s2line = polyline.getPolylines();
if (s2line.isEmpty()) {
writeInt(0, os);
return;
}
for (S2Polyline s2 : s2line) {
List<S2Point> verts = s2.vertices();
writeInt(verts.size(), os);
Expand Down
14 changes: 14 additions & 0 deletions common/src/test/java/org/apache/sedona/common/S2Geography/WKBGeographyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.LineString;
import org.locationtech.jts.geom.Point;
import org.locationtech.jts.io.ByteOrderValues;
import org.locationtech.jts.io.ParseException;
Expand Down Expand Up @@ -137,6 +138,19 @@ public void fromS2Geography_point() {
assertSame(s2Geog, roundTrip);
}

@Test
public void fromS2Geography_emptyLineString_roundTripsToJTS() {
Geography s2Geog = new SinglePolylineGeography();
s2Geog.setSRID(4326);

WKBGeography geog = WKBGeography.fromS2Geography(s2Geog);
Geometry jts = geog.getJTSGeometry();

assertTrue(jts instanceof LineString);
assertTrue(jts.isEmpty());
assertEquals(4326, jts.getSRID());
}

// ─── Lazy S2 delegation ──────────────────────────────────────────────────

@Test
Expand Down
12 changes: 12 additions & 0 deletions common/src/test/java/org/apache/sedona/common/S2Geography/WKBWriterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,18 @@ public void PolylineGeographyToHexTest() throws IOException, ParseException {
}
}

@Test
public void EmptySinglePolylineWritesValidWKB() throws IOException, ParseException {
Geography inputLine = new SinglePolylineGeography();

byte[] wkb = new WKBWriter(2, ByteOrderValues.LITTLE_ENDIAN, false).write(inputLine);

assertEquals("010200000000000000", WKBWriter.toHex(wkb));
Geography outputLine = new WKBReader().read(wkb);
assertTrue(outputLine instanceof SinglePolylineGeography);
assertEquals(0, outputLine.numShapes());
}

@Test
public void MultiPointTest() throws ParseException, IOException {
String wkt = "MULTIPOINT ((10 40), (40 30))";
Expand Down