Non-Flat Earth Recalibrated for Terrain and Topsoil