diff options
| author | jim-p <jimp@pfsense.org> | 2013-03-03 20:02:34 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-03-03 20:02:34 -0500 |
| commit | 96a7ddb7604b4f422e2fdff3078e80109efed4dd (patch) | |
| tree | dbf3666a176dfcf88a62df218e663b7b05e178ff /usr/local/www/status_ntpd.php | |
| parent | 8588508afb6eb77608911219dfb3f4062bfd8d85 (diff) | |
| download | pfsense-96a7ddb7604b4f422e2fdff3078e80109efed4dd.zip pfsense-96a7ddb7604b4f422e2fdff3078e80109efed4dd.tar.gz | |
Fix GPS lat/lon code to properly convert to the format Google wants for the link.
Diffstat (limited to 'usr/local/www/status_ntpd.php')
| -rw-r--r-- | usr/local/www/status_ntpd.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/usr/local/www/status_ntpd.php b/usr/local/www/status_ntpd.php index 2b9ac72..30cf18e 100644 --- a/usr/local/www/status_ntpd.php +++ b/usr/local/www/status_ntpd.php @@ -100,8 +100,14 @@ foreach ($ntpq_clockvar_output as $line) { if (substr($tmp, 0, 6) == '$GPRMC') { $gps_vars = explode(",", $tmp); $gps_ok = ($gps_vars[2] == "A"); - $gps_lat = $gps_vars[3] / 100.0 . $gps_vars[4]; - $gps_lon = $gps_vars[5] / 100.0 . $gps_vars[6]; + $gps_lat_deg = substr($gps_vars[3], 0, 2); + $gps_lat_min = substr($gps_vars[3], 2) / 60.0; + $gps_lon_deg = substr($gps_vars[5], 0, 3); + $gps_lon_min = substr($gps_vars[5], 3) / 60.0; + $gps_lat = $gps_lat_deg + $gps_lat_min; + $gps_lat = $gps_lat * (($gps_vars[4] == "N") ? 1 : -1); + $gps_lon = $gps_lon_deg + $gps_lon_min; + $gps_lon = $gps_lon * (($gps_vars[6] == "E") ? 1 : -1); } } } @@ -188,8 +194,8 @@ include("head.inc"); </thead> <tbody> <tr> - <td class="listlr" align="center"><?php echo $gps_lat; ?></td> - <td class="listlr" align="center"><?php echo $gps_lon; ?></td> + <td class="listlr" align="center"><?php echo sprintf("%.5f", $gps_lat); ?> (<?php echo sprintf("%d", $gps_lat_deg); ?>° <?php echo sprintf("%.5f", $gps_lat_min*60); ?><?php echo $gps_vars[4]; ?>)</td> + <td class="listlr" align="center"><?php echo sprintf("%.5f", $gps_lon); ?> (<?php echo sprintf("%d", $gps_lon_deg); ?>° <?php echo sprintf("%.5f", $gps_lon_min*60); ?><?php echo $gps_vars[6]; ?>)</td> </tr> <tr> <td class="listlr" colspan="2" align="center"><a href="http://maps.google.com/?q=<?php echo $gps_lat; ?>,<?php echo $gps_lon; ?>">Google Maps Link</a></td> |
