diff --git a/MapControl/Shared/StereographicProjection.cs b/MapControl/Shared/StereographicProjection.cs index 18bbc2a8..bd489754 100644 --- a/MapControl/Shared/StereographicProjection.cs +++ b/MapControl/Shared/StereographicProjection.cs @@ -50,15 +50,15 @@ namespace MapControl var phi0 = LatitudeOfOrigin * Math.PI / 180d; // φ1 var phi1 = latitude * Math.PI / 180d; var phi2 = (latitude + 1e-3) * Math.PI / 180d; - var dLambda = (longitude - CentralMeridian) * Math.PI / 180d; // λ - λ0 + var lambda = (longitude - CentralMeridian) * Math.PI / 180d; // λ - λ0 var sinPhi0 = Math.Sin(phi0); var cosPhi0 = Math.Cos(phi0); var sinPhi1 = Math.Sin(phi1); var cosPhi1 = Math.Cos(phi1); var sinPhi2 = Math.Sin(phi2); var cosPhi2 = Math.Cos(phi2); - var sinLambda = Math.Sin(dLambda); - var cosLambda = Math.Cos(dLambda); + var sinLambda = Math.Sin(lambda); + var cosLambda = Math.Cos(lambda); var k1 = 2d / (1d + sinPhi0 * sinPhi1 + cosPhi0 * cosPhi1 * cosLambda); var k2 = 2d / (1d + sinPhi0 * sinPhi2 + cosPhi0 * cosPhi2 * cosLambda); var c = k2 * cosPhi2 - k1 * cosPhi1; @@ -89,13 +89,13 @@ namespace MapControl { var phi0 = LatitudeOfOrigin * Math.PI / 180d; // φ1 var phi = latitude * Math.PI / 180d; // φ - var dLambda = (longitude - CentralMeridian) * Math.PI / 180d; // λ - λ0 + var lambda = (longitude - CentralMeridian) * Math.PI / 180d; // λ - λ0 var sinPhi0 = Math.Sin(phi0); var cosPhi0 = Math.Cos(phi0); var sinPhi = Math.Sin(phi); var cosPhi = Math.Cos(phi); - var sinLambda = Math.Sin(dLambda); - var cosPhiCosLambda = cosPhi * Math.Cos(dLambda); + var sinLambda = Math.Sin(lambda); + var cosPhiCosLambda = cosPhi * Math.Cos(lambda); var x = cosPhi * sinLambda; var y = cosPhi0 * sinPhi - sinPhi0 * cosPhiCosLambda; var k = 2d / (1d + sinPhi0 * sinPhi + cosPhi0 * cosPhiCosLambda); // p.157 (21-4), k0 == 1 diff --git a/MapControl/Shared/TransverseMercatorProjection.cs b/MapControl/Shared/TransverseMercatorProjection.cs index b48e681c..98a4dea4 100644 --- a/MapControl/Shared/TransverseMercatorProjection.cs +++ b/MapControl/Shared/TransverseMercatorProjection.cs @@ -70,11 +70,11 @@ namespace MapControl // φ var phi = latitude * Math.PI / 180d; // λ - λ0 - var dLambda = (longitude - CentralMeridian) * Math.PI / 180d; + var lambda = (longitude - CentralMeridian) * Math.PI / 180d; // γ calculation for the sphere is sufficiently accurate // - return Math.Atan(Math.Tan(dLambda) * Math.Sin(phi)) * 180d / Math.PI; + return Math.Atan(Math.Tan(lambda) * Math.Sin(phi)) * 180d / Math.PI; } public override Matrix RelativeTransform(double latitude, double longitude) @@ -83,16 +83,16 @@ namespace MapControl var phi = latitude * Math.PI / 180d; var sinPhi = Math.Sin(phi); // λ - λ0 - var dLambda = (longitude - CentralMeridian) * Math.PI / 180d; - var cosLambda = Math.Cos(dLambda); - var tanLambda = Math.Tan(dLambda); + var lambda = (longitude - CentralMeridian) * Math.PI / 180d; + var cosLambda = Math.Cos(lambda); + var tanLambda = Math.Tan(lambda); // t var t = Math.Sinh(Atanh(sinPhi) - f2 * Atanh(f2 * sinPhi)); var u = Math.Sqrt(1d + t * t); // ξ' var xi_ = Math.Atan2(t, cosLambda); // η' - var eta_ = Atanh(Math.Sin(dLambda) / u); + var eta_ = Atanh(Math.Sin(lambda) / u); // σ var sigma = 1 + 2d * a1 * Math.Cos(2d * xi_) * Math.Cosh(2d * eta_) + @@ -124,11 +124,11 @@ namespace MapControl // t var t = Math.Sinh(Atanh(sinPhi) - f2 * Atanh(f2 * sinPhi)); // λ - λ0 - var dLambda = (longitude - CentralMeridian) * Math.PI / 180d; + var lambda = (longitude - CentralMeridian) * Math.PI / 180d; // ξ' - var xi_ = Math.Atan2(t, Math.Cos(dLambda)); + var xi_ = Math.Atan2(t, Math.Cos(lambda)); // η' - var eta_ = Atanh(Math.Sin(dLambda) / Math.Sqrt(1d + t * t)); + var eta_ = Atanh(Math.Sin(lambda) / Math.Sqrt(1d + t * t)); // k0 * A var k0A = ScaleFactor * EquatorialRadius * f1; @@ -171,11 +171,11 @@ namespace MapControl d2 * Math.Sin(4d * chi) + d3 * Math.Sin(6d * chi); // λ - λ0 - var dLambda = Math.Atan2(Math.Sinh(eta_), Math.Cos(xi_)); + var lambda = Math.Atan2(Math.Sinh(eta_), Math.Cos(xi_)); return new Location( phi * 180d / Math.PI, - dLambda * 180d / Math.PI + CentralMeridian); + lambda * 180d / Math.PI + CentralMeridian); } #if NETFRAMEWORK diff --git a/MapControl/Shared/TransverseMercatorProjectionSnyder.cs b/MapControl/Shared/TransverseMercatorProjectionSnyder.cs index cd47232b..f08b0505 100644 --- a/MapControl/Shared/TransverseMercatorProjectionSnyder.cs +++ b/MapControl/Shared/TransverseMercatorProjectionSnyder.cs @@ -40,11 +40,11 @@ namespace MapControl // φ var phi = latitude * Math.PI / 180d; // λ - λ0 - var dLambda = (longitude - CentralMeridian) * Math.PI / 180d; + var lambda = (longitude - CentralMeridian) * Math.PI / 180d; // γ calculation for the sphere is sufficiently accurate // - return Math.Atan(Math.Tan(dLambda) * Math.Sin(phi)) * 180d / Math.PI; + return Math.Atan(Math.Tan(lambda) * Math.Sin(phi)) * 180d / Math.PI; } public override Matrix RelativeTransform(double latitude, double longitude) @@ -58,13 +58,13 @@ namespace MapControl var sinPhi = Math.Sin(phi); var cosPhi = Math.Cos(phi); var tanPhi = sinPhi / cosPhi; - var dLambda = (longitude - CentralMeridian) * Math.PI / 180d; + var lambda = (longitude - CentralMeridian) * Math.PI / 180d; var e2 = (2d - Flattening) * Flattening; var e_2 = e2 / (1d - e2); // (8-12) var T = tanPhi * tanPhi; // (8-13) var C = e_2 * cosPhi * cosPhi; // (8-14) - var A = dLambda * cosPhi; // (8-15) + var A = lambda * cosPhi; // (8-15) var A2 = A * A; var A4 = A2 * A2; var A6 = A2 * A4; @@ -73,7 +73,7 @@ namespace MapControl (5d - 4d * T + 42d * C + 13d * C * C - 28d * e_2) * A4 / 24d + (61d - 148d * T + 16 * T * T) * A6 / 720d; // (8-11) - gamma = Math.Atan(Math.Tan(dLambda) * sinPhi) * 180d / Math.PI; + gamma = Math.Atan(Math.Tan(lambda) * sinPhi) * 180d / Math.PI; } var transform = new Matrix(k, 0d, 0d, k, 0d, 0d); @@ -161,12 +161,12 @@ namespace MapControl var phi = phi0 - N1 * tanPhi0 / R1 * (D2 / 2d - (5d + 3d * T1 + 10d * C1 - 4d * C1 * C1 - 9d * e_2) * D4 / 24d + (61d + 90d * T1 + 45d * T1 * T1 + 298 * C1 - 3d * C1 * C1 - 252d * e_2) * D6 / 720d); // (8-17) - var dLambda = (D - (1d + 2d * T1 + C1) * D3 / 6d + + var lambda = (D - (1d + 2d * T1 + C1) * D3 / 6d + (5d - 2d * C1 - 3d * C1 * C1 + 28d * T1 + 24d * T1 * T1 + 8d * e_2) * D5 / 120d) / cosPhi0; // (8-18) return new Location( phi * 180d / Math.PI, - dLambda * 180d / Math.PI + CentralMeridian); + lambda * 180d / Math.PI + CentralMeridian); } private double MeridianDistance(double phi)