Consolidate rendering with native
Improve gpx route calculation
Improve gpx route calculation