Mercurial Hosting > traffic-intelligence
comparison python/storage.py @ 850:c724a51d4f5f
modified function signature
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Sun, 31 Jul 2016 03:52:25 -0400 |
parents | a414a7d58483 |
children | 45a53542e046 |
comparison
equal
deleted
inserted
replaced
849:a414a7d58483 | 850:c724a51d4f5f |
---|---|
213 elif obj is not None: | 213 elif obj is not None: |
214 print('Object {} is missing {} positions'.format(obj.getNum(), int(obj.length())-obj.positions.length())) | 214 print('Object {} is missing {} positions'.format(obj.getNum(), int(obj.length())-obj.positions.length())) |
215 | 215 |
216 return objects | 216 return objects |
217 | 217 |
218 def loadUserTypesFromTable(cursor, trajectoryType, objectNumbers): | 218 def loadUserTypesFromTable(cursor, objectNumbers): |
219 objectCriteria = getObjectCriteria(objectNumbers) | 219 objectCriteria = getObjectCriteria(objectNumbers) |
220 queryStatement = 'SELECT object_id, road_user_type from objects' | 220 queryStatement = 'SELECT object_id, road_user_type from objects' |
221 if objectNumbers is not None: | 221 if objectNumbers is not None: |
222 queryStatement += ' WHERE object_id '+objectCriteria | 222 queryStatement += ' WHERE object_id '+objectCriteria |
223 cursor.execute(queryStatement) | 223 cursor.execute(queryStatement) |
266 | 266 |
267 for obj in objects: | 267 for obj in objects: |
268 obj.featureNumbers = featureNumbers[obj.getNum()] | 268 obj.featureNumbers = featureNumbers[obj.getNum()] |
269 | 269 |
270 # load userType | 270 # load userType |
271 userTypes = loadUserTypesFromTable(cursor, trajectoryType, objectNumbers) | 271 userTypes = loadUserTypesFromTable(cursor, objectNumbers) |
272 for obj in objects: | 272 for obj in objects: |
273 obj.userType = userTypes[obj.getNum()] | 273 obj.userType = userTypes[obj.getNum()] |
274 | 274 |
275 if withFeatures: | 275 if withFeatures: |
276 nFeatures = 0 | 276 nFeatures = 0 |
420 objects = [] | 420 objects = [] |
421 | 421 |
422 if objectType == 'bb': | 422 if objectType == 'bb': |
423 topCorners = loadTrajectoriesFromTable(connection, 'bounding_boxes', 'bbtop', objectNumbers, timeStep) | 423 topCorners = loadTrajectoriesFromTable(connection, 'bounding_boxes', 'bbtop', objectNumbers, timeStep) |
424 bottomCorners = loadTrajectoriesFromTable(connection, 'bounding_boxes', 'bbbottom', objectNumbers, timeStep) | 424 bottomCorners = loadTrajectoriesFromTable(connection, 'bounding_boxes', 'bbbottom', objectNumbers, timeStep) |
425 userTypes = loadUserTypesFromTable(connection.cursor(), 'object', objectNumbers) # string format is same as object | 425 userTypes = loadUserTypesFromTable(connection.cursor(), objectNumbers) # string format is same as object |
426 | 426 |
427 for t, b in zip(topCorners, bottomCorners): | 427 for t, b in zip(topCorners, bottomCorners): |
428 num = t.getNum() | 428 num = t.getNum() |
429 if t.getNum() == b.getNum(): | 429 if t.getNum() == b.getNum(): |
430 annotation = moving.BBMovingObject(num, t.getTimeInterval(), t, b, userTypes[num]) | 430 annotation = moving.BBMovingObject(num, t.getTimeInterval(), t, b, userTypes[num]) |