nsaunier/traffic-intelligence

dealing with modified table structures

Commit 46a30ce1a2e4 · Nicolas Saunier · 2024-08-15 17:04 -0400

Changeset

46a30ce1a2e4c99f22c891d7780e6934a2b88402

View source at this commit

Comments

No comments yet.

Log in to comment

Diff

diff --git a/trafficintelligence/events.py b/trafficintelligence/events.py
--- a/trafficintelligence/events.py
+++ b/trafficintelligence/events.py
@@ -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 --git a/trafficintelligence/storage.py b/trafficintelligence/storage.py
--- a/trafficintelligence/storage.py
+++ b/trafficintelligence/storage.py
@@ -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: