Mercurial Hosting > traffic-intelligence
comparison trafficintelligence/events.py @ 1273:655a1646f0d5
updated setRoadUsers to force the new objects
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Tue, 18 Jun 2024 15:29:28 -0400 |
parents | ca70a79688ae |
children | 9f1711a85c56 |
comparison
equal
deleted
inserted
replaced
1271:b2f90cada58f | 1273:655a1646f0d5 |
---|---|
115 | 115 |
116 def getRoadUserNumbers(self): | 116 def getRoadUserNumbers(self): |
117 return self.roadUserNumbers | 117 return self.roadUserNumbers |
118 | 118 |
119 def setRoadUsers(self, objects): | 119 def setRoadUsers(self, objects): |
120 nums = sorted(list(self.getRoadUserNumbers())) | 120 tmpobjects = {o.getNum():o for o in objects} |
121 if nums[0]<len(objects) and objects[nums[0]].getNum() == nums[0]: | 121 i, j = self.roadUserNumbers |
122 self.roadUser1 = objects[nums[0]] | 122 if i in tmpobjects: |
123 if nums[1]<len(objects) and objects[nums[1]].getNum() == nums[1]: | 123 self.roadUser1 = tmpobjects[i] |
124 self.roadUser2 = objects[nums[1]] | 124 if j in tmpobjects: |
125 | 125 self.roadUser2 = tmpobjects[j] |
126 if self.roadUser1 is None or self.roadUser2 is None: | |
127 self.roadUser1 = None | |
128 self.roadUser2 = None | |
129 i = 0 | |
130 while i < len(objects) and self.roadUser2 is None: | |
131 if objects[i].getNum() in nums: | |
132 if self.roadUser1 is None: | |
133 self.roadUser1 = objects[i] | |
134 else: | |
135 self.roadUser2 = objects[i] | |
136 i += 1 | |
137 | 126 |
138 def getIndicator(self, indicatorName): | 127 def getIndicator(self, indicatorName): |
139 return self.indicators.get(indicatorName, None) | 128 return self.indicators.get(indicatorName, None) |
140 | 129 |
141 def addIndicator(self, indicator): | 130 def addIndicator(self, indicator): |