Mercurial Hosting > traffic-intelligence
changeset 1274:0bfcbc58352f
merged
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Tue, 18 Jun 2024 15:30:21 -0400 |
parents | 655a1646f0d5 (diff) 785c86013d2c (current diff) |
children | 9f1711a85c56 |
files | |
diffstat | 1 files changed, 6 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- 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)