Mercurial Hosting > traffic-intelligence
changeset 850:c724a51d4f5f
modified function signature
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Sun, 31 Jul 2016 03:52:25 -0400 |
| parents | a414a7d58483 |
| children | 07fb949ff98f |
| files | python/storage.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/python/storage.py Fri Jul 22 17:23:49 2016 -0400 +++ b/python/storage.py Sun Jul 31 03:52:25 2016 -0400 @@ -215,7 +215,7 @@ return objects -def loadUserTypesFromTable(cursor, trajectoryType, objectNumbers): +def loadUserTypesFromTable(cursor, objectNumbers): objectCriteria = getObjectCriteria(objectNumbers) queryStatement = 'SELECT object_id, road_user_type from objects' if objectNumbers is not None: @@ -268,7 +268,7 @@ obj.featureNumbers = featureNumbers[obj.getNum()] # load userType - userTypes = loadUserTypesFromTable(cursor, trajectoryType, objectNumbers) + userTypes = loadUserTypesFromTable(cursor, objectNumbers) for obj in objects: obj.userType = userTypes[obj.getNum()] @@ -422,7 +422,7 @@ if objectType == 'bb': topCorners = loadTrajectoriesFromTable(connection, 'bounding_boxes', 'bbtop', objectNumbers, timeStep) bottomCorners = loadTrajectoriesFromTable(connection, 'bounding_boxes', 'bbbottom', objectNumbers, timeStep) - userTypes = loadUserTypesFromTable(connection.cursor(), 'object', objectNumbers) # string format is same as object + userTypes = loadUserTypesFromTable(connection.cursor(), objectNumbers) # string format is same as object for t, b in zip(topCorners, bottomCorners): num = t.getNum()