cleaner schema and simpler GeometryCollection encoding