add geom is valid constraint. ready to merge