Skip to content

Geo: fix indexing of west to east linestrings crossing the antimeridian #46601

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
merged 1 commit into from
Sep 11, 2019
Merged

Geo: fix indexing of west to east linestrings crossing the antimeridian #46601

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
13 changes: 10 additions & 3 deletions server/src/main/java/org/elasticsearch/index/mapper/GeoShapeIndexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ private List<Line> decomposeGeometry(Line line, List<Line> lines) {
double[] lons = new double[partMinus.length()];
for (int i = 0; i < partMinus.length(); i++) {
lats[i] = normalizeLat(partMinus.getY(i));
lons[i] = normalizeLon(partMinus.getX(i));
lons[i] = normalizeLonMinus180Inclusive(partMinus.getX(i));
}
lines.add(new Line(lons, lats));
}
Expand Down Expand Up @@ -274,7 +274,7 @@ private List<Line> decompose(double dateline, double[] lons, double[] lats) {
lons[offset + i - 1] = intersection.getX();
lats[offset + i - 1] = intersection.getY();

shift(shift, lons);
shift(shift, partLons);
offset = i - 1;
shift = lons[i] > DATELINE ? DATELINE : (lons[i] < -DATELINE ? -DATELINE : 0);
} else {
Expand Down Expand Up @@ -926,7 +926,7 @@ private static Polygon buildPolygon(List<Point[]> polygon) {
for (int i = 0; i < shell.length; ++i) {
//Lucene Tessellator treats different +180 and -180 and we should keep the sign.
//normalizeLon method excludes -180.
x[i] = Math.abs(shell[i].getX()) > 180 ? normalizeLon(shell[i].getX()) : shell[i].getX();
x[i] = normalizeLonMinus180Inclusive(shell[i].getX());
y[i] = normalizeLat(shell[i].getY());
}

Expand Down Expand Up @@ -1043,4 +1043,11 @@ public static org.apache.lucene.geo.Polygon toLucenePolygon(Polygon polygon) {
}
return new org.apache.lucene.geo.Polygon(polygon.getPolygon().getY(), polygon.getPolygon().getX(), holes);
}

/**
* Normalizes longitude while accepting -180 degrees as a valid value
*/
private static double normalizeLonMinus180Inclusive(double lon) {
return Math.abs(lon) > 180 ? normalizeLon(lon) : lon;
}
}
24 changes: 21 additions & 3 deletions server/src/test/java/org/elasticsearch/common/geo/GeometryIndexerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void testCollection() {
new Point(2, 1), new Point(4, 3),
new MultiLine(Arrays.asList(
new Line(new double[]{160, 180}, new double[]{10, 15}),
new Line(new double[]{180, -160}, new double[]{15, 20}))
new Line(new double[]{-180, -160}, new double[]{15, 20}))
))
);
assertEquals(indexed, indexer.prepareForIndexing(collection));
Expand All @@ -87,7 +87,25 @@ public void testLine() {
line = new Line(new double[]{160, 200}, new double[]{10, 20});
indexed = new MultiLine(Arrays.asList(
new Line(new double[]{160, 180}, new double[]{10, 15}),
new Line(new double[]{180, -160}, new double[]{15, 20}))
new Line(new double[]{-180, -160}, new double[]{15, 20}))
);

assertEquals(indexed, indexer.prepareForIndexing(line));

line = new Line(new double[]{200, 160}, new double[]{10, 20});
indexed = new MultiLine(Arrays.asList(
new Line(new double[]{-160, -180}, new double[]{10, 15}),
new Line(new double[]{180, 160}, new double[]{15, 20}))
);

assertEquals(indexed, indexer.prepareForIndexing(line));

line = new Line(new double[]{160, 200, 160}, new double[]{0, 10, 20});
indexed = new MultiLine(Arrays.asList(
new Line(new double[]{160, 180}, new double[]{0, 5}),
new Line(new double[]{-180, -160, -180}, new double[]{5, 10, 15}),
new Line(new double[]{180, 160}, new double[]{15, 20})
)
);

assertEquals(indexed, indexer.prepareForIndexing(line));
Expand All @@ -106,7 +124,7 @@ line, new Line(new double[]{160, 200}, new double[]{10, 20})
indexed = new MultiLine(Arrays.asList(
line,
new Line(new double[]{160, 180}, new double[]{10, 15}),
new Line(new double[]{180, -160}, new double[]{15, 20}))
new Line(new double[]{-180, -160}, new double[]{15, 20}))
);

assertEquals(indexed, indexer.prepareForIndexing(multiLine));
Expand Down