refactor preparing values
replace geometry object with array
refactor geo using geojson lib