Skip to content

Use JTS instead of ESRI for geometries, Parts 1 and 2 #13604

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
arhimondr merged 4 commits into from
Dec 9, 2019
Merged

Use JTS instead of ESRI for geometries, Parts 1 and 2 #13604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02c79af
Upgrade JTS to 1.16.1
jagill Oct 9, 2019
7c3a9f2
Convert WKT functions to JTS
jagill Oct 25, 2019
9b3a540
Convert GeoFunctions to JTS: Part 2
jagill Oct 25, 2019
d38b153
Rename GeometrySerde to EsriGeometrySerde
jagill Oct 29, 2019
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1254,7 +1254,7 @@
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.15.0</version>
<version>1.16.1</version>
</dependency>

<dependency>
Expand Down
5 changes: 5 additions & 0 deletions presto-docs/src/main/sphinx/functions/geospatial.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,11 @@ Accessors
Returns an array of geometries in the specified collection. Returns a one-element array
if the input geometry is not a multi-geometry. Returns ``null`` if input geometry is empty.

For example, a MultiLineString will create an array of LineStrings. A GeometryCollection
will produce an un-flattened array of its constituents:
``GEOMETRYCOLLECTION(MULTIPOINT(0 0, 1 1), GEOMETRYCOLLECTION(MULTILINESTRING((2 2, 3 3))))``
would produce ``array[MULTIPOINT(0 0, 1 1), GEOMETRYCOLLECTION(MULTILINESTRING((2 2, 3 3)))]``.

.. function:: ST_NumPoints(Geometry) -> bigint

Returns the number of points in a geometry. This is an extension to the SQL/MM
Expand Down
5 changes: 5 additions & 0 deletions presto-geospatial-toolkit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@
<artifactId>presto-array</artifactId>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-spi</artifactId>
</dependency>

<dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>fastutil</artifactId>
Expand Down
51 changes: 49 additions & 2 deletions presto-geospatial-toolkit/src/main/java/com/facebook/presto/geospatial/GeometryUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,21 @@
import com.esri.core.geometry.ogc.OGCGeometry;
import com.esri.core.geometry.ogc.OGCPoint;
import com.esri.core.geometry.ogc.OGCPolygon;
import com.facebook.presto.spi.PrestoException;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.CoordinateSequence;
import org.locationtech.jts.geom.CoordinateSequenceFactory;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.impl.PackedCoordinateSequenceFactory;
import org.locationtech.jts.io.ParseException;
import org.locationtech.jts.io.WKTReader;
import org.locationtech.jts.io.WKTWriter;

import java.util.HashSet;
import java.util.Set;

import static com.facebook.presto.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;

public final class GeometryUtils
{
private static final CoordinateSequenceFactory COORDINATE_SEQUENCE_FACTORY = new PackedCoordinateSequenceFactory();
Copy link
Member

@arhimondr arhimondr Oct 30, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, i see, you are making them private in the next commit. Could you please move it to the commit before?

Expand Down Expand Up @@ -220,13 +227,53 @@ public static boolean isPointOrRectangle(OGCGeometry ogcGeometry, Envelope envel
return true;
}

public static org.locationtech.jts.geom.Point makeJtsEmptyPoint()
public static org.locationtech.jts.geom.Geometry jtsGeometryFromWkt(String wkt)
{
try {
return new WKTReader(GEOMETRY_FACTORY).read(wkt);
}
catch (ParseException | IllegalArgumentException e) {
throw new PrestoException(INVALID_FUNCTION_ARGUMENT, "Invalid WKT: " + e.getMessage(), e);
}
}

public static String wktFromJtsGeometry(org.locationtech.jts.geom.Geometry geometry)
{
return new WKTWriter().write(geometry);
}

public static org.locationtech.jts.geom.Point createJtsEmptyPoint()
{
return GEOMETRY_FACTORY.createPoint();
}

public static org.locationtech.jts.geom.Point makeJtsPoint(Coordinate coordinate)
public static org.locationtech.jts.geom.Point createJtsPoint(Coordinate coordinate)
{
return GEOMETRY_FACTORY.createPoint(coordinate);
}

public static org.locationtech.jts.geom.Point createJtsPoint(double x, double y)
{
return createJtsPoint(new Coordinate(x, y));
}

public static org.locationtech.jts.geom.MultiPoint createJtsMultiPoint(CoordinateSequence coordinates)
{
return GEOMETRY_FACTORY.createMultiPoint(coordinates);
}

public static org.locationtech.jts.geom.Geometry createJtsEmptyLineString()
{
return GEOMETRY_FACTORY.createLineString();
}

public static org.locationtech.jts.geom.Geometry createJtsLineString(CoordinateSequence coordinates)
{
return GEOMETRY_FACTORY.createLineString(coordinates);
}

public static org.locationtech.jts.geom.Geometry createJtsEmptyPolygon()
{
return GEOMETRY_FACTORY.createPolygon();
}
}
4 changes: 2 additions & 2 deletions ...resto/geospatial/serde/GeometrySerde.java → ...o/geospatial/serde/EsriGeometrySerde.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
import static java.lang.Math.toIntExact;
import static java.util.Objects.requireNonNull;

