include definition parsed crs in the projections

Author: bosborn

src/main/java/mil/nga/proj/Projection.java

@@ -4,6 +4,8 @@
 import org.locationtech.proj4j.units.Unit;
 import org.locationtech.proj4j.units.Units;
 
+import mil.nga.crs.CRS;
+
 /**
  * Single Projection for an authority and code
  * 
@@ -22,7 +24,7 @@ public class Projection {
 	private final String code;
 
 	/**
-	 * Coordinate Reference System
+	 * Projection Coordinate Reference System
 	 */
 	private final CoordinateReferenceSystem crs;
 
@@ -31,6 +33,11 @@ public class Projection {
 	 */
 	private final String definition;
 
+	/**
+	 * Definition parsed Coordinate Reference System
+	 */
+	private final CRS definitionCRS;
+
 	/**
 	 * Constructor
 	 *
@@ -39,7 +46,7 @@ public class Projection {
 	 * @param code
 	 *            coordinate code
 	 * @param crs
-	 *            crs
+	 *            projection coordinate reference system
 	 */
 	public Projection(String authority, long code,
 			CoordinateReferenceSystem crs) {
@@ -54,7 +61,7 @@ public Projection(String authority, long code,
 	 * @param code
 	 *            coordinate code
 	 * @param crs
-	 *            crs
+	 *            projection coordinate reference system
 	 */
 	public Projection(String authority, String code,
 			CoordinateReferenceSystem crs) {
@@ -69,13 +76,13 @@ public Projection(String authority, String code,
 	 * @param code
 	 *            coordinate code
 	 * @param crs
-	 *            crs
+	 *            projection coordinate reference system
 	 * @param definition
 	 *            well-known text coordinate definition
 	 */
 	public Projection(String authority, long code,
 			CoordinateReferenceSystem crs, String definition) {
-		this(authority, String.valueOf(code), crs, definition);
+		this(authority, code, crs, definition, null);
 	}
 
 	/**
@@ -86,12 +93,52 @@ public Projection(String authority, long code,
 	 * @param code
 	 *            coordinate code
 	 * @param crs
-	 *            crs
+	 *            projection coordinate reference system
 	 * @param definition
 	 *            well-known text coordinate definition
 	 */
 	public Projection(String authority, String code,
 			CoordinateReferenceSystem crs, String definition) {
+		this(authority, code, crs, definition, null);
+	}
+
+	/**
+	 * Constructor
+	 * 
+	 * @param authority
+	 *            coordinate authority
+	 * @param code
+	 *            coordinate code
+	 * @param crs
+	 *            projection coordinate reference system
+	 * @param definition
+	 *            well-known text coordinate definition
+	 * @param definitionCRS
+	 *            definition parsed coordinate reference system
+	 */
+	public Projection(String authority, long code,
+			CoordinateReferenceSystem crs, String definition,
+			CRS definitionCRS) {
+		this(authority, String.valueOf(code), crs, definition, definitionCRS);
+	}
+
+	/**
+	 * Constructor
+	 * 
+	 * @param authority
+	 *            coordinate authority
+	 * @param code
+	 *            coordinate code
+	 * @param crs
+	 *            projection coordinate reference system
+	 * @param definition
+	 *            well-known text coordinate definition
+	 * @param definitionCRS
+	 *            definition parsed coordinate reference system
+	 */
+	public Projection(String authority, String code,
+			CoordinateReferenceSystem crs, String definition,
+			CRS definitionCRS) {
 		if (authority == null || code == null || crs == null) {
 			throw new IllegalArgumentException(
 					"All projection arguments are required. authority: "
@@ -101,6 +148,7 @@ public Projection(String authority, String code,
 		this.code = code;
 		this.crs = crs;
 		this.definition = definition;
+		this.definitionCRS = definitionCRS;
 	}
 
 	/**
@@ -124,7 +172,7 @@ public String getCode() {
 	/**
 	 * Get the Coordinate Reference System
 	 * 
-	 * @return Coordinate Reference System
+	 * @return coordinate reference system
 	 */
 	public CoordinateReferenceSystem getCrs() {
 		return crs;
@@ -139,6 +187,15 @@ public String getDefinition() {
 		return definition;
 	}
 
+	/**
+	 * Get the definition parsed Coordinate Reference System
+	 * 
+	 * @return coordinate reference system
+	 */
+	public CRS getDefinitionCRS() {
+		return definitionCRS;
+	}
+
 	/**
 	 * Get the transformation from this Projection to the EPSG code. Each thread
 	 * of execution should have it's own transformation.

src/main/java/mil/nga/proj/ProjectionFactory.java

@@ -298,21 +298,21 @@ public static Projection getProjectionByDefinition(String definition) {
 
 		if (definition != null && !definition.isEmpty()) {
 
-			CRS crsObject = null;
+			CRS definitionCRS = null;
 			try {
-				crsObject = CRSReader.read(definition);
+				definitionCRS = CRSReader.read(definition);
 			} catch (IOException e) {
 				throw new ProjectionException(
 						"Failed to parse definition: " + definition, e);
 			}
 
-			if (crsObject != null) {
+			if (definitionCRS != null) {
 
 				String authority = null;
 				String code = null;
 
-				if (crsObject.hasIdentifiers()) {
-					Identifier identifier = crsObject.getIdentifier(0);
+				if (definitionCRS.hasIdentifiers()) {
+					Identifier identifier = definitionCRS.getIdentifier(0);
 					authority = identifier.getName();
 					code = identifier.getUniqueIdentifier();
 				}
@@ -347,10 +347,10 @@ public static Projection getProjectionByDefinition(String definition) {
 				if (projection == null) {
 
 					CoordinateReferenceSystem crs = CRSParser
-							.convert(crsObject);
+							.convert(definitionCRS);
 					if (crs != null) {
 						projection = new Projection(authority, code, crs,
-								definition);
+								definition, definitionCRS);
 						if (cache) {
 							projections.addProjection(projection);
 						}
@@ -451,10 +451,14 @@ private static Projection fromDefinition(String authority, String code,
 		if (definition != null && !definition.isEmpty()) {
 
 			try {
-				CoordinateReferenceSystem crs = CRSParser.parse(definition);
+				CoordinateReferenceSystem crs = null;
+				CRS definitionCRS = CRSReader.read(definition);
+				if (definitionCRS != null) {
+					crs = CRSParser.convert(definitionCRS);
+				}
 				if (crs != null) {
 					projection = new Projection(authority, code, crs,
-							definition);
+							definition, definitionCRS);
 					projections.addProjection(projection);
 				}
 			} catch (Exception e) {