With FDCurlViewControl
Fix annotation uids, added polyline support