From 5162ac5fd75b82ef9a06099be4938e616d56143b Mon Sep 17 00:00:00 2001
From: tidwall <joshbaker77@gmail.com>
Date: Wed, 25 Mar 2020 13:01:11 -0700
Subject: [PATCH] Stable sort roam notifications

---
 internal/server/fence.go | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/internal/server/fence.go b/internal/server/fence.go
index 97b548bb..d7ea489e 100644
--- a/internal/server/fence.go
+++ b/internal/server/fence.go
@@ -405,7 +405,6 @@ func fenceMatchRoam(
 ) (nearbys, faraways []roamMatch) {
 	oldNearbys := fenceMatchNearbys(s, fence, id, old)
 	newNearbys := fenceMatchNearbys(s, fence, id, obj)
-
 	// Go through all matching objects in new-nearbys and old-nearbys.
 	for i := 0; i < len(oldNearbys); i++ {
 		var match bool
@@ -429,14 +428,24 @@ func fenceMatchRoam(
 		}
 	}
 	faraways, nearbys = oldNearbys, newNearbys
+	// ensure the faraways distances are to the new object
 	for i := 0; i < len(faraways); i++ {
 		faraways[i].meters = faraways[i].obj.Distance(obj)
 	}
-	sort.Slice(faraways, func(i, j int) bool {
-		return faraways[i].meters < faraways[j].meters
-	})
-	sort.Slice(nearbys, func(i, j int) bool {
-		return nearbys[i].meters < nearbys[j].meters
-	})
+	sortRoamMatches(faraways)
+	sortRoamMatches(nearbys)
 	return nearbys, faraways
 }
+
+// sortRoamMatches stable sorts roam matches
+func sortRoamMatches(matches []roamMatch) {
+	sort.Slice(matches, func(i, j int) bool {
+		if matches[i].meters < matches[j].meters {
+			return true
+		}
+		if matches[i].meters > matches[j].meters {
+			return false
+		}
+		return matches[i].id < matches[j].id
+	})
+}