ref #6159
- included geoPoint mapping code from older pull request.
- included tests from earlier DC plugin code.