Missed add of geoshape and geotrace question types

First add attempt didn't quite do it.