|
@@ -123,7 +123,7 @@ discard block |
|
|
block discarded – undo |
|
123
|
123
|
$length = 0.0; |
|
124
|
124
|
$points = $this->getPoints(); |
|
125
|
125
|
$numPoints = count($points) - 1; |
|
126
|
|
- for ($i = 0; $i<$numPoints; ++$i) { |
|
|
126
|
+ for ($i = 0; $i < $numPoints; ++$i) { |
|
127
|
127
|
$length += sqrt( |
|
128
|
128
|
pow(($points[$i]->getX() - $points[$i + 1]->getX()), 2) + |
|
129
|
129
|
pow(($points[$i]->getY() - $points[$i + 1]->getY()), 2) |
|
@@ -277,14 +277,14 @@ discard block |
|
|
block discarded – undo |
|
277
|
277
|
$C = $f / 16 * $cosSqAlpha * (4 + $f * (4 - 3 * $cosSqAlpha)); |
|
278
|
278
|
$lambdaP = $lambda; |
|
279
|
279
|
$lambda = $L + (1 - $C) * $f * $sinAlpha * |
|
280
|
|
- ($sigma + $C * $sinSigma * ($cos2SigmaM + $C * $cosSigma * (- 1 + 2 * $cos2SigmaM * $cos2SigmaM))); |
|
|
280
|
+ ($sigma + $C * $sinSigma * ($cos2SigmaM + $C * $cosSigma * (-1 + 2 * $cos2SigmaM * $cos2SigmaM))); |
|
281
|
281
|
} while (abs($lambda - $lambdaP) > 1e-12 && --$iterationLimit > 0); |
|
282
|
282
|
if ($iterationLimit == 0) { |
|
283
|
283
|
return 0.0; // not converging |
|
284
|
284
|
} |
|
285
|
285
|
$uSq = $cosSqAlpha * ($a * $a - $b * $b) / ($b * $b); |
|
286
|
|
- $A = 1 + $uSq / 16384 * (4096 + $uSq * (- 768 + $uSq * (320 - 175 * $uSq))); |
|
287
|
|
- $B = $uSq / 1024 * (256 + $uSq * (- 128 + $uSq * (74 - 47 * $uSq))); |
|
|
286
|
+ $A = 1 + $uSq / 16384 * (4096 + $uSq * (-768 + $uSq * (320 - 175 * $uSq))); |
|
|
287
|
+ $B = $uSq / 1024 * (256 + $uSq * (-128 + $uSq * (74 - 47 * $uSq))); |
|
288
|
288
|
$deltaSigma = $B * $sinSigma * ($cos2SigmaM + $B / 4 * |
|
289
|
289
|
($cosSigma * (-1 + 2 * $cos2SigmaM * $cos2SigmaM) - $B / 6 |
|
290
|
290
|
* $cos2SigmaM * (-3 + 4 * $sinSigma * $sinSigma) |