Renames generateJson as generateMarkerData
Updates generateMarkerData  with more data elements