move crap

MapsPeople · Dec 10, 2023 · dd1854b · dd1854b
1 parent b57ca26
commit dd1854b
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 9 deletions.
diff --git a/jord/__init__.py b/jord/__init__.py
@@ -17,7 +17,7 @@
 
 __project__ = "Jord"
 __author__ = "Christian Heider Lindbjerg"
-__version__ = "0.2.9"
+__version__ = "0.3.0"
 __doc__ = r"""
 .. module:: jord
    :platform: Unix, Windows

diff --git a/jord/fiona_utilities/__init__.py b/jord/fiona_utilities/__init__.py
diff --git a/...utilities/serialisation/fiona_utilties.py → jord/fiona_utilities/deserialise.py b/...utilities/serialisation/fiona_utilties.py → jord/fiona_utilities/deserialise.py
diff --git a/...shapely_utilities/serialisation/README.md → ...opandas_utilities/serialisation/README.md b/...shapely_utilities/serialisation/README.md → ...opandas_utilities/serialisation/README.md
diff --git a/...apely_utilities/serialisation/__init__.py → ...andas_utilities/serialisation/__init__.py b/...apely_utilities/serialisation/__init__.py → ...andas_utilities/serialisation/__init__.py
diff --git a/...lities/serialisation/well_known_binary.py → ...lities/serialisation/well_known_binary.py b/...lities/serialisation/well_known_binary.py → ...lities/serialisation/well_known_binary.py
@@ -3,7 +3,6 @@
 
 from pathlib import Path
 
-import pandas
 from shapely import wkb
 
 __all__ = ["load_wkbs_from_csv", "csv_wkt_generator"]
@@ -13,6 +12,8 @@ def load_wkbs_from_csv(csv_file_path: Path, geometry_column: str = "Shape") -> w
     """
     Well-Known Text
     """
+    import pandas
+
     return pandas.read_csv(str(csv_file_path))[geometry_column].apply(wkb.loads)
 
 
@@ -23,6 +24,8 @@ def csv_wkt_generator(csv_file_path: Path, geometry_column: str = "Shape") -> wk
     :param geometry_column:
     :return:
     """
+    import pandas
+
     for idx, g in pandas.read_csv(
         str(csv_file_path), usecols=[geometry_column]
     ).iterrows():

diff --git a/...tilities/serialisation/well_known_text.py → ...tilities/serialisation/well_known_text.py b/...tilities/serialisation/well_known_text.py → ...tilities/serialisation/well_known_text.py
diff --git a/jord/qlive_utilities/pandas_procedures.py b/jord/qlive_utilities/pandas_procedures.py
diff --git a/jord/qlive_utilities/procedures.py b/jord/qlive_utilities/procedures.py
@@ -3,20 +3,19 @@
 import time
 import uuid
 from enum import Enum
-from typing import Mapping, Any, Tuple, Iterable
+from typing import Any, Iterable, Mapping, Tuple
 
 import numpy
 import shapely.geometry.base
 import tqdm
 from pandas import DataFrame
 from shapely.geometry.base import BaseGeometry
-from warg import ensure_existence
-from warg import passes_kws_to, Number
+from warg import Number, ensure_existence, passes_kws_to
 
 from jord import PROJECT_APP_PATH
 from jord.qgis_utilities.layer_creation import (
-    add_qgis_single_feature_layer,
     add_qgis_multi_feature_layer,
+    add_qgis_single_feature_layer,
 )
 
 APPEND_TIMESTAMP = True
@@ -507,7 +506,7 @@ def add_raster(
         Qgis,
     )
     from jord.qgis_utilities.numpy_utilities.data_type import get_qgis_type
-    from jord.qgis_utilities import RasterDataProviderEditSession
+    from jord.qgis_utilities.helpers.sessions import RasterDataProviderEditSession
 
     x_size, y_size, *rest_size = raster.shape
 

diff --git a/jord/shapely_utilities/__init__.py b/jord/shapely_utilities/__init__.py
@@ -17,10 +17,11 @@
 from .morphology import *
 from .points import *
 from .polygons import *
-from .serialisation import *
 from .geometry_types import *
 from .projection import *
 from .transformation import *
 from .rings import *
 from .selection import *
 from .grouping import *
+from .mirroring import *
+from .selection import *
diff --git a/tests/test_import.py b/tests/test_import.py
@@ -16,7 +16,7 @@ def test_import_package():
 
 
 def test_qgis_import_package():
-    if False:
+    if True:
         from jord import qgis_utilities
 
         print(qgis_utilities.__doc__)
@@ -99,3 +99,4 @@ def test_torch_import_package():
     test_import_package()
     test_shapely_import_package()
     test_rasterio_import_package()
+    test_qgis_import_package()