extended geometry collection support

bosborn · bosborn · commit 8316eec9c204 · 2018-04-23T13:42:24.000-06:00
diff --git a/src/main/java/mil/nga/sf/GeometryCollection.java b/src/main/java/mil/nga/sf/GeometryCollection.java
@@ -167,6 +167,8 @@ public GeometryType getCollectionType() {
 		case MULTIPOLYGON:
 			break;
 		case GEOMETRYCOLLECTION:
+		case MULTICURVE:
+		case MULTISURFACE:
 			if (isMultiPoint()) {
 				geometryType = GeometryType.MULTIPOINT;
 			} else if (isMultiLineString()) {
diff --git a/src/main/java/mil/nga/sf/extended/ExtendedGeometryCollection.java b/src/main/java/mil/nga/sf/extended/ExtendedGeometryCollection.java
@@ -0,0 +1,128 @@
+package mil.nga.sf.extended;
+
+import mil.nga.sf.Geometry;
+import mil.nga.sf.GeometryCollection;
+import mil.nga.sf.GeometryType;
+import mil.nga.sf.util.SFException;
+
+/**
+ * Extended Geometry Collection providing abstract geometry collection type
+ * support
+ * 
+ * @author osbornb
+ *
+ * @param <T>
+ *            geometry type
+ */
+public class ExtendedGeometryCollection<T extends Geometry> extends
+		GeometryCollection<T> {
+
+	/**
+	 * Extended geometry collection geometry type
+	 */
+	private GeometryType geometryType = GeometryType.GEOMETRYCOLLECTION;
+
+	/**
+	 * Constructor, wraps a geometry collection as extended
+	 * 
+	 * @param geometryCollection
+	 */
+	public ExtendedGeometryCollection(GeometryCollection<T> geometryCollection) {
+		super(GeometryType.GEOMETRYCOLLECTION, geometryCollection.hasZ(),
+				geometryCollection.hasM());
+		setGeometries(geometryCollection.getGeometries());
+		updateGeometryType();
+	}
+
+	/**
+	 * Copy Constructor
+	 * 
+	 * @param extendedGeometryCollection
+	 *            extended geometry collection to copy
+	 */
+	public ExtendedGeometryCollection(
+			ExtendedGeometryCollection<T> extendedGeometryCollection) {
+		super(GeometryType.GEOMETRYCOLLECTION, extendedGeometryCollection
+				.hasZ(), extendedGeometryCollection.hasM());
+		for (T geometry : extendedGeometryCollection.getGeometries()) {
+			@SuppressWarnings("unchecked")
+			T geometryCopy = (T) geometry.copy();
+			addGeometry(geometryCopy);
+		}
+		geometryType = extendedGeometryCollection.getGeometryType();
+	}
+
+	/**
+	 * Update the extended geometry type based upon the contained geometries
+	 */
+	public void updateGeometryType() {
+		GeometryType geometryType = getCollectionType();
+		switch (geometryType) {
+		case GEOMETRYCOLLECTION:
+		case MULTICURVE:
+		case MULTISURFACE:
+			break;
+		case MULTIPOINT:
+			geometryType = GeometryType.GEOMETRYCOLLECTION;
+			break;
+		case MULTILINESTRING:
+			geometryType = GeometryType.MULTICURVE;
+			break;
+		case MULTIPOLYGON:
+			geometryType = GeometryType.MULTISURFACE;
+			break;
+		default:
+			throw new SFException(
+					"Unsupported extended geometry collection geometry type: "
+							+ geometryType);
+		}
+		this.geometryType = geometryType;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public GeometryType getGeometryType() {
+		return geometryType;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Geometry copy() {
+		return new ExtendedGeometryCollection<T>(this);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = super.hashCode();
+		result = prime * result
+				+ ((geometryType == null) ? 0 : geometryType.hashCode());
+		return result;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (!super.equals(obj))
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		@SuppressWarnings("unchecked")
+		ExtendedGeometryCollection<T> other = (ExtendedGeometryCollection<T>) obj;
+		if (geometryType != other.geometryType)
+			return false;
+		return true;
+	}
+
+}
diff --git a/src/main/java/mil/nga/sf/util/GeometryEnvelopeBuilder.java b/src/main/java/mil/nga/sf/util/GeometryEnvelopeBuilder.java
@@ -100,6 +100,8 @@ public static void buildEnvelope(Geometry geometry,
 			addPolygon(envelope, (Triangle) geometry);
 			break;
 		case GEOMETRYCOLLECTION:
+		case MULTICURVE:
+		case MULTISURFACE:
 			updateHasZandM(envelope, geometry);
 			@SuppressWarnings("unchecked")
 			GeometryCollection<Geometry> geomCollection = (GeometryCollection<Geometry>) geometry;
diff --git a/src/main/java/mil/nga/sf/util/GeometryPrinter.java b/src/main/java/mil/nga/sf/util/GeometryPrinter.java
@@ -78,6 +78,8 @@ public static String getGeometryString(Geometry geometry) {
 			addPolygonMessage(message, (Triangle) geometry);
 			break;
 		case GEOMETRYCOLLECTION:
+		case MULTICURVE:
+		case MULTISURFACE:
 			@SuppressWarnings("unchecked")
 			GeometryCollection<Geometry> geomCollection = (GeometryCollection<Geometry>) geometry;
 			message.append("Geometries: " + geomCollection.numGeometries());
diff --git a/src/main/java/mil/nga/sf/util/GeometryUtils.java b/src/main/java/mil/nga/sf/util/GeometryUtils.java
@@ -71,6 +71,8 @@ public static int getDimension(Geometry geometry) {
 			dimension = 2;
 			break;
 		case GEOMETRYCOLLECTION:
+		case MULTICURVE:
+		case MULTISURFACE:
 			@SuppressWarnings("unchecked")
 			GeometryCollection<Geometry> geomCollection = (GeometryCollection<Geometry>) geometry;
 			List<Geometry> geometries = geomCollection.getGeometries();
@@ -184,6 +186,8 @@ public static void minimizeGeometry(Geometry geometry, double maxX) {
 			minimize((Triangle) geometry, maxX);
 			break;
 		case GEOMETRYCOLLECTION:
+		case MULTICURVE:
+		case MULTISURFACE:
 			@SuppressWarnings("unchecked")
 			GeometryCollection<Geometry> geomCollection = (GeometryCollection<Geometry>) geometry;
 			for (Geometry subGeometry : geomCollection.getGeometries()) {
@@ -378,6 +382,8 @@ public static void normalizeGeometry(Geometry geometry, double maxX) {
 			normalize((Triangle) geometry, maxX);
 			break;
 		case GEOMETRYCOLLECTION:
+		case MULTICURVE:
+		case MULTISURFACE:
 			@SuppressWarnings("unchecked")
 			GeometryCollection<Geometry> geomCollection = (GeometryCollection<Geometry>) geometry;
 			for (Geometry subGeometry : geomCollection.getGeometries()) {
diff --git a/src/main/java/mil/nga/sf/util/centroid/CentroidCurve.java b/src/main/java/mil/nga/sf/util/centroid/CentroidCurve.java
@@ -72,6 +72,8 @@ public void add(Geometry geometry) {
 			addLineStrings(compoundCurve.getLineStrings());
 			break;
 		case GEOMETRYCOLLECTION:
+		case MULTICURVE:
+		case MULTISURFACE:
 			@SuppressWarnings("unchecked")
 			GeometryCollection<Geometry> geomCollection = (GeometryCollection<Geometry>) geometry;
 			List<Geometry> geometries = geomCollection.getGeometries();
diff --git a/src/main/java/mil/nga/sf/util/centroid/CentroidPoint.java b/src/main/java/mil/nga/sf/util/centroid/CentroidPoint.java
@@ -64,6 +64,8 @@ public void add(Geometry geometry) {
 			}
 			break;
 		case GEOMETRYCOLLECTION:
+		case MULTICURVE:
+		case MULTISURFACE:
 			@SuppressWarnings("unchecked")
 			GeometryCollection<Geometry> geomCollection = (GeometryCollection<Geometry>) geometry;
 			List<Geometry> geometries = geomCollection.getGeometries();
diff --git a/src/main/java/mil/nga/sf/util/centroid/CentroidSurface.java b/src/main/java/mil/nga/sf/util/centroid/CentroidSurface.java
@@ -86,6 +86,8 @@ public void add(Geometry geometry) {
 			add(polyhedralSurface.getPolygons());
 			break;
 		case GEOMETRYCOLLECTION:
+		case MULTICURVE:
+		case MULTISURFACE:
 			@SuppressWarnings("unchecked")
 			GeometryCollection<Geometry> geomCollection = (GeometryCollection<Geometry>) geometry;
 			List<Geometry> geometries = geomCollection.getGeometries();
@@ -158,8 +160,7 @@ private void add(CurvePolygon<Curve> curvePolygon) {
 			add((LineString) curve);
 			break;
 		default:
-			throw new SFException("Unexpected Curve Type: "
-					+ curveGeometryType);
+			throw new SFException("Unexpected Curve Type: " + curveGeometryType);
 		}
 
 		for (int i = 1; i < rings.size(); i++) {
diff --git a/src/test/java/mil/nga/sf/test/GeometryCollectionTest.java b/src/test/java/mil/nga/sf/test/GeometryCollectionTest.java
@@ -16,6 +16,7 @@
 import mil.nga.sf.Point;
 import mil.nga.sf.Polygon;
 import mil.nga.sf.Surface;
+import mil.nga.sf.extended.ExtendedGeometryCollection;
 
 import org.junit.Test;
 
@@ -82,6 +83,15 @@ public void testMultiPoint() throws IOException {
 		TestCase.assertEquals(geometryCollection2,
 				geometryCollection.getAsGeometryCollection());
 
+		ExtendedGeometryCollection<Geometry> extendedGeometryCollection = new ExtendedGeometryCollection<>(
+				geometryCollection);
+		TestCase.assertEquals(GeometryType.GEOMETRYCOLLECTION,
+				extendedGeometryCollection.getGeometryType());
+		TestCase.assertEquals(GeometryType.MULTIPOINT,
+				extendedGeometryCollection.getCollectionType());
+		TestCase.assertEquals(extendedGeometryCollection,
+				new ExtendedGeometryCollection<>(geometryCollection));
+
 	}
 
 	@Test
@@ -143,6 +153,15 @@ public void testMultiLineString() throws IOException {
 				.getAsMultiCurve();
 		TestCase.assertEquals(multiCurve, multiCurve2);
 
+		ExtendedGeometryCollection<Geometry> extendedGeometryCollection = new ExtendedGeometryCollection<>(
+				geometryCollection);
+		TestCase.assertEquals(GeometryType.MULTICURVE,
+				extendedGeometryCollection.getGeometryType());
+		TestCase.assertEquals(GeometryType.MULTILINESTRING,
+				extendedGeometryCollection.getCollectionType());
+		TestCase.assertEquals(extendedGeometryCollection,
+				new ExtendedGeometryCollection<>(geometryCollection));
+
 	}
 
 	@Test
@@ -202,6 +221,14 @@ public void testMultiPolygon() throws IOException {
 				.getAsMultiSurface();
 		TestCase.assertEquals(multiSurface, multiSurface2);
 
+		ExtendedGeometryCollection<Geometry> extendedGeometryCollection = new ExtendedGeometryCollection<>(
+				geometryCollection);
+		TestCase.assertEquals(GeometryType.MULTISURFACE,
+				extendedGeometryCollection.getGeometryType());
+		TestCase.assertEquals(GeometryType.MULTIPOLYGON,
+				extendedGeometryCollection.getCollectionType());
+		TestCase.assertEquals(extendedGeometryCollection,
+				new ExtendedGeometryCollection<>(geometryCollection));
 	}
 
 	@Test
@@ -257,6 +284,15 @@ public void testMultiCurve() throws IOException {
 		TestCase.assertEquals(geometryCollection2,
 				geometryCollection.getAsGeometryCollection());
 
+		ExtendedGeometryCollection<Geometry> extendedGeometryCollection = new ExtendedGeometryCollection<>(
+				geometryCollection);
+		TestCase.assertEquals(GeometryType.MULTICURVE,
+				extendedGeometryCollection.getGeometryType());
+		TestCase.assertEquals(GeometryType.MULTICURVE,
+				extendedGeometryCollection.getCollectionType());
+		TestCase.assertEquals(extendedGeometryCollection,
+				new ExtendedGeometryCollection<>(geometryCollection));
+
 	}
 
 	@Test
@@ -313,6 +349,15 @@ public void testMultiSurface() throws IOException {
 		TestCase.assertEquals(geometryCollection2,
 				geometryCollection.getAsGeometryCollection());
 
+		ExtendedGeometryCollection<Surface> extendedGeometryCollection = new ExtendedGeometryCollection<>(
+				multiSurface);
+		TestCase.assertEquals(GeometryType.MULTISURFACE,
+				extendedGeometryCollection.getGeometryType());
+		TestCase.assertEquals(GeometryType.MULTISURFACE,
+				extendedGeometryCollection.getCollectionType());
+		TestCase.assertEquals(extendedGeometryCollection,
+				new ExtendedGeometryCollection<>(geometryCollection));
+
 	}
 
 }
diff --git a/src/test/java/mil/nga/sf/test/SFTestUtils.java b/src/test/java/mil/nga/sf/test/SFTestUtils.java
@@ -93,6 +93,8 @@ public static void compareGeometries(Geometry expected, Geometry actual) {
 						(MultiPolygon) actual);
 				break;
 			case GEOMETRYCOLLECTION:
+			case MULTICURVE:
+			case MULTISURFACE:
 				compareGeometryCollection((GeometryCollection<?>) expected,
 						(GeometryCollection<?>) actual);
 				break;
@@ -108,12 +110,6 @@ public static void compareGeometries(Geometry expected, Geometry actual) {
 				compareCurvePolygon((CurvePolygon<?>) expected,
 						(CurvePolygon<?>) actual);
 				break;
-			case MULTICURVE:
-				TestCase.fail("Unexpected Geometry Type of "
-						+ geometryType.name() + " which is abstract");
-			case MULTISURFACE:
-				TestCase.fail("Unexpected Geometry Type of "
-						+ geometryType.name() + " which is abstract");
 			case CURVE:
 				TestCase.fail("Unexpected Geometry Type of "
 						+ geometryType.name() + " which is abstract");

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,8 @@ public void add(Geometry geometry) {`
`64`	`64`	`}`
`65`	`65`	`break;`
`66`	`66`	`case GEOMETRYCOLLECTION:`
	`67`	`+ case MULTICURVE:`
	`68`	`+ case MULTISURFACE:`
`67`	`69`	`@SuppressWarnings("unchecked")`
`68`	`70`	`GeometryCollection<Geometry> geomCollection = (GeometryCollection<Geometry>) geometry;`
`69`	`71`	`List<Geometry> geometries = geomCollection.getGeometries();`