Only add Z and M point values passed onto the model when the geometry type requires it

Only add Z and M point values passed onto the model when the geometry type requires it #11421