# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1469951545 14400
# Node ID c724a51d4f5fb47fae0d64b98ae612c4556f70b7
# Parent  a414a7d58483bc07d7f280407b680e3f060b1558
modified function signature

diff -r a414a7d58483 -r c724a51d4f5f python/storage.py
--- 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()