Rebase with main and add commented excluded basemaps in _compress_providers

Author: HaudinFlorence

provider_sources/_compress_providers.py

@@ -123,18 +123,50 @@
         max_zoom = int((TileMatrixSetLimits[-1]["TileMatrix"]))
         TileMatrixSet = layer["TileMatrixSetLink"]["TileMatrixSet"]
         format = layer["Format"]
-        bounding_lowerleft_corner = layer["ows:WGS84BoundingBox"]["ows:LowerCorner"]# given with lon/lat order
-        bounding_upperright_corner = layer["ows:WGS84BoundingBox"]["ows:UpperCorner"]# given with lon/lat order
-        lowerleft_corner_lon, lowerleft_corner_lat = bounding_lowerleft_corner.split(" ")
-        upperright_corner_lon, upperright_corner_lat = bounding_upperright_corner.split(" ")
-        bounds = [[float(lowerleft_corner_lat), float(lowerleft_corner_lon)], [float(upperright_corner_lat), float(upperright_corner_lon)]]
-
+        bounding_lowerleft_corner = layer["ows:WGS84BoundingBox"][
+            "ows:LowerCorner"
+        ]  # given with lon/lat order
+        bounding_upperright_corner = layer["ows:WGS84BoundingBox"][
+            "ows:UpperCorner"
+        ]  # given with lon/lat order
+        lowerleft_corner_lon, lowerleft_corner_lat = bounding_lowerleft_corner.split(
+            " "
+        )
+        upperright_corner_lon, upperright_corner_lat = bounding_upperright_corner.split(
+            " "
+        )
+        bounds = [
+            [float(lowerleft_corner_lat), float(lowerleft_corner_lon)],
+            [float(upperright_corner_lat), float(upperright_corner_lon)],
+        ]
+        #excluded_list = [
+            #"PROTECTEDAREAS.APG",
+            #"PROTECTEDAREAS.GP",
+            #"PROTECTEDAREAS.PRSF",
+            #"PROTECTEDAREAS.RIPN",
+            #"PROTECTEDAREAS.RNC",
+            #"OCSGE.CONSTRUCTIONS.2002",
+            #"OCSGE.CONSTRUCTIONS.2014",
+            #"OCSGE.COUVERTURE.2002",
+            #"OCSGE.COUVERTURE.2014",
+            #"OCSGE.USAGE.2002",
+            #"OCSGE.USAGE.2014",
+            #"ORTHOIMAGERY.ORTHOPHOTOS.COAST2000",
+            #"PCRS.LAMB93",
+            #"ORTHOIMAGERY.ORTHO-SAT.SPOT.2013",
+            #"SECUROUTE.TE.ALL",
+            #"SECUROUTE.TE.OA",
+            #"SECUROUTE.TE.PN",
+            #"SECUROUTE.TE.PND",
+        #]
         if format == "application/x-protobuf":
             pass
         elif format == "image/x-bil;bits=32":
             pass
         elif apikey == "lambert93":
             pass
+        #elif variant in excluded_list:
+            #pass
         else:
             tilelayers_list.append("GeoportailFrance." + name)
             leaflet["GeoportailFrance"][name] = {

xyzservices/data/providers.json

@@ -8409,6 +8409,29 @@
             "name": "GeoportailFrance.Hydrography_Hydrography",
             "TileMatrixSet": "PM"
         },
+        "Transportnetwork_Commontransportelements_Markerpost": {
+            "url": "https://wxs.ign.fr/{apikey}/geoportail/wmts?REQUEST=GetTile&SERVICE=WMTS&VERSION=1.0.0&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": [
+                [
+                    41.3252,
+                    -5.15047
+                ],
+                [
+                    51.0991,
+                    9.57054
+                ]
+            ],
+            "min_zoom": 10,
+            "max_zoom": 18,
+            "apikey": "topographie",
+            "format": "image/png",
+            "style": "normal",
+            "variant": "TRANSPORTNETWORK.COMMONTRANSPORTELEMENTS.MARKERPOST",
+            "name": "GeoportailFrance.Transportnetwork_Commontransportelements_Markerpost",
+            "TileMatrixSet": "PM"
+        },
         "Transportnetworks_Railways": {
             "url": "https://wxs.ign.fr/{apikey}/geoportail/wmts?REQUEST=GetTile&SERVICE=WMTS&VERSION=1.0.0&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>",

xyzservices/tests/test_providers.py

@@ -68,8 +68,15 @@ def get_test_result(provider, allow_403=True):
                 (16, 33149, 22973),
                 (0, 0, 0),
                 (2, 6, 7),
-                (9, 181, 259),
-                (14, 8298, 5636),
+                (6, 21, 31),
+                (6, 21, 32),
+                (6, 21, 33),
+                (6, 22, 31),
+                (6, 22, 32),
+                (6, 22, 33),
+                (6, 23, 31),
+                (6, 23, 32),
+                (6, 23, 33),
             ]
             results = []
             for o in options: