|
|
@@ -102,7 +102,7 @@ class EpsgConversion {
|
|
|
} else {
|
|
|
$nfn = 0;
|
|
|
$strf = floor($lon / 1000000) * 1000000;
|
|
|
- $olam = $strf / 1000000 * M_PI / 180;
|
|
|
+ $olam = $strf / 60000000 * M_PI;
|
|
|
}
|
|
|
$tmd = ($lat - $nfn) / $ok;
|
|
|
$sr = self::sphsr($a, $eSquared, 0);
|
|
|
@@ -124,13 +124,12 @@ class EpsgConversion {
|
|
|
|
|
|
$t12 = $t * (61 + 90 * pow($t, 2) + 46 * $eta + 45 * pow($t, 4) - 252 * pow($t, 2) * $eta - 3 * pow($eta, 2) + 100 * pow($eta, 3) - 66 * pow($t, 2) * pow($eta, 2) - 90 * pow($t, 4) * $eta + 88 * pow($eta, 4) + 225 * pow($t, 4) * pow($eta, 2) + 84 * pow($t, 2) * pow($eta, 3) - 192 * pow($t, 2) * pow($eta, 4)) / (720 * $sr * pow($sn, 5) * pow($ok, 6));
|
|
|
$t13 = $t * (1385 + 3633 * pow($t, 2) + 4095 * pow($t, 4) + 1575 * pow($t, 6)) / (40320 * $sr * pow($sn, 7) * pow($ok, 8));
|
|
|
- $result->y = $ftphi - pow($de, 2) * $t10 + pow($de, 4) * $t11 - pow($de, 6) * $t12 + pow($de, 8) * $t13;
|
|
|
$t14 = 1 / ($sn * $c * $ok);
|
|
|
$t15 = (1 + 2 * pow($t, 2) + $eta) / (6 * pow($sn, 3) * $c * pow($ok, 3));
|
|
|
$t16 = 1 * (5 + 6 * $eta + 28 * pow($t, 2) - 3 * pow($eta, 2) + 8 * pow($t, 2) * $eta + 24 * pow($t, 4) - 4 * pow($eta, 3) + 4 * pow($t, 2) * pow($eta, 2) + 24 * pow($t, 2) * pow($eta, 3)) / (120 * pow($sn, 5) * $c * pow($ok, 5));
|
|
|
$t17 = 1 * (61 + 662 * pow($t, 2) + 1320 * pow($t, 4) + 720 * pow($t, 6)) / (5040 * pow($sn, 7) * $c * pow($ok, 7));
|
|
|
$dlam = $de * $t14 - pow($de, 3) * $t15 + pow($de, 5) * $t16 - pow($de, 7) * $t17;
|
|
|
- $this->x = ($olam + $dlam) * 180 / M_PI;
|
|
|
+ $result->x = ($olam + $dlam) * 180 / M_PI;
|
|
|
$result->y = ($ftphi - pow($de, 2) * $t10 + pow($de, 4) * $t11 - pow($de, 6) * $t12 + pow($de, 8) * $t13) * 180 / M_PI;
|
|
|
return $result;
|
|
|
}
|
Mariusz Muszyński