operation methods and parameters refactor

Author: bosborn

src/main/java/mil/nga/crs/CRS.java

@@ -1,6 +1,8 @@
 package mil.nga.crs;
 
 import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -24,6 +26,12 @@ public abstract class CRS implements ScopeExtentIdentifierRemark {
 	 */
 	private CRSType type = null;
 
+	/**
+	 * Temporary extras that are not included as part of the CRS definition. Not
+	 * included in equality and hashing.
+	 */
+	private Map<String, Object> extras = null;
+
 	/**
 	 * Constructor
 	 */
@@ -73,6 +81,88 @@ public CategoryType getCategoryType() {
 		return categoryType;
 	}
 
+	/**
+	 * Get temporary extras that are not part of the CRS definition
+	 * 
+	 * @return extras
+	 */
+	public Map<String, Object> getExtras() {
+		return extras;
+	}
+
+	/**
+	 * Determine if there are temporary extras that are not part of the CRS
+	 * definition
+	 * 
+	 * @return true if extras
+	 */
+	public boolean hasExtras() {
+		return extras != null && !extras.isEmpty();
+	}
+
+	/**
+	 * Get the number of temporary extras that are not part of the CRS
+	 * definition
+	 * 
+	 * @return number of extras
+	 */
+	public int numExtras() {
+		return extras != null ? extras.size() : 0;
+	}
+
+	/**
+	 * Get the temporary extra with the name
+	 * 
+	 * @param name
+	 *            extra name
+	 * @return extra value or null
+	 */
+	public Object getExtra(String name) {
+		Object extra = null;
+		if (hasExtras()) {
+			extra = extras.get(name);
+		}
+		return extra;
+	}
+
+	/**
+	 * Set the temporary extras that are not part of the CRS definition
+	 * 
+	 * @param extras
+	 *            extras
+	 */
+	public void setExtras(Map<String, Object> extras) {
+		this.extras = extras;
+	}
+
+	/**
+	 * Add the temporary extra which is not part of the CRS definition
+	 * 
+	 * @param name
+	 *            extra name
+	 * @param extra
+	 *            extra value
+	 */
+	public void addExtra(String name, Object extra) {
+		if (extras == null) {
+			extras = new LinkedHashMap<>();
+		}
+		extras.put(name, extra);
+	}
+
+	/**
+	 * Add the temporary extras which are not part of the CRS definition
+	 * 
+	 * @param extras
+	 *            extra values
+	 */
+	public void addExtras(Map<String, Object> extras) {
+		if (this.extras == null) {
+			this.extras = new LinkedHashMap<>();
+		}
+		this.extras.putAll(extras);
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */

src/main/java/mil/nga/crs/operation/CoordinateOperation.java

@@ -50,7 +50,7 @@ public CoordinateOperation(String name, CoordinateReferenceSystem source,
 	 */
 	@Override
 	public OperationType getOperationType() {
-		return OperationType.COORDINATE_OPERATION;
+		return OperationType.COORDINATE;
 	}
 
 	/**

src/main/java/mil/nga/crs/operation/OperationMethod.java

@@ -31,13 +31,18 @@ public class OperationMethod implements Identifiable {
 	/**
 	 * Operation parameters
 	 */
-	private List<Parameter> parameters = null;
+	private List<OperationParameter> parameters = null;
 
 	/**
 	 * Identifiers
 	 */
 	private List<Identifier> identifiers = null;
 
+	/**
+	 * Commonly encountered operation methods
+	 */
+	private OperationMethods method;
+
 	/**
 	 * Constructor
 	 */
@@ -52,7 +57,19 @@ public OperationMethod() {
 	 *            name
 	 */
 	public OperationMethod(String name) {
-		setName(name);
+		this.name = name;
+		updateMethod();
+	}
+
+	/**
+	 * Constructor
+	 * 
+	 * @param method
+	 *            operation method
+	 */
+	public OperationMethod(OperationMethods method) {
+		this.name = method.getName();
+		this.method = method;
 	}
 
 	/**
@@ -72,14 +89,15 @@ public String getName() {
 	 */
 	public void setName(String name) {
 		this.name = name;
+		updateMethod();
 	}
 
 	/**
 	 * Get the parameters
 	 * 
 	 * @return parameters
 	 */
-	public List<Parameter> getParameters() {
+	public List<OperationParameter> getParameters() {
 		return parameters;
 	}
 
@@ -108,7 +126,7 @@ public int numParameters() {
 	 *            parameter index
 	 * @return parameter
 	 */
-	public Parameter getParameter(int index) {
+	public OperationParameter getParameter(int index) {
 		return parameters.get(index);
 	}
 
@@ -118,9 +136,8 @@ public Parameter getParameter(int index) {
 	 * @param parameters
 	 *            parameters
 	 */
-	public void setParameters(List<Parameter> parameters) {
-		this.parameters = null;
-		addParameters(parameters);
+	public void setParameters(List<OperationParameter> parameters) {
+		this.parameters = parameters;
 	}
 
 	/**
@@ -129,7 +146,7 @@ public void setParameters(List<Parameter> parameters) {
 	 * @param parameter
 	 *            parameter
 	 */
-	public void addParameter(Parameter parameter) {
+	public void addParameter(OperationParameter parameter) {
 		if (this.parameters == null) {
 			this.parameters = new ArrayList<>();
 		}
@@ -142,10 +159,11 @@ public void addParameter(Parameter parameter) {
 	 * @param parameters
 	 *            parameters
 	 */
-	public void addParameters(List<Parameter> parameters) {
-		for (Parameter parameter : parameters) {
-			addParameter(parameter);
+	public void addParameters(List<OperationParameter> parameters) {
+		if (this.parameters == null) {
+			this.parameters = new ArrayList<>();
 		}
+		this.parameters.addAll(parameters);
 	}
 
 	/**
@@ -210,6 +228,41 @@ public void addIdentifiers(List<Identifier> identifiers) {
 		this.identifiers.addAll(identifiers);
 	}
 
+	/**
+	 * Get the commonly known method type
+	 * 
+	 * @return method type or null
+	 */
+	public OperationMethods getMethod() {
+		return method;
+	}
+
+	/**
+	 * Is a commonly known method type
+	 * 
+	 * @return true if has common method type
+	 */
+	public boolean hasMethod() {
+		return getMethod() != null;
+	}
+
+	/**
+	 * Set the commonly known method type
+	 * 
+	 * @param method
+	 *            method type or null
+	 */
+	public void setMethod(OperationMethods method) {
+		this.method = method;
+	}
+
+	/**
+	 * Update the commonly known method type using the name
+	 */
+	public void updateMethod() {
+		setMethod(OperationMethods.getMethod(getName()));
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */