From 2f5f29231b0500dc3ec50e17de5fc879186b01c9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 1 Dec 2019 08:09:02 -0600 Subject: [PATCH] Name change: midPoint -> approxMidpoint --- .../ARKit-CoreLocation/Extensions/CLLocation+Extensions.swift | 4 ++-- Sources/ARKit-CoreLocation/Nodes/PolylineNode.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/ARKit-CoreLocation/Extensions/CLLocation+Extensions.swift b/Sources/ARKit-CoreLocation/Extensions/CLLocation+Extensions.swift index 3357759e..4851e2b5 100644 --- a/Sources/ARKit-CoreLocation/Extensions/CLLocation+Extensions.swift +++ b/Sources/ARKit-CoreLocation/Extensions/CLLocation+Extensions.swift @@ -93,7 +93,7 @@ public extension CLLocation { /// Returns the midpoint between two locations /// Note: Only usable for short distances like MKPolyline segments - func midPoint(to: CLLocation) -> CLLocation { + func approxMidpoint(to: CLLocation) -> CLLocation { return CLLocation( coordinate: CLLocationCoordinate2D( latitude: (coordinate.latitude + to.coordinate.latitude) / 2, @@ -101,7 +101,7 @@ public extension CLLocation { ), altitude: (altitude + to.altitude) / 2 ) - } // midPoint + } // approxMidpoint(to:) } diff --git a/Sources/ARKit-CoreLocation/Nodes/PolylineNode.swift b/Sources/ARKit-CoreLocation/Nodes/PolylineNode.swift index 0f3437a3..eaad38ac 100644 --- a/Sources/ARKit-CoreLocation/Nodes/PolylineNode.swift +++ b/Sources/ARKit-CoreLocation/Nodes/PolylineNode.swift @@ -73,7 +73,7 @@ private extension PolylineNode { for i in 0 ..< polyline.pointCount - 1 { let currentLocation = CLLocation(coordinate: points[i].coordinate, altitude: altitude) let nextLocation = CLLocation(coordinate: points[i + 1].coordinate, altitude: altitude) - let midLocation = currentLocation.midPoint(to: nextLocation) + let midLocation = currentLocation.approxMidpoint(to: nextLocation) let distance = currentLocation.distance(from: nextLocation)