Add multiple waypoint

Change-Id: If4846441909a6f0dc317c22e0247434173ac46b8
Signed-off-by: gom105mari <gom105mari@gmail.com>