go back to 1sd for visit radiuses #35

sobri909 · Aug 15, 2018 · 69f2106 · 69f2106
1 parent 6d9760d
commit 69f2106
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/LocoKit/Base/Timelines/Items/Path.swift b/LocoKit/Base/Timelines/Items/Path.swift
@@ -187,7 +187,7 @@ open class Path: TimelineItem {
                 continue
             }
             let metresFromCentre = visitCenter.distance(from: sampleLocation)
-            if metresFromCentre <= visit.radius2sd {
+            if metresFromCentre <= visit.radius1sd {
                 insiders.insert(sample)
             }
         }

diff --git a/LocoKit/Base/Timelines/Items/Visit.swift b/LocoKit/Base/Timelines/Items/Visit.swift
@@ -94,7 +94,7 @@ open class Visit: TimelineItem {
         guard let center = center, let otherCenter = otherVisit.center else {
             return nil
         }
-        return center.distance(from: otherCenter) - radius2sd - otherVisit.radius2sd
+        return center.distance(from: otherCenter) - radius1sd - otherVisit.radius1sd
     }
 
     internal func distance(from path: Path) -> CLLocationDistance? {
@@ -104,7 +104,7 @@ open class Visit: TimelineItem {
         guard let pathEdge = path.edgeSample(with: self)?.location, pathEdge.hasUsableCoordinate else {
             return nil
         }
-        return center.distance(from: pathEdge) - radius2sd
+        return center.distance(from: pathEdge) - radius1sd
     }
 
     public override func maximumMergeableDistance(from otherItem: TimelineItem) -> CLLocationDistance {