Merge pull request #87 from rok4/develop

Release 2.1.5

Author: Dolite

.github/workflows/pr-auto-labeler.yml

@@ -1,6 +1,6 @@
 name: "🏷 PR Labeler"
 on:
-  - pull_request_target
+  - pull_request
 
 permissions:
   contents: read

.pre-commit-config.yaml

@@ -22,13 +22,13 @@ repos:
         args: [--markdown-linebreak-ext=md]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.1.9"
+    rev: "v0.3.4"
     hooks:
       - id: ruff
         args: ["--fix-only", "--target-version=py38"]
 
   - repo: https://github.com/psf/black
-    rev: 23.12.1
+    rev: 24.3.0
     hooks:
       - id: black
         args: ["--target-version=py38"]
@@ -40,7 +40,7 @@ repos:
         args: ["--profile", "black", "--filter-files"]
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.15.2
     hooks:
       - id: pyupgrade
         args:

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.1.5
+
+### [Changed]
+
+* Pyramid : la fonction de chargement de la liste en mémoire retourne le nombre de dalle
+
 ## 2.1.4
 
 ### [Fixed]

src/rok4/pyramid.py

@@ -372,7 +372,6 @@ def set_limits_from_bbox(self, bbox: Tuple[float, float, float, float]) -> None:
 
 
 class Pyramid:
-
     """A data pyramid, raster or vector
 
     Attributes:
@@ -384,7 +383,7 @@ class Pyramid:
         __format (str): Data format
         __storage (Dict[str, Union[rok4.enums.StorageType,str,int]]): Pyramid's storage informations (type, root and depth if FILE storage)
         __raster_specifications (Dict): If raster pyramid, raster specifications
-        __content (Dict): Loading status (loaded) and list content (cache).
+        __content (Dict): Loading status (loaded), slab count (count) and list content (cache).
 
             Example (S3 storage):
 
@@ -397,6 +396,7 @@ class Pyramid:
                             'slab': 'DATA_18_5424_7526'
                         }
                     },
+                    'count': 1,
                     'loaded': True
                 }
     """
@@ -409,7 +409,7 @@ def from_descriptor(cls, descriptor: str) -> "Pyramid":
             descriptor (str): pyramid's descriptor path
 
         Raises:
-            FormatError: Provided path or the TMS is not a well formed JSON
+            FormatError: Provided path or the descriptor is not a well formed JSON
             Exception: Level issue : no one in the pyramid or the used TMS, or level ID not defined in the TMS
             MissingAttributeError: Attribute is missing in the content
             StorageError: Storage read issue (pyramid descriptor or TMS)
@@ -548,7 +548,7 @@ def __init__(self) -> None:
         self.__levels = {}
         self.__masks = None
 
-        self.__content = {"loaded": False, "cache": {}}
+        self.__content = {"loaded": False, "count": 0, "cache": {}}
 
     def __str__(self) -> str:
         return f"{self.type.name} pyramid '{self.__name}' ({self.__storage['type'].name} storage)"
@@ -737,19 +737,22 @@ def type(self) -> PyramidType:
         else:
             return PyramidType.RASTER
 
-    def load_list(self) -> None:
+    def load_list(self) -> int:
         """Load list content and cache it
 
         If list is already loaded, nothing done
         """
         if self.__content["loaded"]:
-            return
+            return self.__content["count"]
 
         for slab, infos in self.list_generator():
             self.__content["cache"][slab] = infos
+            self.__content["count"] += 1
 
         self.__content["loaded"] = True
 
+        return self.__content["count"]
+
     def list_generator(
         self, level_id: str = None
     ) -> Iterator[Tuple[Tuple[SlabType, str, int, int], Dict]]:

src/rok4/storage.py

@@ -1,4 +1,4 @@
-"""Provide functions to use read or write
+"""Provide functions to read or write data
 
 Available storage types are :
 - S3 (path are preffixed with `s3://`)

src/rok4/tile_matrix_set.py

@@ -6,6 +6,7 @@
 - `TileMatrix` - A tile matrix set level
 
 Loading a tile matrix set requires environment variables :
+
 - ROK4_TMS_DIRECTORY
 """
 
@@ -208,6 +209,7 @@ def __init__(self, name: str) -> None:
             MissingEnvironmentError: Missing object storage informations
             Exception: No level in the TMS, CRS not recognized by OSR
             StorageError: Storage read issue
+            FileNotFoundError: TMS file or object does not exist
             FormatError: Provided path is not a well formed JSON
             MissingAttributeError: Attribute is missing in the content
         """

src/rok4/utils.py

@@ -162,7 +162,7 @@ def reproject_point(
     sr_dst_inv = sr_dst.EPSGTreatsAsLatLong() or sr_dst.EPSGTreatsAsNorthingEasting()
 
     if sr_src.IsSame(sr_dst) and sr_src_inv == sr_dst_inv:
-        # Les système sont vraiment les même, avec le même ordre des axes
+        # Les système sont vraiment les mêmes, avec le même ordre des axes
         return (point[0], point[1])
     elif sr_src.IsSame(sr_dst) and sr_src_inv != sr_dst_inv:
         # Les système sont les même pour OSR, mais l'ordre des axes est différent