additional proj constants

Author: bosborn

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

@@ -258,6 +258,12 @@ public class ProjConstants {
 	 */
 	public static final String AXIS_DOWN = "d";
 
+	/**
+	 * Axis West South Up
+	 */
+	public static final String AXIS_WEST_SOUTH_UP = AXIS_WEST + AXIS_SOUTH
+			+ AXIS_UP;
+
 	/**
 	 * metre units
 	 */
@@ -273,4 +279,29 @@ public class ProjConstants {
 	 */
 	public static final String UNITS_FOOT = "ft";
 
+	/**
+	 * degree units
+	 */
+	public static final String UNITS_DEGREE = "deg";
+
+	/**
+	 * Pseudo Mercator name identifier
+	 */
+	public static final String PSEUDO_MERCATOR = "pseudo";
+
+	/**
+	 * Swiss Oblique Mercator name
+	 */
+	public static final String SWISS_OBLIQUE_MERCATOR = "swiss oblique mercator";
+
+	/**
+	 * Swiis Oblique Mercator backward compatible name
+	 */
+	public static final String SWISS_OBLIQUE_MERCATOR_COMPAT = "hotine_oblique_mercator_azimuth_center";
+
+	/**
+	 * UTM Zone name
+	 */
+	public static final String UTM_ZONE = "utm zone";
+
 }

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

@@ -8,12 +8,6 @@
  */
 public class ProjParams {
 
-	/**
-	 * Axis West South Up
-	 */
-	private static final String axisWestSouthUp = ProjConstants.AXIS_WEST
-			+ ProjConstants.AXIS_SOUTH + ProjConstants.AXIS_UP;
-
 	/**
 	 * proj param
 	 */
@@ -1140,7 +1134,7 @@ public String toString() {
 			value.append("=");
 			value.append(y_0);
 		}
-		if (axis != null && axis.equals(axisWestSouthUp)) {
+		if (axis != null && axis.equals(ProjConstants.AXIS_WEST_SOUTH_UP)) {
 			// Only known PROJ axis specification is wsu
 			value.append(" +");
 			value.append(ProjConstants.PARAM_AXIS);

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

@@ -37,31 +37,6 @@
  */
 public class ProjParser {
 
-	/**
-	 * Pseudo Mercator name check
-	 */
-	private static final String pseudoMercatorNameCheck = "pseudo";
-
-	/**
-	 * Degree Unit name check
-	 */
-	private static final String degreeUnitNameCheck = "deg";
-
-	/**
-	 * Swiss Oblique Mercator name
-	 */
-	private static final String swissObliqueMercatorName = "swiss oblique mercator";
-
-	/**
-	 * Swiis Oblique Mercator backward compatible name
-	 */
-	private static final String swissObliqueMercatorCompatName = "hotine_oblique_mercator_azimuth_center";
-
-	/**
-	 * UTM Zone name
-	 */
-	private static final String utmZoneName = "utm zone";
-
 	/**
 	 * Parse crs well-known text into PROJ params
 	 *
@@ -321,7 +296,7 @@ private static void updateDatum(ProjParams params, GeoDatum geoDatum,
 		if (commonGeoDatum == GeoDatums.WGS84 && method.hasMethod() && method
 				.getMethod() == OperationMethods.POPULAR_VISUALISATION_PSEUDO_MERCATOR
 				&& mapProjection.getName().toLowerCase()
-						.contains(pseudoMercatorNameCheck)) {
+						.contains(ProjConstants.PSEUDO_MERCATOR)) {
 			updateSphericalEllipsoid(params,
 					geoDatum.getEllipsoid().getSemiMajorAxisText());
 		} else {
@@ -524,8 +499,9 @@ private static void updateProj(ProjParams params,
 		Unit unit = coordinateSystem.getAxisUnit();
 
 		if (unit != null && (unit.getType() == UnitType.ANGLEUNIT
-				|| (unit.getType() == UnitType.UNIT && unit.getName()
-						.toLowerCase().startsWith(degreeUnitNameCheck)))) {
+				|| (unit.getType() == UnitType.UNIT
+						&& unit.getName().toLowerCase()
+								.startsWith(ProjConstants.UNITS_DEGREE)))) {
 			params.setProj(ProjConstants.NAME_LONGLAT);
 		} else {
 			params.setProj(ProjConstants.NAME_MERC);
@@ -574,9 +550,9 @@ private static void updateProj(ProjParams params,
 
 			case HOTINE_OBLIQUE_MERCATOR_B:
 				if (mapProjection.getName().toLowerCase()
-						.contains(swissObliqueMercatorName)
-						|| method.getName().toLowerCase()
-								.contains(swissObliqueMercatorCompatName)) {
+						.contains(ProjConstants.SWISS_OBLIQUE_MERCATOR)
+						|| method.getName().toLowerCase().contains(
+								ProjConstants.SWISS_OBLIQUE_MERCATOR_COMPAT)) {
 					params.setProj(ProjConstants.NAME_SOMERC);
 				} else {
 					params.setProj(ProjConstants.NAME_OMERC);
@@ -626,7 +602,7 @@ private static void updateProj(ProjParams params,
 			case TRANSVERSE_MERCATOR:
 			case TRANSVERSE_MERCATOR_SOUTH_ORIENTATED:
 				if (mapProjection.getName().toLowerCase()
-						.contains(utmZoneName)) {
+						.contains(ProjConstants.UTM_ZONE)) {
 					params.setProj(ProjConstants.NAME_UTM);
 				} else {
 					params.setProj(ProjConstants.NAME_TMERC);
@@ -729,9 +705,10 @@ private static void updateParams(ProjParams params,
 			MapProjection mapProjection, Unit unit) {
 
 		String name = mapProjection.getName();
-		int index = name.toLowerCase().indexOf(utmZoneName);
+		int index = name.toLowerCase().indexOf(ProjConstants.UTM_ZONE);
 		if (index > -1) {
-			String utm = name.substring(index + utmZoneName.length()).trim();
+			String utm = name.substring(index + ProjConstants.UTM_ZONE.length())
+					.trim();
 			String[] parts = utm.split("\\s+");
 			boolean south = false;
 			if (parts.length > 0) {