maps uses waypoint instead of marks, maps marker and stroke color changed
merge conflict resolved