Rework CompositeSurface parsing

1 job for dev_citygml3 in 1 minute and 9 seconds (queued for 3 seconds)