A method and apparatus for estimating the location of a wireless terminal are disclosed. The location of the wireless terminal is estimated based on one or more signal strength measurements in conjunction with: (i) one or more angle-of-arrival measurements, (ii) one or more time-of-arrival measurements, or (iii) a combination of (i) and (ii). At each measurement time, the illustrative embodiment (a) determines the candidate locations for the wireless terminal, (b) computes a measurement likelihood function for any signal strength measurements that are available at that time, (c) computes a measurement likelihood function for any geometry-of-arrival measurements that are available at that time, (d) computes a joint likelihood function for all measurements available at that time, and (e) updates the location probability distribution for the wireless terminal with the joint measurement likelihood function. Estimates of the location of the wireless terminal are obtained from the location probability distribution.