# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1718739021 14400
# Node ID 0bfcbc58352f348b44488226c7b0b1b6afe6f657
# Parent  655a1646f0d554d164abd0ee6fce52b48a92d65f# Parent  785c86013d2c323387702671c1e3dda864ca2eb5
merged

diff -r 785c86013d2c -r 0bfcbc58352f trafficintelligence/events.py
--- a/trafficintelligence/events.py	Mon Jun 17 22:49:22 2024 -0400
+++ b/trafficintelligence/events.py	Tue Jun 18 15:30:21 2024 -0400
@@ -117,23 +117,12 @@
         return self.roadUserNumbers
 
     def setRoadUsers(self, objects):
-        nums = sorted(list(self.getRoadUserNumbers()))
-        if nums[0]<len(objects) and objects[nums[0]].getNum() == nums[0]:
-            self.roadUser1 = objects[nums[0]]
-        if nums[1]<len(objects) and objects[nums[1]].getNum() == nums[1]:
-            self.roadUser2 = objects[nums[1]]
-
-        if self.roadUser1 is None or self.roadUser2 is None:
-            self.roadUser1 = None
-            self.roadUser2 = None
-            i = 0
-            while i < len(objects) and self.roadUser2 is None:
-                if objects[i].getNum() in nums:
-                    if self.roadUser1 is None:
-                        self.roadUser1 = objects[i]
-                    else:
-                        self.roadUser2 = objects[i]
-                i += 1
+        tmpobjects = {o.getNum():o for o in objects}
+        i, j = self.roadUserNumbers
+        if i in tmpobjects:
+            self.roadUser1 = tmpobjects[i]
+        if j in tmpobjects:
+            self.roadUser2 = tmpobjects[j]
 
     def getIndicator(self, indicatorName):
         return self.indicators.get(indicatorName, None)