# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1723755856 14400
# Node ID 46a30ce1a2e4c99f22c891d7780e6934a2b88402
# Parent  9012fb72d79a3130e3b9d6b61bf1a0f1783c15d6
dealing with modified table structures

diff -r 9012fb72d79a -r 46a30ce1a2e4 trafficintelligence/events.py
--- a/trafficintelligence/events.py	Fri Jul 26 21:53:03 2024 +0200
+++ b/trafficintelligence/events.py	Thu Aug 15 17:04:16 2024 -0400
@@ -217,7 +217,7 @@
         self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[5], speedDifferentials))
 
         # if we have features, compute other indicators
-        if self.roadUser1.hasFeatures() and self.roadUser2.hasFeatures():
+        if self.roadUser1.hasFeatures() and self.roadUser2.hasFeatures() and len(self.roadUser1.getFeatures())>1 and len(self.roadUser2.getFeatures())>1:
             minDistances={}
             for instant in self.timeInterval:
                 minDistances[instant] = moving.MovingObject.minDistance(self.roadUser1, self.roadUser2, instant)
diff -r 9012fb72d79a -r 46a30ce1a2e4 trafficintelligence/storage.py
--- a/trafficintelligence/storage.py	Fri Jul 26 21:53:03 2024 +0200
+++ b/trafficintelligence/storage.py	Thu Aug 15 17:04:16 2024 -0400
@@ -187,7 +187,7 @@
         objectCriteria = getObjectCriteria(objectNumbers)
         queryStatement = None
         if trajectoryType == 'feature':
-            queryStatement = 'SELECT * from '+tableName
+            queryStatement = 'SELECT trajectory_id, frame_number, x_coordinate, y_coordinate from '+tableName
             if objectNumbers is not None and timeStep is not None:
                 queryStatement += ' WHERE trajectory_id '+objectCriteria+' AND frame_number%{} = 0'.format(timeStep)
             elif objectNumbers is not None: