Fix some expressions to use GeometryType enum for $geometryType

[saibotk]

Some functions $geometryType parameter was still using the strings, instead of our new GeometryType enum. Thus PHP throws an error when using them.