New Zealand to Map High Risk Waters