Review and refactor of PR591#685

jamescr merged 8 commits into

labexp:developlabexp/osmtracker-android:developfrom

jamescr:track-segments-plusjamescr/osmtracker-android:track-segments-plusCopy head branch name to clipboard