Fixed errors introduced into defining customized onEachFeature in geojson

Changes made to geojson broke changes earlier made to defining custom options object