rework box2d/3d: support SRID, streamline and cleanup, rework equals/hashCode implementations, use a epsilon for comparing coordinates, cleanup.

Author: sebasbaumh

.classpath

@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
-			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
-			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
+			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

.settings/org.eclipse.wst.common.component

@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-        
+            
+    
     <wb-module deploy-name="postgis-java-ng">
-                
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-                
+                        
+        
         <wb-resource deploy-path="/" source-path="/src/main/resources"/>
-            
-    </wb-module>
+        <wb-resource deploy-path="/" source-path="/src/main/java"/>
+                    
 
+    </wb-module>
+        
+
 </project-modules>

README.md

@@ -16,6 +16,7 @@ It is originally based on [postgis-java](https://github.com/postgis/postgis-java
 **Project goals and improvements:**
 * Support for geometries containing arcs like `CIRCULARSTRING` or `CURVEPOLYGON`
 * Support for PostGIS [geography datatype](https://postgis.net/docs/using_postgis_dbmanagement.html#PostGIS_Geography)
+* Extended support for bounding boxes, i.e. box2/box3 PostGIS data types (as PGbox2d/PGbox3d).
 * Use generic Java types where possible and simplify/streamline API
 * Clean up code to basically only work on [WKB](https://en.wikipedia.org/wiki/Well-known_text#Well-known_binary)/EWKB implementations to reduce code duplication and focus on the actual database format
 * Support for the latest PostgreSQL and PostGIS versions
@@ -37,6 +38,8 @@ It is originally based on [postgis-java](https://github.com/postgis/postgis-java
 * MultiPolygon
 * MultiSurface
 * GeometryCollection
+* [box2d](https://postgis.net/docs/box2d_type.html)
+* [box3d](https://postgis.net/docs/box3d_type.html)
 
 ## How to use it ##
 There is a Maven artifact in the official Maven repository, so just add this to your Maven POM:
@@ -45,11 +48,11 @@ There is a Maven artifact in the official Maven repository, so just add this to
 <dependency>
 	<groupId>io.github.sebasbaumh</groupId>
 	<artifactId>postgis-java-ng</artifactId>
-	<version>22.0.1</version>
+	<version>22.1.0</version>
 </dependency>
 ```
 
-The version reflects the year of the release, e.g. `22.0.0` is a version released in 2022.
+The version reflects the year of the release, e.g. `22.1.0` is a version released in 2022.
 
 The API differs a bit from [postgis-java](https://github.com/postgis/postgis-java) with the main point being a different namespace (`io.github.sebasbaumh.postgis`) as publishing a project to Maven Central requires to own that namespace.
 In addition the class structure is a bit different (see below) to support arc geometries and reduce boilerplate code, but you should be able to adapt to it easily.
@@ -80,4 +83,16 @@ Or add the following Maven build parameters to the launch configuration in eclip
 |`testJdbcUsername`|`unittest`|
 |`testJdbcPassword`|`CHANGEME`|
 
+If it works, you will see this line in the build output:
+
+```
+Tests are running with a database
+```
+
+else
+
+```
+Tests are running without a database
+```
+
 *There are also local tests contained in the project, so you are still able to test most parts without specifying a PostgreSQL server. And the test console output will show if tests were run with or without a database.*

pom.xml

@@ -3,7 +3,7 @@
 	<groupId>io.github.sebasbaumh</groupId>
 	<artifactId>postgis-java-ng</artifactId>
 	<!-- version for release -->
-	<version>22.0.2-SNAPSHOT</version>
+	<version>22.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>PostGIS Java bindings</name>
 	<description>This project contains Java bindings for using PostGIS geometries coming from a PostgreSQL database.</description>

src/main/java/io/github/sebasbaumh/postgis/CompoundCurve.java

@@ -130,8 +130,8 @@ public void close()
 	@Override
 	public boolean equals(@Nullable Object other)
 	{
-		// check parent
-		if (super.equals(other) && (other instanceof CompoundCurve))
+		// check type and parent
+		if ((other instanceof CompoundCurve) && super.equals(other))
 		{
 			CompoundCurve cother = (CompoundCurve) other;
 			return PostGisUtil.equalsIterable(this.subgeoms, cother.subgeoms);
@@ -216,7 +216,7 @@ public Point getStartPoint()
 	@Override
 	public int hashCode()
 	{
-		return subgeoms.hashCode();
+		return 31 * super.hashCode() + subgeoms.hashCode();
 	}
 
 	/*

src/main/java/io/github/sebasbaumh/postgis/Geometry.java

@@ -117,9 +117,9 @@ public boolean equals(@Nullable Object obj)
 		{
 			return false;
 		}
-		// check all properties specific to this instance
+		// check all properties specific to this instance, rest is checked by subclasses
 		Geometry other = (Geometry) obj;
-		return other.getClass().equals(this.getClass()) && (this.type == other.type) && (this.srid == other.srid);
+		return (this.type == other.type) && (this.srid == other.srid);
 	}
 
 	/**
@@ -128,18 +128,6 @@ public boolean equals(@Nullable Object obj)
 	 */
 	public abstract Iterable<Point> getCoordinates();
 
-	/**
-	 * Queries the number of geometric dimensions of this geometry. This does not include measures, as opposed to the
-	 * server.
-	 * @deprecated use {@link #is3d()} instead
-	 * @return The dimensionality (eg, 2D or 3D) of this geometry.
-	 */
-	@Deprecated
-	public int getDimension()
-	{
-		return is3d() ? 3 : 2;
-	}
-
 	/**
 	 * Gets the number of coordinates of this {@link Geometry}.
 	 * @return number of coordinates
@@ -192,17 +180,6 @@ public int hashCode()
 	 */
 	public abstract boolean isEmpty();
 
-	/**
-	 * Return the number of Points of the geometry
-	 * @return number of points in the geometry
-	 * @deprecated use {@link #getNumberOfCoordinates()} instead
-	 */
-	@Deprecated
-	public final int numPoints()
-	{
-		return this.getNumberOfCoordinates();
-	}
-
 	/**
 	 * Recursively sets the srid on this geometry and all contained subgeometries
 	 * @param srid the SRID for this geometry

src/main/java/io/github/sebasbaumh/postgis/LineString.java

@@ -140,8 +140,8 @@ public void close()
 	@Override
 	public boolean equals(@Nullable Object other)
 	{
-		// check parent
-		if (super.equals(other) && (other instanceof LineString))
+		// check type and parent
+		if ((other instanceof LineString) && super.equals(other))
 		{
 			LineString ls = (LineString) other;
 			// check all points

src/main/java/io/github/sebasbaumh/postgis/MultiGeometry.java

@@ -79,8 +79,8 @@ public boolean checkConsistency()
 	@Override
 	public boolean equals(@Nullable Object other)
 	{
-		// check parent
-		if (super.equals(other) && (other instanceof MultiGeometry<?>))
+		// check type and parent
+		if ((other instanceof MultiGeometry<?>) && super.equals(other))
 		{
 			MultiGeometry<?> cother = (MultiGeometry<?>) other;
 			return PostGisUtil.equalsIterable(this.subgeoms, cother.subgeoms);
@@ -133,7 +133,7 @@ public int getNumberOfCoordinates()
 	@Override
 	public int hashCode()
 	{
-		return subgeoms.hashCode();
+		return 31 * super.hashCode() + subgeoms.hashCode();
 	}
 
 	/*

src/main/java/io/github/sebasbaumh/postgis/PGbox2d.java

@@ -29,12 +29,18 @@
 
 import java.sql.SQLException;
 
+import org.postgresql.util.PGobject;
+
 /**
  * BOX2D representing the maximum extents of the geometry.
  * @author Sebastian Baumhekel
  */
 public class PGbox2d extends PGboxbase
 {
+	/**
+	 * Type of the {@link PGobject}.
+	 */
+	private static final String PG_TYPE = "box2d";
 	/* JDK 1.5 Serialization */
 	private static final long serialVersionUID = 0x100;
 
@@ -43,7 +49,7 @@ public class PGbox2d extends PGboxbase
 	 */
 	public PGbox2d()
 	{
-		super();
+		super(PG_TYPE);
 	}
 
 	/**
@@ -53,7 +59,7 @@ public PGbox2d()
 	 */
 	public PGbox2d(Point llb, Point urt)
 	{
-		super(llb, urt);
+		super(PG_TYPE, llb, urt);
 	}
 
 	/**
@@ -63,13 +69,13 @@ public PGbox2d(Point llb, Point urt)
 	 */
 	public PGbox2d(String value) throws SQLException
 	{
-		super(value);
+		super(PG_TYPE, value);
 	}
 
 	@Override
-	public String getPGtype()
+	public PGbox2d clone()
 	{
-		return "box2d";
+		return new PGbox2d(llb.copy(), urt.copy());
 	}
 
 	@Override
@@ -79,9 +85,9 @@ public String getPrefix()
 	}
 
 	@Override
-	protected PGboxbase newInstance()
+	public boolean is3d()
 	{
-		return new PGbox2d();
+		return false;
 	}
 
 	@Override

src/main/java/io/github/sebasbaumh/postgis/PGbox3d.java

@@ -30,12 +30,18 @@
 
 import java.sql.SQLException;
 
+import org.postgresql.util.PGobject;
+
 /**
  * BOX3D representing the maximum extents of the geometry.
  * @author Sebastian Baumhekel
  */
 public class PGbox3d extends PGboxbase
 {
+	/**
+	 * Type of the {@link PGobject}.
+	 */
+	private static final String PG_TYPE = "box3d";
 	/* JDK 1.5 Serialization */
 	private static final long serialVersionUID = 0x100;
 
@@ -44,7 +50,7 @@ public class PGbox3d extends PGboxbase
 	 */
 	public PGbox3d()
 	{
-		super();
+		super(PG_TYPE);
 	}
 
 	/**
@@ -54,7 +60,7 @@ public PGbox3d()
 	 */
 	public PGbox3d(Point llb, Point urt)
 	{
-		super(llb, urt);
+		super(PG_TYPE, llb, urt);
 	}
 
 	/**
@@ -64,13 +70,13 @@ public PGbox3d(Point llb, Point urt)
 	 */
 	public PGbox3d(String value) throws SQLException
 	{
-		super(value);
+		super(PG_TYPE, value);
 	}
 
 	@Override
-	public String getPGtype()
+	public PGbox3d clone()
 	{
-		return "box3d";
+		return new PGbox3d(llb.copy(), urt.copy());
 	}
 
 	@Override
@@ -80,8 +86,18 @@ public String getPrefix()
 	}
 
 	@Override
-	protected PGboxbase newInstance()
+	public boolean is3d()
 	{
-		return new PGbox3d();
+		return true;
 	}
+
+	/**
+	 * Gets this {@link Point} as a 2d object.
+	 * @return {@link Point}
+	 */
+	public PGbox2d to2d()
+	{
+		return new PGbox2d(llb.to2d(), urt.to2d());
+	}
+
 }