0.1.3

.github/workflows/release-please.yml

@@ -27,7 +27,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ${{ fromJSON(vars.BUILD_OS)}}
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v4
       - uses: conda-incubator/setup-miniconda@v3
@@ -37,7 +37,7 @@ jobs:
       - name: Installing dependencies
         shell: bash -l {0}
         run: |
-          conda install -c conda-forge numpy scipy pytest dill beartype pandas geopandas shapely validators sqlite -y
+          conda install -c conda-forge 'numpy>=2.1.0' scipy pytest dill beartype pandas geopandas shapely validators sqlite -y
       - name: Building and install
         shell: bash -l {0}
         run: |
@@ -49,7 +49,7 @@ jobs:
 
   release-please:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev'
+    if: github.ref == 'refs/heads/master'
     steps:
       - uses: GoogleCloudPlatform/release-please-action@v4
         id: release
@@ -61,20 +61,14 @@ jobs:
       release_created: ${{ steps.release.outputs.release_created }}
   # if a release is created then run the deploy scripts for github.io, conda, pypi and docker
 
-  conda-deploy:
-    name: Building conda package for python ${{ matrix.os }})
+  conda-build:
+    name: Building conda package for python
     needs: "continuous-integration"
-    runs-on: ${{matrix.os}}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ["ubuntu-latest"]
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+    runs-on: ubuntu-latest
     steps:
       - uses: conda-incubator/setup-miniconda@v3
         with:
           auto-update-conda: true
-          python-version: ${{ matrix.python-version }}
 
       - uses: actions/checkout@v4
       - name: update submodules
@@ -86,16 +80,15 @@ jobs:
           ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN  }}
         shell: bash -l {0}
         run: |
