method and parameter parsing updates

Author: bosborn

src/main/java/mil/nga/crs/projected/MapProjectionMethods.java

@@ -69,15 +69,17 @@ public enum MapProjectionMethods {
 	 * Lambert Conic Conformal (1SP)
 	 */
 	LAMBERT_CONIC_CONFORMAL_1SP("Lambert Conic Conformal (1SP)",
-			new String[] { "Lambert Conic Conformal", "LCC" }, 9801, 8801, 8802,
-			8805, 8806, 8807),
+			new String[] { "Lambert Conic Conformal", "LCC",
+					"Lambert Conformal Conic 1SP" },
+			9801, 8801, 8802, 8805, 8806, 8807),
 
 	/**
 	 * Lambert Conic Conformal (2SP)
 	 */
 	LAMBERT_CONIC_CONFORMAL_2SP("Lambert Conic Conformal (2SP)",
-			new String[] { "Lambert Conic Conformal", "LCC" }, 9802, 8821, 8822,
-			8823, 8824, 8826, 8827),
+			new String[] { "Lambert Conic Conformal", "LCC",
+					"Lambert Conformal Conic 2SP" },
+			9802, 8821, 8822, 8823, 8824, 8826, 8827),
 
 	/**
 	 * Lambert Cylindrical Equal Area (Spherical)
@@ -260,7 +262,9 @@ private MapProjectionMethods(String name, String[] aliases, int code,
 	 */
 	private void addAlias(String alias) {
 		aliases.add(alias);
-		aliases.add(alias.replaceAll(" ", "_"));
+		String underscore = alias.replaceAll(" ", "_");
+		aliases.add(underscore);
+		aliases.add(underscore.replace("(", "").replace(")", ""));
 	}
 
 	/**

src/main/java/mil/nga/crs/projected/MapProjectionParameters.java

@@ -45,8 +45,8 @@ public enum MapProjectionParameters {
 	 * application of false coordinates has grid coordinates of (0,0).
 	 */
 	LONGITUDE_OF_NATURAL_ORIGIN(8802, "longitude of natural origin",
-			UnitType.ANGLEUNIT, "longitude of origin", "central meridian",
-			"longitude of center"),
+			UnitType.ANGLEUNIT, "longitude of origin", "longitude of center",
+			"central meridian"),
 
 	/**
 	 * 
@@ -145,7 +145,8 @@ public enum MapProjectionParameters {
 	 * which grid coordinate values false easting and false northing are defined
 	 */
 	LONGITUDE_OF_FALSE_ORIGIN(8822, "longitude of false origin",
-			UnitType.ANGLEUNIT, "longitude of origin"),
+			UnitType.ANGLEUNIT, "longitude of origin", "longitude of center",
+			"central meridian"),
 
 	/**
 	 * geodetic latitude of one of the parallels of intersection of the cone
@@ -155,7 +156,7 @@ public enum MapProjectionParameters {
 	 * Scale is true along this parallel.
 	 */
 	LATITUDE_OF_1ST_STANDARD_PARALLEL(8823, "latitude of 1st standard parallel",
-			UnitType.ANGLEUNIT),
+			UnitType.ANGLEUNIT, "standard parallel 1"),
 
 	/**
 	 * 
@@ -166,7 +167,7 @@ public enum MapProjectionParameters {
 	 * Scale is true along this parallel.
 	 */
 	LATITUDE_OF_2ND_STANDARD_PARALLEL(8824, "latitude of 2nd standard parallel",
-			UnitType.ANGLEUNIT),
+			UnitType.ANGLEUNIT, "standard parallel 2"),
 
 	/**
 	 * easting value assigned to the false origin

src/test/java/mil/nga/proj/ProjectionFactoryEpsgTest.java

@@ -253,6 +253,76 @@ public void test3857() {
 
 	}
 
+	/**
+	 * Test EPSG 3978
+	 */
+	@Test
+	public void test3978() {
+
+		final long code = 3978;
+
+		String definition = "PROJCRS[\"NAD83 / Canada Atlas Lambert\",BASEGEOGCRS[\"NAD83\","
+				+ "DATUM[\"North American Datum 1983\","
+				+ "ELLIPSOID[\"GRS 1980\",6378137,298.257222101,ID[\"EPSG\",7019]],"
+				+ "ID[\"EPSG\",6269]],ID[\"EPSG\",4269]],"
+				+ "CONVERSION[\"Canada Atlas Lambert\",METHOD[\"Lambert Conic Conformal (2SP)\",ID[\"EPSG\",9802]],"
+				+ "PARAMETER[\"Latitude of false origin\",49,ANGLEUNIT[\"degree\",0.0174532925199433,ID[\"EPSG\",9102]]],"
+				+ "PARAMETER[\"Longitude of false origin\",-95,ANGLEUNIT[\"degree\",0.0174532925199433,ID[\"EPSG\",9102]]],"
+				+ "PARAMETER[\"Latitude of 1st standard parallel\",49,ANGLEUNIT[\"degree\",0.0174532925199433,ID[\"EPSG\",9102]]],"
+				+ "PARAMETER[\"Latitude of 2nd standard parallel\",77,ANGLEUNIT[\"degree\",0.0174532925199433,ID[\"EPSG\",9102]]],"
+				+ "PARAMETER[\"Easting at false origin\",0,LENGTHUNIT[\"metre\",1,ID[\"EPSG\",9001]]],"
+				+ "PARAMETER[\"Northing at false origin\",0,LENGTHUNIT[\"metre\",1,ID[\"EPSG\",9001]]],"
+				+ "ID[\"EPSG\",3977]],CS[Cartesian,2,ID[\"EPSG\",4400]],"
+				+ "AXIS[\"Easting (E)\",east],AXIS[\"Northing (N)\",north],"
+				+ "LENGTHUNIT[\"metre\",1,ID[\"EPSG\",9001]],ID[\"EPSG\",3978]]";
+
+		projectionTestDerived(code, definition);
+
+		definition = "PROJCS[\"NAD83 / Canada Atlas Lambert\",GEOGCS[\"NAD83\","
+				+ "DATUM[\"North_American_Datum_1983\","
+				+ "SPHEROID[\"GRS 1980\",6378137,298.257222101,AUTHORITY[\"EPSG\",\"7019\"]],"
+				+ "TOWGS84[0,0,0,0,0,0,0],AUTHORITY[\"EPSG\",\"6269\"]],"
+				+ "PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",\"8901\"]],"
+				+ "UNIT[\"degree\",0.0174532925199433,"
+				+ "AUTHORITY[\"EPSG\",\"9122\"]],"
+				+ "AUTHORITY[\"EPSG\",\"4269\"]],"
+				+ "PROJECTION[\"Lambert_Conformal_Conic_2SP\"],"
+				+ "PARAMETER[\"standard_parallel_1\",49],"
+				+ "PARAMETER[\"standard_parallel_2\",77],"
+				+ "PARAMETER[\"latitude_of_origin\",49],"
+				+ "PARAMETER[\"central_meridian\",-95],"
+				+ "PARAMETER[\"false_easting\",0],"
+				+ "PARAMETER[\"false_northing\",0],"
+				+ "UNIT[\"metre\",1,AUTHORITY[\"EPSG\",\"9001\"]],"
+				+ "AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORTH],"
+				+ "AUTHORITY[\"EPSG\",\"3978\"]]";
+
+		projectionTestDerived(code, definition);
+
+		definition = "PROJCS[\"NAD83 / Canada Atlas Lambert\",GEOGCRS[\"NAD83\","
+				+ "DATUM[\"North_American_Datum_1983\","
+				+ "SPHEROID[\"GRS 1980\",6378137,298.257222101,"
+				+ "ID[\"EPSG\",\"7019\"]],"
+				+ "ABRIDGEDTRANSFORMATION[0,0,0,0,0,0,0],"
+				+ "ID[\"EPSG\",\"6269\"]],"
+				+ "PRIMEM[\"Greenwich\",0,ID[\"EPSG\",\"8901\"]],"
+				+ "UNIT[\"degree\",0.0174532925199433,ID[\"EPSG\",\"9122\"]],"
+				+ "ID[\"EPSG\",\"4269\"]],"
+				+ "PROJECTION[\"Lambert_Conformal_Conic_2SP\"],"
+				+ "PARAMETER[\"standard_parallel_1\",49],"
+				+ "PARAMETER[\"standard_parallel_2\",77],"
+				+ "PARAMETER[\"latitude_of_origin\",49],"
+				+ "PARAMETER[\"central_meridian\",-95],"
+				+ "PARAMETER[\"false_easting\",0],"
+				+ "PARAMETER[\"false_northing\",0],"
+				+ "UNIT[\"metre\",1,ID[\"EPSG\",\"9001\"]],"
+				+ "AXIS[\"Easting\",EAST],AXIS[\"Northing\",NORTH],"
+				+ "ID[\"EPSG\",\"3978\"]]";
+
+		projectionTestDerived(code, definition);
+
+	}
+
 	/**
 	 * Test EPSG 4326
 	 */