I use JOSM on Linux for editing, OsmTracker on Android for recording GPX tracks and OsmAnd for navigation.