-          conda install -c conda-forge conda-build pytest numpy scipy pandas geopandas sqlite shapely validators anaconda-client -y
-          conda build -c anaconda -c conda-forge --output-folder conda conda 
-          conda convert -p all conda/linux-64/*.tar.bz2 -f -o conda
-          conda install anaconda-client -y
+          conda config --set solver libmamba
+          conda install -c conda-forge conda-build pytest 'numpy>=2.1.0' scipy pandas geopandas sqlite shapely validators anaconda-client conda-libmamba-solver -y
+          conda build -c conda-forge --output-folder conda conda 
+
       - name: upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: conda-${{ matrix.os }}-${{ matrix.python-version }}
+          name: conda-build
           path: conda
-
   make_sdist:
     needs: "continuous-integration"
     name: Make SDist
@@ -114,18 +107,13 @@ jobs:
           path: dist/
 
   upload_to_conda:
-    needs: ["release-please", "conda-deploy"]
-    runs-on: ${{matrix.os}}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ["ubuntu-latest"]
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+    needs: ["release-please", "conda-build"]
+    runs-on: ubuntu-latest
     if: ${{ needs.release-please.outputs.release_created }}
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: conda-${{ matrix.os }}-${{ matrix.python-version }}
+          name: conda
           path: conda
       - uses: conda-incubator/setup-miniconda@v3
       - name: upload all files to conda-forge
@@ -134,10 +122,10 @@ jobs:
           ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN  }}
         run: |
           conda install -c anaconda anaconda-client -y
-          anaconda upload --label main conda/*/*.tar.bz2
+          anaconda upload --label main conda/*/*.conda
 
   upload_to_pypi:
-    needs: ["release-please", "conda-deploy"]
+    needs: ["release-please", "conda-build"]
     runs-on: "ubuntu-latest"
 
     if: ${{ needs.release-please.outputs.release_created }}

.gitignore

@@ -3,3 +3,4 @@ LoopDataConverter.egg-info/requires.txt
 LoopDataConverter.egg-info/SOURCES.txt
 LoopDataConverter.egg-info/PKG-INFO
 LoopDataConverter.egg-info/dependency_links.txt
+examples/.ipynb_checkpoints/ntgs_example_1-checkpoint.ipynb

LoopDataConverter/__init__.py

@@ -0,0 +1,5 @@
+from .converters import LoopConverter
+from .input import InputData
+from .datatypes import SurveyName, Datatype
+from .fields import NtgsConfig
+from .geometry_correction import FaultConnector

LoopDataConverter/converters/__init__.py

@@ -1,14 +1,4 @@
 from .base_converter import BaseConverter
 from .ntgs_converter import NTGSConverter
+from .loop_converter import LoopConverter
 from ..datatypes import SurveyName
-
-converter_map = {
-    SurveyName.NTGS: NTGSConverter,
-    SurveyName.GA: "",
-    SurveyName.GSQ: "",
-    SurveyName.GSWA: "",
-    SurveyName.GSSA: "",
-    SurveyName.GSV: "",
-    SurveyName.MRT: "",
-    SurveyName.GSNSW: "",
-}

LoopDataConverter/converters/loop_converter.py

@@ -0,0 +1,91 @@
+from .ntgs_converter import NTGSConverter
+from ..datatypes import SurveyName, Datatype
+from ..file_readers import LoopGisReader
+from ..input import InputData
+
+
+class LoopConverter:
+    """
+    LoopConverter class use the LoopGisReader to look up the correct file
+    reader for the input file type and then converting the data to
+    Map2Loop format using the adequate converter
+    """
+
+    def __init__(self, survey_name: SurveyName, data: InputData, layer: str = None):
+        '''
+        This function initializes an object with survey name, input data, and optional layer
+        information, along with converters for different survey names.
+
+        Parameters
+        ----------
+        survey_name : SurveyName
+            `survey_name` is a parameter that represents the name of a survey. It is expected to be of type
+        `SurveyName`.
+        data : InputData
+            The `data` parameter in the `__init__` method is of type `InputData`. It seems to represent the
+        data that will be used in the survey.
+        layer : str
+            The `layer` parameter is a string that represents a specific layer within a .GPKG file.
+            It is an optional parameter with a default value of `None`, which means it can be omitted
+            when creating an instance of the class. If provided, it specifies the layer to
+
+        '''
+        self._fileData = data
+        self._layer = layer
+        self._survey_name = survey_name
+        self._converters = {
+            SurveyName.NTGS: NTGSConverter,
+            SurveyName.GA: "",
+            SurveyName.GSQ: "",
+            SurveyName.GSWA: "",
+            SurveyName.GSSA: "",
+            SurveyName.GSV: "",
+            SurveyName.GSNSW: "",
+            SurveyName.MRT: "",
+        }
+        self._used_converter = None
+
+    def read_file(self):
+        """
+        read the file using the correct file reader
+        """
+        self.file_reader = LoopGisReader(self._fileData)
+        self.file_reader()
+        return self.file_reader._data
+
+    def get_converter(self):
+        '''
+        This function returns a converter based on the survey name.
+
+        Returns
+        -------
+            The `get_converter` method is returning the converter associated with the survey name stored in
+        the `_survey_name` attribute.
+
+        '''
+        return self._converters[self._survey_name]
+
+    def convert(self):
+        '''
+        This function reads data from a file, uses a converter to process the data, and stores the
+        converted data in the object's data attribute.
+
+        '''
+        data = self.read_file()
+        self._used_converter = self.get_converter()
+        self._used_converter = self._used_converter(data)
+        self._used_converter.convert()
+        self.data = self._used_converter._data
+
+    def save(self, datatype: Datatype, file_path: str, file_extension: str = None):
+        if file_extension == "geojson":
+            self.data[datatype].to_file(file_path, driver="GeoJSON")
+
+        elif file_extension == "gpkg":
+            self.data.to_file(file_path, driver="GPKG")
+
+        elif file_extension == "shp":
+            self.data[datatype].to_file(file_path)
+
+        else:
+            raise ValueError(f"Unsupported file format: {file_extension}")