refactor geojson serializer