See my top-level comment: same locations, adjusting for surface streets only, etc.