Refactoring OCGIS adapter.