diff --git a/LoopDataConverter/__pycache__/__init__.cpython-311.pyc b/LoopDataConverter/__pycache__/__init__.cpython-311.pyc index 50ccf9f..3b2692f 100644 Binary files a/LoopDataConverter/__pycache__/__init__.cpython-311.pyc and b/LoopDataConverter/__pycache__/__init__.cpython-311.pyc differ diff --git a/LoopDataConverter/fields/__pycache__/__init__.cpython-311.pyc b/LoopDataConverter/fields/__pycache__/__init__.cpython-311.pyc index 2165794..6b5bd51 100644 Binary files a/LoopDataConverter/fields/__pycache__/__init__.cpython-311.pyc and b/LoopDataConverter/fields/__pycache__/__init__.cpython-311.pyc differ diff --git a/LoopDataConverter/fields/_ntgs/__pycache__/_ntgs_config.cpython-311.pyc b/LoopDataConverter/fields/_ntgs/__pycache__/_ntgs_config.cpython-311.pyc index 28eb459..e3e52ce 100644 Binary files a/LoopDataConverter/fields/_ntgs/__pycache__/_ntgs_config.cpython-311.pyc and b/LoopDataConverter/fields/_ntgs/__pycache__/_ntgs_config.cpython-311.pyc differ diff --git a/LoopDataConverter/fields/_ntgs/_ntgs_config.py b/LoopDataConverter/fields/_ntgs/_ntgs_config.py index 9361566..bbfc799 100644 --- a/LoopDataConverter/fields/_ntgs/_ntgs_config.py +++ b/LoopDataConverter/fields/_ntgs/_ntgs_config.py @@ -3,20 +3,18 @@ class NtgsConfig: def __init__(self): - self.fold_config = ( - { - "structtype_column": "FoldEvent", - "fold_text": "FeatDesc", - "description_column": "Desc", - "synform_text": "FoldType", - "foldname_column": "FoldName", - "objectid_column": "OBJECTID", - "tightness_column": "IntlimbAng", - "axial_plane_dipdir_column": "AxPlDipDir", - "axial_plane_dip_column": "AxPlDip", - "interp_source_column": "InterpSrce", - }, - ) + self.fold_config ={ + "structtype_column": "FoldEvent", + "fold_text": "FeatDesc", + "description_column": "Desc", + "synform_text": "FoldType", + "foldname_column": "FoldName", + "objectid_column": "OBJECTID", + "tightness_column": "IntlimbAng", + "axial_plane_dipdir_column": "AxPlDipDir", + "axial_plane_dip_column": "AxPlDip", + "interp_source_column": "InterpSrce", + } self.fault_config = { "structtype_column": "FaultType", @@ -56,21 +54,21 @@ def __init__(self): self.structure_config = { "orientation_type": "dip direction", - "dipdir_column": "DipDir", + "dipdir_column": "DipDirectn", "dip_column": "Dip", "description_column": "FeatDesc", "bedding_text": "ObsType", - "overturned_column": "FeatureCodeDesc", + "overturned_column": "FeatDesc", "overturned_text": "overturned", "objectid_column": "ObjectID", "interp_source_column": "InterpSrce", } self.config_map = { - Datatype.GEOLOGY: self.geology_config, - Datatype.STRUCTURE: self.structure_config, - Datatype.FAULT: self.fault_config, - Datatype.FOLD: self.fold_config, + "geology": self.geology_config, + "structure": self.structure_config, + "fault": self.fault_config, + "fold": self.fold_config, } def __getitem__(self, datatype): diff --git a/LoopDataConverter/file_readers/__pycache__/_file_readers.cpython-311.pyc b/LoopDataConverter/file_readers/__pycache__/_file_readers.cpython-311.pyc index af65ee1..cdbc766 100644 Binary files a/LoopDataConverter/file_readers/__pycache__/_file_readers.cpython-311.pyc and b/LoopDataConverter/file_readers/__pycache__/_file_readers.cpython-311.pyc differ diff --git a/LoopDataConverter/file_readers/_file_readers.py b/LoopDataConverter/file_readers/_file_readers.py index 225228c..350b650 100644 --- a/LoopDataConverter/file_readers/_file_readers.py +++ b/LoopDataConverter/file_readers/_file_readers.py @@ -159,5 +159,6 @@ def __call__(self): if self._fileData[Datatype.FOLD] is not None: self._data[Datatype.FOLD] = self.read(Datatype.FOLD) - def save(self, file_path, file_extension=None): - self._reader.save(file_path, file_extension) + def save(self, datatype, file_path, file_extension=None): + self._reader[datatype].save(file_path, file_extension) +