Preserve way ID segment into snapped file.

Update to new north american extract.