ETRS89, ellipsoid names and reciprocal flattening, prime meridian names

Author: bosborn

CHANGELOG.md

@@ -7,6 +7,10 @@ Adheres to [Semantic Versioning](http://semver.org/).
 ## 1.1.1 (TBD)
 
 * Java 11
+* ETRS89 GeoDatums enumeration
+* Additional included names in Ellipsoids
+* Ellipsoids saved reciprocal flattening value
+* Prime Meridians name capitalizations
 
 ## [1.1.0](https://github.com/ngageoint/coordinate-reference-systems-java/releases/tag/1.1.0) (10-14-2021)
 

src/main/java/mil/nga/crs/geo/Ellipsoids.java

@@ -1,6 +1,6 @@
 package mil.nga.crs.geo;
 
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -259,14 +259,8 @@ public enum Ellipsoids {
 			nameTypes.put(type.getShortName().toLowerCase(), type);
 			for (String name : type.getNames()) {
 				String lowercaseName = name.toLowerCase();
-				nameTypes.put(lowercaseName, type);
-				int index = lowercaseName.indexOf("(");
-				if (index > -1) {
-					String namePrefix = lowercaseName.substring(0, index)
-							.trim();
-					if (!nameTypes.containsKey(namePrefix)) {
-						nameTypes.put(namePrefix, type);
-					}
+				if (!nameTypes.containsKey(lowercaseName)) {
+					nameTypes.put(lowercaseName, type);
 				}
 			}
 		}
@@ -275,7 +269,7 @@ public enum Ellipsoids {
 	/**
 	 * Names
 	 */
-	private final List<String> names;
+	private final List<String> names = new ArrayList<>();
 
 	/**
 	 * Short name
@@ -292,6 +286,11 @@ public enum Ellipsoids {
 	 */
 	private final double poleRadius;
 
+	/**
+	 * Reciprocal flattening
+	 */
+	private final double reciprocalFlattening;
+
 	/**
 	 * Eccentricity
 	 */
@@ -319,8 +318,16 @@ public enum Ellipsoids {
 	private Ellipsoids(String shortName, double equatorRadius,
 			double poleRadius, double reciprocalFlattening, String... names) {
 		this.shortName = shortName;
-		this.names = Arrays.asList(names);
 		this.equatorRadius = equatorRadius;
+		this.reciprocalFlattening = reciprocalFlattening;
+
+		for (String name : names) {
+			int index = name.indexOf("(");
+			if (index > -1) {
+				this.names.add(name.substring(0, index).trim());
+			}
+			this.names.add(name);
+		}
 
 		if (poleRadius == 0.0 && reciprocalFlattening == 0.0) {
 			throw new CRSException(
@@ -340,28 +347,6 @@ private Ellipsoids(String shortName, double equatorRadius,
 		this.eccentricity = Math.sqrt(this.eccentricity2);
 	}
 
-	/**
-	 * Constructor
-	 * 
-	 * @param shortName
-	 *            short name
-	 * @param equatorRadius
-	 *            equator radius
-	 * @param eccentricity2
-	 *            eccentricity squared
-	 * @param names
-	 *            names
-	 */
-	private Ellipsoids(String shortName, double equatorRadius,
-			double eccentricity2, String... names) {
-		this.shortName = shortName;
-		this.names = Arrays.asList(names);
-		this.equatorRadius = equatorRadius;
-		this.eccentricity2 = eccentricity2;
-		this.poleRadius = equatorRadius * Math.sqrt(1.0 - eccentricity2);
-		this.eccentricity = Math.sqrt(eccentricity2);
-	}
-
 	/**
 	 * Get the name
 	 * 
@@ -398,6 +383,16 @@ public double getEquatorRadius() {
 		return equatorRadius;
 	}
 
+	/**
+	 * Get the reciprocal flattening
+	 * 
+	 * @return reciprocal flattening
+	 * @since 1.1.1
+	 */
+	public double getReciprocalFlattening() {
+		return reciprocalFlattening;
+	}
+
 	/**
 	 * Get the a
 	 * 

src/main/java/mil/nga/crs/geo/GeoDatums.java

@@ -31,6 +31,13 @@ public enum GeoDatums {
 	 */
 	NAD83("NAD83", 0, 0, 0, Ellipsoids.GRS80, "North American Datum 1983"),
 
+	/**
+	 * European Terrestrial Reference System 1989 ensemble
+	 */
+	ETRS89("ETRS89", 0, 0, 0, Ellipsoids.GRS80,
+			"European Terrestrial Reference System 1989",
+			"European Terrestrial Reference System 1989 ensemble"),
+
 	/**
 	 * North American Datum 1927
 	 */

src/main/java/mil/nga/crs/geo/PrimeMeridians.java

@@ -14,67 +14,67 @@ public enum PrimeMeridians {
 	/**
 	 * Greenwich
 	 */
-	GREENWICH("greenwich", 0),
+	GREENWICH("Greenwich", 0),
 
 	/**
 	 * Lisbon
 	 */
-	LISBON("lisbon", true, 9, 7, 54.862),
+	LISBON("Lisbon", true, 9, 7, 54.862),
 
 	/**
 	 * Paris
 	 */
-	PARIS("paris", false, 2, 20, 14.025),
+	PARIS("Paris", false, 2, 20, 14.025),
 
 	/**
 	 * Bogota
 	 */
-	BOGOTA("bogota", true, 74, 04, 51.3),
+	BOGOTA("Bogota", true, 74, 04, 51.3),
 
 	/**
 	 * Madrid
 	 */
-	MADRID("madrid", true, 3, 41, 16.58),
+	MADRID("Madrid", true, 3, 41, 16.58),
 
 	/**
 	 * Rome
 	 */
-	ROME("rome", false, 12, 27, 8.4),
+	ROME("Rome", false, 12, 27, 8.4),
 
 	/**
 	 * Bern
 	 */
-	BERN("bern", false, 7, 26, 22.5),
+	BERN("Bern", false, 7, 26, 22.5),
 
 	/**
 	 * Jakarta
 	 */
-	JAKARTA("jakarta", false, 106, 48, 27.79),
+	JAKARTA("Jakarta", false, 106, 48, 27.79),
 
 	/**
 	 * Ferro
 	 */
-	FERRO("ferro", true, 17, 40, 0),
+	FERRO("Ferro", true, 17, 40, 0),
 
 	/**
 	 * Brussels
 	 */
-	BRUSSELS("brussels", false, 4, 22, 4.71),
+	BRUSSELS("Brussels", false, 4, 22, 4.71),
 
 	/**
 	 * Stockholm
 	 */
-	STOCKHOLM("stockholm", false, 18, 3, 29.8),
+	STOCKHOLM("Stockholm", false, 18, 3, 29.8),
 
 	/**
 	 * Athens
 	 */
-	ATHENS("athens", false, 23, 42, 58.815),
+	ATHENS("Athens", false, 23, 42, 58.815),
 
 	/**
 	 * Oslo
 	 */
-	OSLO("oslo", false, 10, 43, 22.5);
+	OSLO("Oslo", false, 10, 43, 22.5);
 
 	/**
 	 * Name to prime meridians type mapping

src/main/java/mil/nga/crs/util/proj/ProjParser.java

@@ -269,7 +269,8 @@ private static void updateDatum(ProjParams params, GeoDatum geoDatum,
 
 		GeoDatums commonGeoDatum = GeoDatums.fromName(geoDatum.getName());
 
-		if (commonGeoDatum != null) {
+		// Check for special cases like EPSG 3035 which specify the ellipsoid
+		if (commonGeoDatum != null && commonGeoDatum != GeoDatums.ETRS89) {
 			updateDatum(params, geoDatum, commonGeoDatum, mapProjection);
 		} else {
 			updateEllipsoid(params, geoDatum.getEllipsoid());
@@ -478,7 +479,7 @@ private static void updatePrimeMeridian(ProjParams params,
 					.fromName(primeMeridian.getName());
 			if (commonPrimeMeridian != null) {
 				if (commonPrimeMeridian != PrimeMeridians.GREENWICH) {
-					params.setPm(commonPrimeMeridian.getName());
+					params.setPm(commonPrimeMeridian.getName().toLowerCase());
 				}
 			} else {
 				params.setPm(convert(primeMeridian.getLongitude(),