Improve the waypointPolygonBuilder.