Determining a location of a user device comprises a wireless system supported by wireless access points receiving signals from a user device. The wireless system estimates a location of the user device based on a coarse calculation based on an angle of arrival of the received signal and determines if the user device is in an area under an access point. The wireless system identifies received signal strength indicator values for the user device and uses the values and the calculated location of the user device to improve calibration of a received signal strength location model. If the system determines that the user is not in the area under the access point, the wireless system combines the coarse calculation location, a received signal strength determined location, and a previous received signal strength determined location, and estimates a location based on the combined calculations.