Get rid of unneccessary if else statements in the GML format
Merge pull request #1760 from bartvde/gmlfix2

Get rid of unneccessary if else statements in the GML format (r=@ahocevar)