diff options
Diffstat (limited to 'tzselect.ksh')
| -rw-r--r-- | tzselect.ksh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tzselect.ksh b/tzselect.ksh index d5dae17..f924ca8 100644 --- a/tzselect.ksh +++ b/tzselect.ksh @@ -228,10 +228,10 @@ output_distances=' # case of the Vicenty formula for distances on ellipsoids. function gcdist(lat1, long1, lat2, long2, dlong, x, y, num, denom) { dlong = long2 - long1 - x = cos (lat2) * sin (dlong) - y = cos (lat1) * sin (lat2) - sin (lat1) * cos (lat2) * cos (dlong) - num = sqrt (x * x + y * y) - denom = sin (lat1) * sin (lat2) + cos (lat1) * cos (lat2) * cos (dlong) + x = cos(lat2) * sin(dlong) + y = cos(lat1) * sin(lat2) - sin(lat1) * cos(lat2) * cos(dlong) + num = sqrt(x * x + y * y) + denom = sin(lat1) * sin(lat2) + cos(lat1) * cos(lat2) * cos(dlong) return atan2(num, denom) } # Parallel distance between points with given latitude and longitude. @@ -240,12 +240,12 @@ output_distances=' # I.e., it considers longitudes to be further apart if they are # nearer the equator. function pardist(lat1, long1, lat2, long2) { - return abs (long1 - long2) * min (cos (lat1), cos (lat2)) + return abs(long1 - long2) * min(cos(lat1), cos(lat2)) } # The distance function is the sum of the great-circle distance and # the parallel distance. It could be weighted. function dist(lat1, long1, lat2, long2) { - return gcdist (lat1, long1, lat2, long2) + pardist (lat1, long1, lat2, long2) + return gcdist(lat1, long1, lat2, long2) + pardist(lat1, long1, lat2, long2) } BEGIN { coord_lat = convert_latitude(coord) |