methods for abstract multi curves and multi surfaces

Author: bosborn

src/main/java/mil/nga/sf/MultiCurve.java

@@ -1,5 +1,7 @@
 package mil.nga.sf;
 
+import java.util.List;
+
 /**
  * A restricted form of GeometryCollection where each Geometry in the collection
  * must be of type Curve.
@@ -22,6 +24,65 @@ protected MultiCurve(GeometryType type, boolean hasZ, boolean hasM) {
 		super(type, hasZ, hasM);
 	}
 
+	/**
+	 * Get the curves
+	 * 
+	 * @return curves
+	 */
+	public List<T> getCurves() {
+		return getGeometries();
+	}
+
+	/**
+	 * Set the curves
+	 * 
+	 * @param curves
+	 *            curves
+	 */
+	public void setCurves(List<T> curves) {
+		setGeometries(curves);
+	}
+
+	/**
+	 * Add a curve
+	 * 
+	 * @param curve
+	 *            curve
+	 */
+	public void addCurve(T curve) {
+		addGeometry(curve);
+	}
+
+	/**
+	 * Add curves
+	 * 
+	 * @param curves
+	 *            curves
+	 */
+	public void addCurves(List<T> curves) {
+		addGeometries(curves);
+	}
+
+	/**
+	 * Get the number of curves
+	 * 
+	 * @return number of curves
+	 */
+	public int numCurves() {
+		return numGeometries();
+	}
+
+	/**
+	 * Returns the Nth curve
+	 * 
+	 * @param n
+	 *            nth line curve to return
+	 * @return curve
+	 */
+	public T getCurve(int n) {
+		return getGeometry(n);
+	}
+
 	/**
 	 * Determine if this Multi Curve is closed for each Curve (start point = end
 	 * point)

src/main/java/mil/nga/sf/MultiLineString.java

@@ -72,7 +72,7 @@ public MultiLineString(MultiLineString multiLineString) {
 	 * @return line strings
 	 */
 	public List<LineString> getLineStrings() {
-		return getGeometries();
+		return getCurves();
 	}
 
 	/**
@@ -82,7 +82,7 @@ public List<LineString> getLineStrings() {
 	 *            line strings
 	 */
 	public void setLineStrings(List<LineString> lineStrings) {
-		setGeometries(lineStrings);
+		setCurves(lineStrings);
 	}
 
 	/**
@@ -92,7 +92,7 @@ public void setLineStrings(List<LineString> lineStrings) {
 	 *            line string
 	 */
 	public void addLineString(LineString lineString) {
-		addGeometry(lineString);
+		addCurve(lineString);
 	}
 
 	/**
@@ -102,7 +102,7 @@ public void addLineString(LineString lineString) {
 	 *            line strings
 	 */
 	public void addLineStrings(List<LineString> lineStrings) {
-		addGeometries(lineStrings);
+		addCurves(lineStrings);
 	}
 
 	/**
@@ -111,7 +111,7 @@ public void addLineStrings(List<LineString> lineStrings) {
 	 * @return number of line strings
 	 */
 	public int numLineStrings() {
-		return numGeometries();
+		return numCurves();
 	}
 
 	/**
@@ -122,7 +122,7 @@ public int numLineStrings() {
 	 * @return line string
 	 */
 	public LineString getLineString(int n) {
-		return getGeometry(n);
+		return getCurve(n);
 	}
 
 	/**

src/main/java/mil/nga/sf/MultiPolygon.java

@@ -72,7 +72,7 @@ public MultiPolygon(MultiPolygon multiPolygon) {
 	 * @return polygons
 	 */
 	public List<Polygon> getPolygons() {
-		return getGeometries();
+		return getSurfaces();
 	}
 
 	/**
@@ -82,7 +82,7 @@ public List<Polygon> getPolygons() {
 	 *            polygons
 	 */
 	public void setPolygons(List<Polygon> polygons) {
-		setGeometries(polygons);
+		setSurfaces(polygons);
 	}
 
 	/**
@@ -92,7 +92,7 @@ public void setPolygons(List<Polygon> polygons) {
 	 *            polygon
 	 */
 	public void addPolygon(Polygon polygon) {
-		addGeometry(polygon);
+		addSurface(polygon);
 	}
 
 	/**
@@ -102,7 +102,7 @@ public void addPolygon(Polygon polygon) {
 	 *            polygons
 	 */
 	public void addPolygons(List<Polygon> polygons) {
-		addGeometries(polygons);
+		addSurfaces(polygons);
 	}
 
 	/**
@@ -111,7 +111,7 @@ public void addPolygons(List<Polygon> polygons) {
 	 * @return number of polygons
 	 */
 	public int numPolygons() {
-		return numGeometries();
+		return numSurfaces();
 	}
 
 	/**
@@ -122,7 +122,7 @@ public int numPolygons() {
 	 * @return polygon
 	 */
 	public Polygon getPolygon(int n) {
-		return getGeometry(n);
+		return getSurface(n);
 	}
 
 	/**

src/main/java/mil/nga/sf/MultiSurface.java

@@ -1,5 +1,7 @@
 package mil.nga.sf;
 
+import java.util.List;
+
 /**
  * A restricted form of GeometryCollection where each Geometry in the collection
  * must be of type Surface.
@@ -23,4 +25,63 @@ protected MultiSurface(GeometryType type, boolean hasZ, boolean hasM) {
 		super(type, hasZ, hasM);
 	}
 
+	/**
+	 * Get the surfaces
+	 * 
+	 * @return surfaces
+	 */
+	public List<T> getSurfaces() {
+		return getGeometries();
+	}
+
+	/**
+	 * Set the surfaces
+	 * 
+	 * @param surfaces
+	 *            surfaces
+	 */
+	public void setSurfaces(List<T> surfaces) {
+		setGeometries(surfaces);
+	}
+
+	/**
+	 * Add a surface
+	 * 
+	 * @param surface
+	 *            surface
+	 */
+	public void addSurface(T surface) {
+		addGeometry(surface);
+	}
+
+	/**
+	 * Add surfaces
+	 * 
+	 * @param surfaces
+	 *            surfaces
+	 */
+	public void addSurfaces(List<T> surfaces) {
+		addGeometries(surfaces);
+	}
+
+	/**
+	 * Get the number of surfaces
+	 * 
+	 * @return number of surfaces
+	 */
+	public int numSurfaces() {
+		return numGeometries();
+	}
+
+	/**
+	 * Returns the Nth surface
+	 * 
+	 * @param n
+	 *            nth line surface to return
+	 * @return surface
+	 */
+	public T getSurface(int n) {
+		return getGeometry(n);
+	}
+
 }