WGS 84 geometry math cleanup

kiselev-dv · Jun 26, 2017 · a519ec8 · a519ec8
1 parent bbd68ad
commit a519ec8
Showing 1 changed file with 16 additions and 42 deletions.
diff --git a/src/org/osm2world/core/math/WGS84Util.java b/src/org/osm2world/core/math/WGS84Util.java
@@ -3,11 +3,17 @@
 import org.osm2world.core.map_data.creation.LatLon;
 
 public class WGS84Util {
+
+	private static final double WGS84_A = 6378137.0;
+	private static final double WGS84_B = 6356752.3142451793;
+
 	private static final VectorXYZ oneOverRadiiSquared = new VectorXYZ(
-			2.458172257647332e-14, 2.458172257647332e-14, 2.4747391015697002e-14);
+			1.0 / (WGS84_A * WGS84_A), 
+			1.0 / (WGS84_A * WGS84_A), 
+			1.0 / (WGS84_B * WGS84_B));
 
 	private static final VectorXYZ wgs84RadiiSquared = 
-			new VectorXYZ(6378137.0 * 6378137.0, 6378137.0 * 6378137.0, 6356752.3142451793 * 6356752.3142451793);
+			new VectorXYZ(WGS84_A * WGS84_A, WGS84_A * WGS84_A, WGS84_B * WGS84_B);
 
 	public static VectorXYZ cartesianFromLatLon(LatLon origin, double height) {
 		double latitude = Math.toRadians(origin.lat);
@@ -20,21 +26,21 @@ public static VectorXYZ cartesianFromLatLon(LatLon origin, double height) {
         		cosLatitude * Math.sin(longitude),
         		Math.sin(latitude));
 
-        scratchN = normalize(scratchN);
+        scratchN = scratchN.normalize();
 
         VectorXYZ scratchK = mulByComponents(radiiSquared, scratchN);
-        double gamma = Math.sqrt(dot(scratchN, scratchK));
-        scratchK = divideByScalar(scratchK, gamma);
-        scratchN = multiplyByScalar(scratchN, height);
+        double gamma = Math.sqrt(scratchN.dot(scratchK));
+        scratchK = scratchK.mult(1.0 / gamma);
+        scratchN = scratchN.mult(height);
 
-        return add(scratchK, scratchN);
+        return scratchK.add(scratchN);
 	}
 
 	public static double[] eastNorthUpToFixedFrame(VectorXYZ cartesian) {
 
 		VectorXYZ normal = geodeticSurfaceNormal(cartesian);
-		VectorXYZ tangent = normalize(new VectorXYZ(-cartesian.y, cartesian.x, 0.0));
-		VectorXYZ bitangent = cross(normal, tangent);
+		VectorXYZ tangent = new VectorXYZ(-cartesian.y, cartesian.x, 0.0).normalize();
+		VectorXYZ bitangent = normal.cross(tangent);
 
 		// Matrix 4x4 by columns 
 		return new double[] {
@@ -57,45 +63,13 @@ public static double[] eastNorthUpToFixedFrame(VectorXYZ cartesian) {
 		};
 	}
 
-	public static VectorXYZ add(VectorXYZ left, VectorXYZ right) {
-		return new VectorXYZ(left.x + right.x, left.y + right.y, left.z + right.z);
-	}
-
-	public static VectorXYZ divideByScalar(VectorXYZ vector, double scalar) {
-		return new VectorXYZ(vector.x / scalar, vector.y / scalar, vector.z / scalar);
-	}
-
-	public static VectorXYZ multiplyByScalar(VectorXYZ vector, double scalar) {
-		return new VectorXYZ(vector.x * scalar, vector.y * scalar, vector.z * scalar);
-	}
-
-	public static double dot(VectorXYZ left, VectorXYZ right) {
-		return left.x * right.x + left.y * right.y + left.z * right.z;
-	}
-
 	public static VectorXYZ geodeticSurfaceNormal(VectorXYZ cartesian) {
 		VectorXYZ mulByComponents = mulByComponents(cartesian, oneOverRadiiSquared);
-		return normalize(mulByComponents);
-	}
-
-	public static VectorXYZ cross(VectorXYZ left, VectorXYZ right) {
-		double x = left.y * right.z - left.z * right.y;
-		double y = left.z * right.x - left.x * right.z;
-		double z = left.x * right.y - left.y * right.x;
-
-		return new VectorXYZ(x, y, z);
+		return mulByComponents.normalize();
 	}
 
 	public static VectorXYZ mulByComponents(VectorXYZ a, VectorXYZ b) {
 		return new VectorXYZ(a.x * b.x, a.y * b.y, a.z * b.z);
 	}
 
-	public static VectorXYZ normalize(VectorXYZ a) {
-		double m = magnitude(a);
-		return new VectorXYZ(a.x / m, a.y / m, a.z / m);
-	}
-
-	public static double magnitude(VectorXYZ a) {
-		return Math.sqrt(a.x * a.x + a.y * a.y + a.z * a.z);
-	}
 }