Revert "Add logic for add/remove waypoint on click"

This reverts commit e9f679500ab42b156746f613c0394e2468f23ae6.
Revert "Revert "Add logic for add/remove waypoint on click""

This reverts commit 5b72942adc546e091d278dbfadd5722cefd5355f.