From e5cf7d7056f5b0e26aa225afa7ff11ee7b89793a Mon Sep 17 00:00:00 2001 From: C4R12 <81832709+C4R12@users.noreply.github.com> Date: Tue, 11 May 2021 11:09:30 +0200 Subject: [PATCH 1/2] Update measurement.py --- turfpy/measurement.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/turfpy/measurement.py b/turfpy/measurement.py index 5435359..3714e4b 100644 --- a/turfpy/measurement.py +++ b/turfpy/measurement.py @@ -112,13 +112,13 @@ def distance(point1: Feature, point2: Feature, units: str = "km"): coordinates1 = get_coord(point1) coordinates2 = get_coord(point2) - dlat = radians((coordinates2[1] - coordinates1[1])) + dlat = radians((coordinates2[0] - coordinates1[0])) - dlon = radians((coordinates2[0] - coordinates1[0])) + dlon = radians((coordinates2[1] - coordinates1[1])) - lat1 = radians(coordinates1[1]) + lat1 = radians(coordinates1[0]) - lat2 = radians(coordinates2[1]) + lat2 = radians(coordinates2[0]) a = pow(sin(dlat / 2), 2) + pow(sin(dlon / 2), 2) * cos(lat1) * cos(lat2) b = 2 * atan2(sqrt(a), sqrt(1 - a)) From 297b820ab233d6f4fa2f5f4650a02ffe8bb1851c Mon Sep 17 00:00:00 2001 From: C4R12 <81832709+C4R12@users.noreply.github.com> Date: Mon, 17 May 2021 16:37:01 +0200 Subject: [PATCH 2/2] Update measurement.py --- turfpy/measurement.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/turfpy/measurement.py b/turfpy/measurement.py index 3714e4b..0e66f46 100644 --- a/turfpy/measurement.py +++ b/turfpy/measurement.py @@ -65,10 +65,11 @@ def bearing(start: Feature, end: Feature, final=False) -> float: return _calculate_final_bearing(start, end) start_coordinates = start["geometry"]["coordinates"] end_coordinates = end["geometry"]["coordinates"] - lon1 = radians(float(start_coordinates[0])) - lon2 = radians(float(end_coordinates[0])) - lat1 = radians(float(start_coordinates[1])) - lat2 = radians(float(end_coordinates[1])) + lat1 = radians(float(start_coordinates[0])) + lat2 = radians(float(end_coordinates[0])) + lon1 = radians(float(start_coordinates[1])) + lon2 = radians(float(end_coordinates[1])) + a = sin(lon2 - lon1) * cos(lat2)