fixed 'adding waypoint' bug.
code cleanup.
Merge pull request #747 from ne0fhyk/feature_open_street_map

Open Street Map bug fix