Skip to content

Commit 3edad14

Browse files
committed
HHH-14757 Use geolatte's JTSUtils
1 parent fe1f89d commit 3edad14

File tree

3 files changed

+36
-133
lines changed

3 files changed

+36
-133
lines changed

hibernate-spatial/src/main/java/org/hibernate/spatial/JTSGeometryJavaTypeDescriptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
import java.util.Locale;
1111

12-
import org.hibernate.spatial.jts.JTSUtils;
1312
import org.hibernate.type.descriptor.WrapperOptions;
1413
import org.hibernate.type.descriptor.java.AbstractTypeDescriptor;
1514
import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
1615

16+
import org.geolatte.geom.jts.JTSUtils;
1717
import org.locationtech.jts.geom.Geometry;
1818
import org.locationtech.jts.io.ParseException;
1919
import org.locationtech.jts.io.WKTReader;

hibernate-spatial/src/main/java/org/hibernate/spatial/jts/JTSUtils.java

Lines changed: 0 additions & 132 deletions
This file was deleted.
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* Hibernate, Relational Persistence for Idiomatic Java
3+
*
4+
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
5+
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
6+
*/
7+
8+
package org.hibernate.spatial.geometry;
9+
10+
import org.hibernate.testing.TestForIssue;
11+
import org.junit.Ignore;
12+
import org.junit.Test;
13+
14+
import org.geolatte.geom.codec.Wkt;
15+
import org.geolatte.geom.jts.JTS;
16+
import org.locationtech.jts.geom.Geometry;
17+
import org.geolatte.geom.jts.JTSUtils;
18+
19+
import static org.junit.Assert.assertTrue;
20+
21+
public class JTSUtilsTest {
22+
23+
@Test
24+
@TestForIssue(jiraKey = "HHH-14757")
25+
public void testGeometryCollection() {
26+
Geometry elem2a = JTS.to( Wkt.fromWkt( "GEOMETRYCOLLECTION(POINT(2 3),LINESTRING(2 3,3 4))" ) );
27+
Geometry elem2b = JTS.to( Wkt.fromWkt( "GEOMETRYCOLLECTION(POINT(2 3),LINESTRING(2 3,3 4))" ) );
28+
Geometry elem1a = JTS.to( Wkt.fromWkt( "GEOMETRYCOLLECTION(POINT(2 3))" ) );
29+
Geometry elem1b = JTS.to( Wkt.fromWkt( "GEOMETRYCOLLECTION(POINT(2 3))" ) );
30+
31+
assertTrue( JTSUtils.equalsExact3D( elem2a, elem2b ) );
32+
assertTrue( JTSUtils.equalsExact3D( elem1a, elem1b ) );
33+
}
34+
35+
}

0 commit comments

Comments
 (0)