ive been moving away from google the last few months as well and i was surprised how good osmAnd is considering its open source. i think the bookmarking in osmA

ive been moving away from google the last few months as well and i was surprised how good osmAnd is considering its open source. i think the bookmarking in osmAnd should do what you need. it also has a wikipedia and wikivoyage layer which you might find useful when travelling. there isnt any web version of osmAnd though but you can sync the osmAnd folder to a pc and open the bookmarks in any gps app. ive never tried editing them there and syncing back to the phone so youll have to experiment yourself on that one