hard-coded morecantile corner and point of origin;added axis orientation dependend tile iteration

Author: claxn

docs/guides/tile.ipynb

@@ -762,7 +762,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.12"
+   "version": "3.12.3"
   }
  },
  "nbformat": 4,

src/pytileproj/tiling.py

@@ -63,8 +63,12 @@ def model_post_init(self, context: Any) -> None:  # noqa: ANN401
         self._tm = TileMatrix(
             scaleDenominator=self.sampling / 0.28e-3,  # per OGC definition
             cellSize=self.sampling,
-            cornerOfOrigin=self.corner_of_origin.value,
-            pointOfOrigin=self.origin_xy,
+            # hard-coded at the moment due to a bug in morecantile
+            cornerOfOrigin=CornerOfOrigin.top_left.value,
+            pointOfOrigin=(
+                self.extent[0],
+                self.extent[3],
+            ),
             tileWidth=tile_width,
             tileHeight=tile_height,
             matrixWidth=matrix_width,

src/pytileproj/tiling_system.py

@@ -1354,17 +1354,19 @@ def _tiles(
         miny = min(nw_tile.y, se_tile.y)
         maxy = max(nw_tile.y, se_tile.y)
 
-        matrix = self._tms.matrix(tiling_level)
-        for j in range(miny, maxy + 1):
-            cf = (
-                matrix.get_coalesce_factor(j)
-                if matrix.variableMatrixWidths is not None
-                else 1
-            )
-            for i in range(minx, maxx + 1):
-                if cf != 1 and i % cf:
-                    continue
+        axis_orientation = self[tiling_level].axis_orientation
+        if axis_orientation[0] == "E":
+            xrange = range(minx, maxx + 1)
+        else:
+            xrange = range(maxx, minx - 1, -1)
+
+        if axis_orientation[0] == "S":
+            yrange = range(miny, maxy + 1)
+        else:
+            yrange = range(maxy, miny - 1, -1)
 
+        for i in xrange:
+            for j in yrange:
                 tile = RegularTile(i, j, tiling_level)
                 tilename = self._tile_to_name(tile)
                 raster_tile = self._tile_to_raster_tile(tile, name=tilename)

tests/test_grid.py

@@ -243,29 +243,33 @@ def test_system_tiles_different_order(
     tilenames = [
         tile.name for tile in e7grid.get_tiles_in_geog_bbox(euas_bbox, tiling_id="t2")
     ]
-    assert tilenames == [
-        "e7as_X018Y028T02",
-        "e7as_X019Y028T02",
-        "e7as_X018Y029T02",
-        "e7as_X019Y029T02",
-        "e7eu_X72Y30T02",
-        "e7eu_X73Y30T02",
-    ]
+    assert sorted(tilenames) == sorted(
+        [
+            "e7as_X018Y028T02",
+            "e7as_X019Y028T02",
+            "e7as_X018Y029T02",
+            "e7as_X019Y029T02",
+            "e7eu_X72Y30T02",
+            "e7eu_X73Y30T02",
+        ]
+    )
 
     e7grid = RegularGrid.from_sampling(
         10, euas_defs, tiling_defs_multi, system_order=["e7eu", "e7as"]
     )
     tilenames = [
         tile.name for tile in e7grid.get_tiles_in_geog_bbox(euas_bbox, tiling_id="t2")
     ]
-    assert tilenames == [
-        "e7eu_X72Y30T02",
-        "e7eu_X73Y30T02",
-        "e7as_X018Y028T02",
-        "e7as_X019Y028T02",
-        "e7as_X018Y029T02",
-        "e7as_X019Y029T02",
-    ]
+    assert sorted(tilenames) == sorted(
+        [
+            "e7eu_X72Y30T02",
+            "e7eu_X73Y30T02",
+            "e7as_X018Y028T02",
+            "e7as_X019Y028T02",
+            "e7as_X018Y029T02",
+            "e7as_X019Y029T02",
+        ]
+    )
 
     e7grid = RegularGrid.from_sampling(
         10, euas_defs, tiling_defs_multi, system_order=["e7eu"]

tests/test_tiling.py

@@ -53,8 +53,8 @@ def test_to_ogc(reg_tiling: RegularTiling):
         "id": "0",
         "scaleDenominator": 3571.4285714285716,
         "cellSize": 1.0,
-        "cornerOfOrigin": "bottomLeft",
-        "pointOfOrigin": (0.0, 0.0),
+        "cornerOfOrigin": "topLeft",
+        "pointOfOrigin": (0.0, 90.0),
         "tileWidth": 10,
         "tileHeight": 10,
         "matrixWidth": 18,