Reorged to fix an off by 1 second error

Reorganized the location update code so that map updates happen at the time the GPSScanner::ACTION_GPS_UPDATED message is received instead of 1 second afterwards.