Completed integration of indoor and outdoor location