wp_gen: refactor and fix flyfrom and flyto waypoint demos.