updating with geojson fix and integrated into master code