Distinguish between next/prev marker and next/prev point

* When getting next/prev marker, look in `_markers`
* When getting next/prev point, look in `latlngs()`

With other recent fixes (mistakenly committed with #1283), fixes #1258, fixes #1260