Based on GPS trace.

Added Wharf Street and the public water access at its end. Based on memory and City's Road End Map. --Disregard note about Jefferson Street--