merge collected waypoints

Felix Hellmannrequested to merge
merge/cirk2 into main

All of my locally collected way points merged in, minus duplicates

Merge request reports