# HG changeset patch # User Nicolas Saunier # Date 1616554903 14400 # Node ID f1a33f458d7ef320412af5e468be2b56ef99e2bb # Parent fa9c358789ac2fea5140942e14ebf28b6aefede0 changing ZonePassing to ZoneCrossing diff -r fa9c358789ac -r f1a33f458d7e trafficintelligence/iframework.py --- a/trafficintelligence/iframework.py Fri Mar 19 15:54:19 2021 -0400 +++ b/trafficintelligence/iframework.py Tue Mar 23 23:01:43 2021 -0400 @@ -208,8 +208,8 @@ self.point = p self.initPersonGroupPassing(group, person, transport, vehicle) -class ZonePassing(AbstractPassing,Base): - __tablename__ = 'zonepassings' +class ZoneCrossing(AbstractPassing,Base): + __tablename__ = 'zonecrossings' idx = Column(Integer, primary_key=True) zoneIdx = Column(Integer, ForeignKey('zones.idx')) groupIdx = Column(Integer, ForeignKey('groups.idx')) @@ -298,7 +298,7 @@ counts.append(LinePassing(line, datetime(2020,7,2,23,15), group = Group([Person(34+i) for i in range(3)]), transport = 'carpassenger')) - counts.append(ZonePassing(zone, datetime(2020,7,7,9,5), True, person = Person(33, 'male', False, False, True, False))) + counts.append(ZoneCrossing(zone, datetime(2020,7,7,9,5), True, person = Person(33, 'male', False, False, True, False))) session.add_all([line, p, zone, group1, destination]+modes+groupMode1+counts+activities)