Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

UConv.pm: add nautical mile conversions, add nautical miles to distance()

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@17570 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2018-10-20 11:49:26 +00:00
parent d0b31c0111
commit 102fa26b8d
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
FHEM/UConv.pm
View File

@ -583,6 +583,18 @@ sub wpsm2lux($;$) {
### Nautic unit conversions
###
# Speed: convert smi (statute miles) to nmi (nautical miles)
sub smi2nmi($;$) {
my ( $data, $rnd ) = @_;
return _round( $data * 0.8684, $rnd );
}
# Speed: convert km (kilometer) to nmi (nautical miles)
sub km2nmi($;$) {
my ( $data, $rnd ) = @_;
return _round( smi2nmi( km2mi( $data, 9 ), 9 ), $rnd );
}
# Speed: convert km/h to knots
sub kph2kn($;$) {
my ( $data, $rnd ) = @_;
@ -691,8 +703,10 @@ sub mph2bft($) {
### Differential conversions
###
sub distance($$$$;$) {
my ( $lat1, $lng1, $lat2, $lng2, $miles ) = @_;
sub distance($$$$;$$) {
my ( $lat1, $lng1, $lat2, $lng2, $rnd, $unit ) = @_;
return "0.0" if ( $lat1 eq $lat2 && $lng1 eq $lng2 );
use constant M_PI => 4 * atan2( 1, 1 );
my $pi80 = M_PI / 180;
$lat1 *= $pi80;
@ -709,7 +723,8 @@ sub distance($$$$;$) {
my $c = 2 * atan2( sqrt($a), sqrt( 1 - $a ) );
my $km = $r * $c;
return ( $miles ? km2mi($km) : $km );
return _round(
( $unit eq "nmi" ? km2nmi($km) : ( $unit ? km2mi($km) : $km ) ), $rnd );
}
#################################