Update for boxtree renaming of geo_data to optional_geo_data