Complete GeoJSON Conversion

Ready for integration