make sure to use latest map; add upper bound for sampling goal locations