1.1 --- a/macros/EventAggregator.py Sun Aug 07 00:11:31 2011 +0200
1.2 +++ b/macros/EventAggregator.py Sun Aug 07 01:23:44 2011 +0200
1.3 @@ -1583,9 +1583,16 @@
1.4
1.5 if location is not None and not event_locations.has_key(location):
1.6
1.7 - # Look up the position of a location using the locations page.
1.8 -
1.9 - latitude, longitude = getLocationPosition(location, locations)
1.10 + # Get any explicit position of an event.
1.11 +
1.12 + if event_details.has_key("geo"):
1.13 + latitude, longitude = event_details["geo"]
1.14 +
1.15 + # Or look up the position of a location using the locations
1.16 + # page.
1.17 +
1.18 + else:
1.19 + latitude, longitude = getLocationPosition(location, locations)
1.20
1.21 # Use a normalised location if necessary.
1.22
1.23 @@ -1598,6 +1605,8 @@
1.24
1.25 event_locations[location] = latitude, longitude
1.26
1.27 + # Record events according to location.
1.28 +
1.29 if not events_by_location.has_key(location):
1.30 events_by_location[location] = []
1.31