rearranged datatable and geojson adapter