Update from original

change lat/lng test condition from AND to OR