Skip to content

Commit

Permalink
Remove some trivial dependencies on geo legacy code (elastic#73894) (e…
Browse files Browse the repository at this point in the history 
…lastic#73905)
  • Loading branch information
@iverase
iverase authored Jun 8, 2021
1 parent f09c913 commit ceaa68f
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
33 changes: 16 additions & 17 deletions server/src/main/java/org/elasticsearch/common/geo/GeoJson.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.geo.parsers.ShapeParser;
import org.elasticsearch.common.unit.DistanceUnit;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ObjectParser;
Expand Down Expand Up @@ -95,7 +94,7 @@ public static XContentBuilder toXContent(Geometry geometry, XContentBuilder buil
@Override
public XContentBuilder visit(Circle circle) throws IOException {
builder.field(FIELD_RADIUS.getPreferredName(), DistanceUnit.METERS.toString(circle.getRadiusMeters()));
builder.field(ShapeParser.FIELD_COORDINATES.getPreferredName());
builder.field(FIELD_COORDINATES.getPreferredName());
return coordinatesToXContent(circle.getY(), circle.getX(), circle.getZ());
}

Expand All @@ -110,7 +109,7 @@ public XContentBuilder visit(GeometryCollection<?> collection) throws IOExceptio

@Override
public XContentBuilder visit(Line line) throws IOException {
builder.field(ShapeParser.FIELD_COORDINATES.getPreferredName());
builder.field(FIELD_COORDINATES.getPreferredName());
return coordinatesToXContent(line);
}

Expand All @@ -121,7 +120,7 @@ public XContentBuilder visit(LinearRing ring) {

@Override
public XContentBuilder visit(MultiLine multiLine) throws IOException {
builder.field(ShapeParser.FIELD_COORDINATES.getPreferredName());
builder.field(FIELD_COORDINATES.getPreferredName());
builder.startArray();
for (int i = 0; i < multiLine.size(); i++) {
coordinatesToXContent(multiLine.get(i));
Expand All @@ -131,7 +130,7 @@ public XContentBuilder visit(MultiLine multiLine) throws IOException {

@Override
public XContentBuilder visit(MultiPoint multiPoint) throws IOException {
builder.startArray(ShapeParser.FIELD_COORDINATES.getPreferredName());
builder.startArray(FIELD_COORDINATES.getPreferredName());
for (int i = 0; i < multiPoint.size(); i++) {
Point p = multiPoint.get(i);
builder.startArray().value(p.getX()).value(p.getY());
Expand All @@ -145,7 +144,7 @@ public XContentBuilder visit(MultiPoint multiPoint) throws IOException {

@Override
public XContentBuilder visit(MultiPolygon multiPolygon) throws IOException {
builder.startArray(ShapeParser.FIELD_COORDINATES.getPreferredName());
builder.startArray(FIELD_COORDINATES.getPreferredName());
for (int i = 0; i < multiPolygon.size(); i++) {
builder.startArray();
coordinatesToXContent(multiPolygon.get(i));
Expand All @@ -156,13 +155,13 @@ public XContentBuilder visit(MultiPolygon multiPolygon) throws IOException {

@Override
public XContentBuilder visit(Point point) throws IOException {
builder.field(ShapeParser.FIELD_COORDINATES.getPreferredName());
builder.field(FIELD_COORDINATES.getPreferredName());
return coordinatesToXContent(point.getY(), point.getX(), point.getZ());
}

@Override
public XContentBuilder visit(Polygon polygon) throws IOException {
builder.startArray(ShapeParser.FIELD_COORDINATES.getPreferredName());
builder.startArray(FIELD_COORDINATES.getPreferredName());
coordinatesToXContent(polygon.getPolygon());
for (int i = 0; i < polygon.getNumberOfHoles(); i++) {
coordinatesToXContent(polygon.getHole(i));
Expand All @@ -172,7 +171,7 @@ public XContentBuilder visit(Polygon polygon) throws IOException {

@Override
public XContentBuilder visit(Rectangle rectangle) throws IOException {
builder.startArray(ShapeParser.FIELD_COORDINATES.getPreferredName());
builder.startArray(FIELD_COORDINATES.getPreferredName());
coordinatesToXContent(rectangle.getMaxY(), rectangle.getMinX(), rectangle.getMinZ()); // top left
coordinatesToXContent(rectangle.getMinY(), rectangle.getMaxX(), rectangle.getMaxZ()); // bottom right
return builder.endArray();
Expand Down Expand Up @@ -221,7 +220,7 @@ public static Map<String, Object> toMap(Geometry geometry) {
@Override
public Void visit(Circle circle) {
root.put(FIELD_RADIUS.getPreferredName(), DistanceUnit.METERS.toString(circle.getRadiusMeters()));
root.put(ShapeParser.FIELD_COORDINATES.getPreferredName(), coordinatesToList(circle.getY(), circle.getX(), circle.getZ()));
root.put(FIELD_COORDINATES.getPreferredName(), coordinatesToList(circle.getY(), circle.getX(), circle.getZ()));
return null;
}

Expand All @@ -238,7 +237,7 @@ public Void visit(GeometryCollection<?> collection) {

@Override
public Void visit(Line line) {
root.put(ShapeParser.FIELD_COORDINATES.getPreferredName(), coordinatesToList(line));
root.put(FIELD_COORDINATES.getPreferredName(), coordinatesToList(line));
return null;
}

Expand All @@ -253,7 +252,7 @@ public Void visit(MultiLine multiLine) {
for (int i = 0; i < multiLine.size(); i++) {
lines.add(coordinatesToList(multiLine.get(i)));
}
root.put(ShapeParser.FIELD_COORDINATES.getPreferredName(), lines);
root.put(FIELD_COORDINATES.getPreferredName(), lines);
return null;
}

Expand All @@ -270,7 +269,7 @@ public Void visit(MultiPoint multiPoint) {
}
points.add(point);
}
root.put(ShapeParser.FIELD_COORDINATES.getPreferredName(), points);
root.put(FIELD_COORDINATES.getPreferredName(), points);
return null;
}

Expand All @@ -280,13 +279,13 @@ public Void visit(MultiPolygon multiPolygon) {
for (int i = 0; i < multiPolygon.size(); i++) {
polygons.add(coordinatesToList(multiPolygon.get(i)));
}
root.put(ShapeParser.FIELD_COORDINATES.getPreferredName(), polygons);
root.put(FIELD_COORDINATES.getPreferredName(), polygons);
return null;
}

@Override
public Void visit(Point point) {
root.put(ShapeParser.FIELD_COORDINATES.getPreferredName(), coordinatesToList(point.getY(), point.getX(), point.getZ()));
root.put(FIELD_COORDINATES.getPreferredName(), coordinatesToList(point.getY(), point.getX(), point.getZ()));
return null;
}

Expand All @@ -297,7 +296,7 @@ public Void visit(Polygon polygon) {
for (int i = 0; i < polygon.getNumberOfHoles(); i++) {
coords.add(coordinatesToList(polygon.getHole(i)));
}
root.put(ShapeParser.FIELD_COORDINATES.getPreferredName(), coords);
root.put(FIELD_COORDINATES.getPreferredName(), coords);
return null;
}

Expand All @@ -306,7 +305,7 @@ public Void visit(Rectangle rectangle) {
List<Object> coords = new ArrayList<>(2);
coords.add(coordinatesToList(rectangle.getMaxY(), rectangle.getMinX(), rectangle.getMinZ())); // top left
coords.add(coordinatesToList(rectangle.getMinY(), rectangle.getMaxX(), rectangle.getMaxZ())); // bottom right
root.put(ShapeParser.FIELD_COORDINATES.getPreferredName(), coords);
root.put(FIELD_COORDINATES.getPreferredName(), coords);
return null;
}

Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/elasticsearch/index/mapper/GeoShapeIndexer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import org.apache.lucene.index.IndexableField;
import org.elasticsearch.common.geo.GeoLineDecomposer;
import org.elasticsearch.common.geo.GeoPolygonDecomposer;
import org.elasticsearch.common.geo.GeoShapeType;
import org.elasticsearch.common.geo.GeoShapeUtils;
import org.elasticsearch.common.geo.GeoUtils;
import org.elasticsearch.geometry.Circle;
Expand All @@ -29,6 +28,7 @@
import org.elasticsearch.geometry.Point;
import org.elasticsearch.geometry.Polygon;
import org.elasticsearch.geometry.Rectangle;
import org.elasticsearch.geometry.ShapeType;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -58,7 +58,7 @@ public Geometry prepareForIndexing(Geometry geometry) {
return geometry.visit(new GeometryVisitor<Geometry, RuntimeException>() {
@Override
public Geometry visit(Circle circle) {
throw new UnsupportedOperationException(GeoShapeType.CIRCLE + " geometry is not supported");
throw new UnsupportedOperationException(ShapeType.CIRCLE + " geometry is not supported");
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion server/src/test/java/org/elasticsearch/common/geo/GeometryIndexerTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.elasticsearch.geometry.Point;
import org.elasticsearch.geometry.Polygon;
import org.elasticsearch.geometry.Rectangle;
import org.elasticsearch.geometry.ShapeType;
import org.elasticsearch.index.mapper.GeoShapeIndexer;
import org.elasticsearch.test.ESTestCase;
import org.locationtech.spatial4j.exception.InvalidShapeException;
Expand All @@ -46,7 +47,7 @@ public class GeometryIndexerTests extends ESTestCase {
public void testCircle() {
UnsupportedOperationException ex =
expectThrows(UnsupportedOperationException.class, () -> indexer.prepareForIndexing(new Circle(2, 1, 3)));
assertEquals(GeoShapeType.CIRCLE + " geometry is not supported", ex.getMessage());
assertEquals(ShapeType.CIRCLE + " geometry is not supported", ex.getMessage());
}

public void testCollection() {
Expand Down

0 comments on commit ceaa68f

Please sign in to comment.