morecantile 3.2.5__py3-none-any.whl → 4.0.0a0__py3-none-any.whl

morecantile/defaults.py

@@ -3,12 +3,12 @@
 import os
 import pathlib
 from copy import copy
-from typing import Dict, List, Sequence, Union
+from typing import Dict, List, Union
 
 import attr
 
-from .errors import InvalidIdentifier
-from .models import TileMatrixSet
+from morecantile.errors import InvalidIdentifier
+from morecantile.models import TileMatrixSet
 
 morecantile_tms_dir = pathlib.Path(__file__).parent.joinpath("data")
 tms_paths = list(pathlib.Path(morecantile_tms_dir).glob("*.json"))
@@ -18,7 +18,7 @@ if user_tms_dir:
     tms_paths.extend(list(pathlib.Path(user_tms_dir).glob("*.json")))
 
 default_tms: Dict[str, Union[TileMatrixSet, pathlib.Path]] = {
-    tms.stem: tms for tms in tms_paths
+    tms.stem: tms for tms in sorted(tms_paths)
 }
 
 
@@ -34,6 +34,8 @@ class TileMatrixSets:
             raise InvalidIdentifier(f"Invalid identifier: {identifier}")
 
         tms = self.tms[identifier]
+
+        # We lazyload the TMS document only when called
         if isinstance(tms, pathlib.Path):
             tms = TileMatrixSet.parse_file(tms)
             self.tms[identifier] = tms
@@ -46,19 +48,15 @@ class TileMatrixSets:
 
     def register(
         self,
-        custom_tms: Union[TileMatrixSet, Sequence[TileMatrixSet]],
+        custom_tms: Dict[str, TileMatrixSet],
         overwrite: bool = False,
     ) -> "TileMatrixSets":
         """Register TileMatrixSet(s)."""
-        if isinstance(custom_tms, TileMatrixSet):
-            custom_tms = (custom_tms,)
-
-        for tms in custom_tms:
-            if tms.identifier in self.tms and not overwrite:
-                raise Exception(f"{tms.identifier} is already a registered TMS.")
+        for identifier in custom_tms.keys():
+            if identifier in self.tms and not overwrite:
+                raise Exception(f"{identifier} is already a registered TMS.")
 
-        new_tms = {tms.identifier: tms for tms in custom_tms}
-        return TileMatrixSets({**self.tms, **new_tms})
+        return TileMatrixSets({**self.tms, **custom_tms})
 
 
 tms = TileMatrixSets(copy(default_tms))  # noqa

morecantile/errors.py

@@ -31,3 +31,7 @@ class QuadKeyError(MorecantileError):
 
 class InvalidZoomError(MorecantileError):
     """Raised when input zoom is invalid."""
+
+
+class DeprecationError(MorecantileError):
+    """Raised when TMS version is not 2.0"""