# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1287011292 14400
# Node ID c354d41ef7cd9afd9f6530b840be6674e3b83916
# Parent  0a5bdbf0d1b4e9917c32aecd0e848fb2cd94bbd3
corrected code for usertype in movingobject

diff -r 0a5bdbf0d1b4 -r c354d41ef7cd python/moving.py
--- a/python/moving.py	Wed Oct 13 19:02:45 2010 -0400
+++ b/python/moving.py	Wed Oct 13 19:08:12 2010 -0400
@@ -249,22 +249,23 @@
 
 class MovingObject(STObject):
     '''Class for moving objects
-    i.e. with a trajectory and a geometry (volume)
-    and a type (e.g. road user)
+    i.e. with a trajectory and a geometry (volume) (constant)
+    and a usertype (e.g. road user)
     '''
 
-    def __init__(self, num = None, timeInterval = None, positions = None, geometry = None, type = None):
+    def __init__(self, num = None, timeInterval = None, positions = None, geometry = None, userType = None):
         STObject.__init__(self, num, timeInterval)
         self.positions = positions
         self.geometry = geometry
-        self.type = type
+        self.userType = userType
         # compute bounding polygon from trajectory
 
     def getObjectInTimeInterval(self, inter):
-        '''Returns a new object extracted from self, existing at time interval inter'''
+        '''Returns a new object extracted from self,
+        restricted to time interval inter'''
         if inter.inside(self.timeInterval):
             inter = TimeInterval(inter.first-self.getFirstInstant(), inter.last-self.getFirstInstant())
-            obj = MovingObject(self.num, inter, self.positions.getTrajectoryInInterval(inter), self.geometry, self.type)
+            obj = MovingObject(self.num, inter, self.positions.getTrajectoryInInterval(inter), self.geometry, self.userType)
             if self.velocities:
                 obj.velocities = self.velocities.getTrajectoryInInterval(inter)
             return obj