Merge remote-tracking branch 'upstream/main' into rm-broken

martinfleis · Jan 18, 2025 · a27a97c · a27a97c
2 parents 84ba2c0 + 0fed13d
commit a27a97c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 6 deletions.
diff --git a/.github/workflows/test_providers.yml b/.github/workflows/test_providers.yml
@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: setup micromamba
-        uses: mamba-org/setup-micromamba@v1
+        uses: mamba-org/setup-micromamba@v2
         with:
           environment-file: ci/latest.yaml
           micromamba-version: "latest"
@@ -45,4 +45,4 @@ jobs:
       - name: test providers - bash
         run: pytest -v . -m request --cov=xyzservices --cov-append --cov-report term-missing --cov-report xml --color=yes -n auto
 
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: setup micromamba
-        uses: mamba-org/setup-micromamba@v1
+        uses: mamba-org/setup-micromamba@v2
         with:
           environment-file: ${{ matrix.environment-file }}
           micromamba-version: "latest"
@@ -45,4 +45,4 @@ jobs:
           pytest -v . -m "not request" --cov=xyzservices --cov-append --cov-report term-missing --cov-report xml --color=yes
         if: matrix.os != 'windows-latest'
 
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
diff --git a/.github/workflows/update_providers.yaml b/.github/workflows/update_providers.yaml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: setup micromamba
-        uses: mamba-org/setup-micromamba@v1
+        uses: mamba-org/setup-micromamba@v2
         with:
           environment-file: ${{ matrix.environment-file }}
           micromamba-version: 'latest'

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -5,7 +5,7 @@ ci:
 files: 'xyzservices\/'
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.5.1"
+    rev: "v0.8.6"
     hooks:
       - id: ruff
       - id: ruff-format
diff --git a/xyzservices/data/providers.json b/xyzservices/data/providers.json
@@ -16287,6 +16287,29 @@
             "TileMatrixSet": "PM_0_16",
             "apikey": "your_api_key_here"
         },
+        "Orthophoto_1955_calvados": {
+            "url": "https://data.geopf.fr/wmts?SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&STYLE={style}&TILEMATRIXSET={TileMatrixSet}&FORMAT={format}&LAYER={variant}&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}",
+            "html_attribution": "<a target=\"_blank\"href=\"https://www.geoportail.gouv.fr/\">Geoportail France</a>",
+            "attribution": "Geoportail France",
+            "bounds": [
+                [
+                    48.742,
+                    -1.17026
+                ],
+                [
+                    49.4485,
+                    0.457061
+                ]
+            ],
+            "min_zoom": 0,
+            "max_zoom": 18,
+            "format": "image/png",
+            "style": "normal",
+            "variant": "orthophoto_1955_calvados",
+            "name": "GeoportailFrance.Orthophoto_1955_calvados",
+            "TileMatrixSet": "PM_0_18",
+            "apikey": "your_api_key_here"
+        },
         "Testsrd-pcrs86-poitiers": {
             "url": "https://data.geopf.fr/wmts?SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&STYLE={style}&TILEMATRIXSET={TileMatrixSet}&FORMAT={format}&LAYER={variant}&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}",
             "html_attribution": "<a target=\"_blank\"href=\"https://www.geoportail.gouv.fr/\">Geoportail France</a>",