Improve geometry convert
Improve geometry convert
Fix polygon converter
More tests