Merge "move geoidal separation calculation to AP"