* setupGeometryFields was running (and overwriting) even if fields set in state passed in (which I don't think we want).