Improving Toponym Resolution with Better Candidate Generation, Transformer-based Reranking, and Two-Stage Resolution