public class GeometrySerde
public class EsriGeometrySerde
{
private GeometrySerde() {}
private EsriGeometrySerde() {}

public static Slice serialize(OGCGeometry input)
{
Expand Down
2 changes: 2 additions & 0 deletions ...ospatial-toolkit/src/main/java/com/facebook/presto/geospatial/serde/JtsGeometrySerde.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,8 @@ private static void writeGeometry(Geometry geometry, DynamicSliceOutput output)
writeMultiPoint((MultiPoint) geometry, output);
break;
case "LineString":
case "LinearRing":
// LinearRings are a subclass of LineString
writePolyline(geometry, output, false);
break;
case "MultiLineString":
Expand Down
6 changes: 3 additions & 3 deletions ...al-toolkit/src/test/java/com/facebook/presto/geospatial/serde/BenchmarkGeometrySerde.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
import static com.facebook.presto.geospatial.serde.BenchmarkGeometrySerializationData.POINT;
import static com.facebook.presto.geospatial.serde.BenchmarkGeometrySerializationData.POLYGON;
import static com.facebook.presto.geospatial.serde.BenchmarkGeometrySerializationData.readResource;
import static com.facebook.presto.geospatial.serde.GeometrySerde.deserialize;
import static com.facebook.presto.geospatial.serde.GeometrySerde.deserializeEnvelope;
import static com.facebook.presto.geospatial.serde.GeometrySerde.serialize;
import static com.facebook.presto.geospatial.serde.EsriGeometrySerde.deserialize;
import static com.facebook.presto.geospatial.serde.EsriGeometrySerde.deserializeEnvelope;
import static com.facebook.presto.geospatial.serde.EsriGeometrySerde.serialize;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.openjdk.jmh.annotations.Mode.Throughput;

Expand Down
14 changes: 7 additions & 7 deletions ...toolkit/src/test/java/com/facebook/presto/geospatial/serde/TestGeometrySerialization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
import org.locationtech.jts.io.WKTReader;
import org.testng.annotations.Test;

import static com.facebook.presto.geospatial.serde.GeometrySerde.createFromEsriGeometry;
import static com.facebook.presto.geospatial.serde.GeometrySerde.deserialize;
import static com.facebook.presto.geospatial.serde.GeometrySerde.deserializeEnvelope;
import static com.facebook.presto.geospatial.serde.GeometrySerde.deserializeType;
import static com.facebook.presto.geospatial.serde.GeometrySerde.serialize;
import static com.facebook.presto.geospatial.serde.EsriGeometrySerde.createFromEsriGeometry;
import static com.facebook.presto.geospatial.serde.EsriGeometrySerde.deserialize;
import static com.facebook.presto.geospatial.serde.EsriGeometrySerde.deserializeEnvelope;
import static com.facebook.presto.geospatial.serde.EsriGeometrySerde.deserializeType;
import static com.facebook.presto.geospatial.serde.EsriGeometrySerde.serialize;
import static com.facebook.presto.geospatial.serde.GeometrySerializationType.ENVELOPE;
import static com.facebook.presto.geospatial.serde.GeometrySerializationType.GEOMETRY_COLLECTION;
import static com.facebook.presto.geospatial.serde.GeometrySerializationType.LINE_STRING;
Expand Down Expand Up @@ -208,9 +208,9 @@ private static void testCrossSerialization(String wkt)
OGCGeometry esriGeometry = OGCGeometry.fromText(wkt);

Slice jtsSerialized = JtsGeometrySerde.serialize(jtsGeometry);
Slice esriSerialized = GeometrySerde.serialize(esriGeometry);
Slice esriSerialized = EsriGeometrySerde.serialize(esriGeometry);

OGCGeometry esriFromJts = GeometrySerde.deserialize(jtsSerialized);
OGCGeometry esriFromJts = EsriGeometrySerde.deserialize(jtsSerialized);
Geometry jtsFromEsri = JtsGeometrySerde.deserialize(esriSerialized);
assertGeometryEquals(esriFromJts, esriGeometry);
assertGeometryEquals(jtsFromEsri, jtsGeometry);
Expand Down
4 changes: 2 additions & 2 deletions presto-geospatial/src/main/java/com/facebook/presto/plugin/geospatial/BingTileFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
import static com.facebook.presto.geospatial.GeometryUtils.getEnvelope;
import static com.facebook.presto.geospatial.GeometryUtils.getPointCount;
import static com.facebook.presto.geospatial.GeometryUtils.isPointOrRectangle;
import static com.facebook.presto.geospatial.serde.GeometrySerde.deserialize;
import static com.facebook.presto.geospatial.serde.GeometrySerde.serialize;
import static com.facebook.presto.geospatial.serde.EsriGeometrySerde.deserialize;
import static com.facebook.presto.geospatial.serde.EsriGeometrySerde.serialize;
import static com.facebook.presto.plugin.geospatial.BingTile.MAX_ZOOM_LEVEL;
import static com.facebook.presto.plugin.geospatial.GeometryType.GEOMETRY_TYPE_NAME;
import static com.facebook.presto.spi.StandardErrorCode.INVALID_FUNCTION_ARGUMENT;
Expand Down
Loading