Merge pull request #1151 from dorkster/fixes

If an event has a hotspot, use the hotspot center for the center point