Skip to content

Fix GeoJson polygon conversion for multiple inner rings #5193

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

Open
DragonFSKY wants to merge 1 commit into
base: main
Choose a base branch
from
+47 −1
Open

Fix GeoJson polygon conversion for multiple inner rings #5193

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
7 changes: 6 additions & 1 deletion ...ta-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/GeoConverters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
* @author Oliver Gierke
* @author Christoph Strobl
* @author Thiago Diniz da Silveira
* @author dragonfsky
* @since 1.5
*/
@SuppressWarnings("ConstantConditions")
Expand Down Expand Up @@ -768,7 +769,11 @@ static GeoJsonPolygon toGeoJsonPolygon(@Nullable List<?> dbList) {
Assert.notNull(dbList, "DbList must not be null");

GeoJsonPolygon polygon = new GeoJsonPolygon(toListOfPoint((List<?>) dbList.get(0)));
return dbList.size() > 1 ? polygon.withInnerRing(toListOfPoint((List<?>) dbList.get(1))) : polygon;
for (int i = 1; i < dbList.size(); i++) {
polygon = polygon.withInnerRing(toListOfPoint((List<?>) dbList.get(i)));
}

return polygon;
}

/**
Expand Down
41 changes: 41 additions & 0 deletions ...rc/test/java/org/springframework/data/mongodb/core/convert/GeoJsonConverterUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@

/**
* @author Christoph Strobl
* @author dragonfsky
*/
@RunWith(Suite.class)
@SuiteClasses({ GeoJsonConverterUnitTests.GeoJsonToDocumentConverterUnitTests.class,
Expand All @@ -73,14 +74,23 @@ public class GeoJsonConverterUnitTests {
static final Point INNER_POINT_2 = new Point(90, 90);
static final Point INNER_POINT_3 = new Point(10, 90);

static final Point SECOND_INNER_POINT_0 = new Point(1, 1);
static final Point SECOND_INNER_POINT_1 = new Point(5, 1);
static final Point SECOND_INNER_POINT_2 = new Point(5, 5);
static final Point SECOND_INNER_POINT_3 = new Point(1, 5);

static final GeoJsonMultiPoint MULTI_POINT = new GeoJsonMultiPoint(POINT_0, POINT_2, POINT_3);
static final GeoJsonLineString LINE_STRING = new GeoJsonLineString(POINT_0, POINT_1, POINT_2);
@SuppressWarnings("unchecked") static final GeoJsonMultiLineString MULTI_LINE_STRING = new GeoJsonMultiLineString(
Arrays.asList(POINT_0, POINT_1, POINT_2), Arrays.asList(POINT_3, POINT_0));
static final GeoJsonPolygon POLYGON = new GeoJsonPolygon(POINT_0, POINT_1, POINT_2, POINT_3, POINT_0);
static final GeoJsonPolygon POLYGON_WITH_2_RINGS = POLYGON.withInnerRing(INNER_POINT_0, INNER_POINT_1, INNER_POINT_2,
INNER_POINT_3, INNER_POINT_0);
static final GeoJsonPolygon POLYGON_WITH_MULTIPLE_INNER_RINGS = POLYGON_WITH_2_RINGS.withInnerRing(
SECOND_INNER_POINT_0, SECOND_INNER_POINT_1, SECOND_INNER_POINT_2, SECOND_INNER_POINT_3, SECOND_INNER_POINT_0);
static final GeoJsonMultiPolygon MULTI_POLYGON = new GeoJsonMultiPolygon(Arrays.asList(POLYGON));
static final GeoJsonMultiPolygon MULTI_POLYGON_WITH_MULTIPLE_INNER_RINGS = new GeoJsonMultiPolygon(
Arrays.asList(POLYGON_WITH_MULTIPLE_INNER_RINGS));
static final GeoJsonGeometryCollection GEOMETRY_COLLECTION = new GeoJsonGeometryCollection(
Arrays.<GeoJson<?>> asList(SINGLE_POINT, POLYGON));
/*
Expand Down Expand Up @@ -123,6 +133,14 @@ public class GeoJsonConverterUnitTests {
.add(new BasicDbListBuilder().add(INNER_POINT_0.getX()).add(INNER_POINT_0.getY()).get()) //
.get();

static final BasicDBList POLYGON_SECOND_INNER_CORDS = new BasicDbListBuilder() //
.add(new BasicDbListBuilder().add(SECOND_INNER_POINT_0.getX()).add(SECOND_INNER_POINT_0.getY()).get()) //
.add(new BasicDbListBuilder().add(SECOND_INNER_POINT_1.getX()).add(SECOND_INNER_POINT_1.getY()).get()) //
.add(new BasicDbListBuilder().add(SECOND_INNER_POINT_2.getX()).add(SECOND_INNER_POINT_2.getY()).get()) //
.add(new BasicDbListBuilder().add(SECOND_INNER_POINT_3.getX()).add(SECOND_INNER_POINT_3.getY()).get()) //
.add(new BasicDbListBuilder().add(SECOND_INNER_POINT_0.getX()).add(SECOND_INNER_POINT_0.getY()).get()) //
.get();

static final BasicDBList POLYGON_CORDS = new BasicDbListBuilder().add(POLYGON_OUTER_CORDS).get();
static final Document POLYGON_DOC = new Document() //
.append("type", "Polygon") //
Expand All @@ -134,6 +152,12 @@ public class GeoJsonConverterUnitTests {
.append("type", "Polygon") //
.append("coordinates", POLYGON_WITH_2_RINGS_CORDS);

static final BasicDBList POLYGON_WITH_MULTIPLE_INNER_RINGS_CORDS = new BasicDbListBuilder().add(POLYGON_OUTER_CORDS)
.add(POLYGON_INNER_CORDS).add(POLYGON_SECOND_INNER_CORDS).get();
static final Document POLYGON_WITH_MULTIPLE_INNER_RINGS_DOC = new Document() //
.append("type", "Polygon") //
.append("coordinates", POLYGON_WITH_MULTIPLE_INNER_RINGS_CORDS);

// LineString
static final BasicDBList LINE_STRING_CORDS_0 = new BasicDbListBuilder() //
.add(new BasicDbListBuilder().add(POINT_0.getX()).add(POINT_0.getY()).get()) //
Expand All @@ -160,6 +184,11 @@ public class GeoJsonConverterUnitTests {
static final Document MULTI_POLYGON_DOC = new Document().append("type", "MultiPolygon").append("coordinates",
MULTI_POLYGON_CORDS);

static final BasicDBList MULTI_POLYGON_WITH_MULTIPLE_INNER_RINGS_CORDS = new BasicDbListBuilder()
.add(POLYGON_WITH_MULTIPLE_INNER_RINGS_CORDS).get();
static final Document MULTI_POLYGON_WITH_MULTIPLE_INNER_RINGS_DOC = new Document().append("type", "MultiPolygon")
.append("coordinates", MULTI_POLYGON_WITH_MULTIPLE_INNER_RINGS_CORDS);

// GeometryCollection
static final BasicDBList GEOMETRY_COLLECTION_GEOMETRIES = new BasicDbListBuilder() //
.add(SINGLE_POINT_DOC)//
Expand Down Expand Up @@ -195,6 +224,12 @@ public void shouldConvertDboWithMultipleRingsCorrectly() {
assertThat(converter.convert(POLYGON_WITH_2_RINGS_DOC)).isEqualTo(POLYGON_WITH_2_RINGS);
}

@Test // GH-5190
public void shouldConvertDboWithMultipleInnerRingsCorrectly() {
assertThat(converter.convert(POLYGON_WITH_MULTIPLE_INNER_RINGS_DOC))
.isEqualTo(POLYGON_WITH_MULTIPLE_INNER_RINGS);
}

}

/**
Expand Down Expand Up @@ -302,6 +337,12 @@ public void shouldConvertDboCorrectly() {
assertThat(converter.convert(MULTI_POLYGON_DOC)).isEqualTo(MULTI_POLYGON);
}

@Test // GH-5190
public void shouldConvertDboWithMultipleInnerRingsCorrectly() {
assertThat(converter.convert(MULTI_POLYGON_WITH_MULTIPLE_INNER_RINGS_DOC))
.isEqualTo(MULTI_POLYGON_WITH_MULTIPLE_INNER_RINGS);
}

@Test // DATAMONGO-1137
public void shouldReturnNullWhenConvertIsGivenNull() {
assertThat(converter.convert(null)).isNull();
Expand Down
Loading