|
@@ -160,7 +160,14 @@ yaml.SafeDumper.add_representer(Article, lambda dumper, article: dumper.represen
|
|
|
|
|
|
class Transportation(Item):
|
|
class Transportation(Item):
|
|
|
|
|
|
- def __init__(self, departure_point = None, destination_point = None, distance = None, **kwargs):
|
|
|
|
|
|
+ def __init__(
|
|
|
|
+ self,
|
|
|
|
+ departure_point = None,
|
|
|
|
+ destination_point = None,
|
|
|
|
+ distance = None,
|
|
|
|
+ route_map = None,
|
|
|
|
+ **kwargs
|
|
|
|
+ ):
|
|
super(Transportation, self).__init__(**kwargs)
|
|
super(Transportation, self).__init__(**kwargs)
|
|
assert type(departure_point) is unicode
|
|
assert type(departure_point) is unicode
|
|
self.departure_point = departure_point
|
|
self.departure_point = departure_point
|
|
@@ -168,6 +175,8 @@ class Transportation(Item):
|
|
self.destination_point = destination_point
|
|
self.destination_point = destination_point
|
|
assert distance is None or type(distance) is Distance
|
|
assert distance is None or type(distance) is Distance
|
|
self.distance = distance
|
|
self.distance = distance
|
|
|
|
+ assert route_map is None or type(route_map) is str
|
|
|
|
+ self.route_map = route_map
|
|
|
|
|
|
def dict_repr(self):
|
|
def dict_repr(self):
|
|
attr = Item.dict_repr(self)
|
|
attr = Item.dict_repr(self)
|
|
@@ -175,6 +184,7 @@ class Transportation(Item):
|
|
'departure_point': self.departure_point,
|
|
'departure_point': self.departure_point,
|
|
'destination_point': self.destination_point,
|
|
'destination_point': self.destination_point,
|
|
'distance_metres': self.distance.metres() if self.distance else None,
|
|
'distance_metres': self.distance.metres() if self.distance else None,
|
|
|
|
+ 'route_map': self.route_map,
|
|
})
|
|
})
|
|
return attr
|
|
return attr
|
|
|
|
|
|
@@ -443,6 +453,7 @@ def parse_uber(msg):
|
|
destination_point = arrival_time_tag.parent.find(attrs = {'class': 'address'}).text,
|
|
destination_point = arrival_time_tag.parent.find(attrs = {'class': 'address'}).text,
|
|
distance = distance,
|
|
distance = distance,
|
|
driver = doc.find(attrs = {'class': 'driver-info'}).text[len('You rode with '):],
|
|
driver = doc.find(attrs = {'class': 'driver-info'}).text[len('You rode with '):],
|
|
|
|
+ route_map = route_map,
|
|
))
|
|
))
|
|
|
|
|
|
return [order]
|
|
return [order]
|