Separate out primary mapping geometry from new feature geometry (user select during proj create)

Separate out primary mapping geometry from new feature geometry (user select during proj create) #1011