Skip to content

Commit e425fee

Browse files
martinfleismartinfleis
authored
Remove OpenStreetMap.BlackAndWhite and properly mark broken as broken (#183)
* Update leaflet providers/compress JSON [automated] * Update leaflet providers/compress JSON [automated] * Update leaflet providers/compress JSON [automated] * Update leaflet providers/compress JSON [automated] * Update leaflet providers/compress JSON [automated] * Update leaflet providers/compress JSON [automated] * Update leaflet providers/compress JSON [automated] * Update leaflet providers/compress JSON [automated] * Update leaflet providers/compress JSON [automated] * Remove OpenStreetMap.BlackAndWhite and mark broken as broken * compress --------- Co-authored-by: Martin Fleischmann <[email protected]>
1 parent 0fed13d commit e425fee

File tree

4 files changed

+35
-60
lines changed

4 files changed

+35
-60
lines changed

‎provider_sources/_compress_providers.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"JusticeMap.nonWhite",
2727
"JusticeMap.white",
2828
"JusticeMap.plurality",
29-
"Esri.DeLorme",
3029
"NASAGIBS.ModisTerraChlorophyll",
3130
"HEREv3.trafficFlow",
3231
"Stadia.AlidadeSatellite",
@@ -190,6 +189,13 @@ def update_year(provider_or_tile):
190189
"Ocsge_Usage_2002",
191190
"Ocsge_Usage_2014",
192191
"Pcrs_Lamb93",
192+
"Geographicalgridsystems_Planignv2_L93",
193+
"Cadastralparcels_Parcellaire_express_L93",
194+
"Hr_Orthoimagery_Orthophotos_L93",
195+
"Raster_zh_centrevdl",
196+
"Raster_zh_centrevdl_et_auvergnera",
197+
"Raster_zone_humide_ara_cvdl",
198+
"Raster_zone_humide_auvergnera",
193199
]
194200

195201
if name in possibly_broken_providers:

‎provider_sources/xyzservices-providers.json

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
{
2-
"OpenStreetMap": {
3-
"BlackAndWhite": {
4-
"url": "http://{s}.tiles.wmflabs.org/bw-mapnik/{z}/{x}/{y}.png",
5-
"max_zoom": 18,
6-
"attribution": "(C) OpenStreetMap contributors",
7-
"html_attribution": "&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors",
8-
"name": "OpenStreetMap.BlackAndWhite"
9-
}
10-
},
112
"NASAGIBS": {
123
"ModisTerraBands721CR": {
134
"url": "https://gibs.earthdata.nasa.gov/wmts/epsg3857/best/MODIS_Terra_CorrectedReflectance_Bands721/default/{time}/GoogleMapsCompatible_Level9/{z}/{y}/{x}.jpg",
@@ -553,4 +544,4 @@
553544
"name": "OrdnanceSurvey.Leisure_27700"
554545
}
555546
}
556-
}
547+
}

‎xyzservices/data/providers.json

+14-37
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,6 @@
6868
"html_attribution": "&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors, Tiles courtesy of <a href=\"https://www.openstreetmap.cat\" target=\"_blank\">Breton OpenStreetMap Team</a>",
6969
"attribution": "(C) OpenStreetMap contributors, Tiles courtesy of Breton OpenStreetMap Team",
7070
"name": "OpenStreetMap.CAT"
71-
},
72-
"BlackAndWhite": {
73-
"url": "http://{s}.tiles.wmflabs.org/bw-mapnik/{z}/{x}/{y}.png",
74-
"max_zoom": 18,
75-
"attribution": "(C) OpenStreetMap contributors",
76-
"html_attribution": "&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors",
77-
"name": "OpenStreetMap.BlackAndWhite"
7871
}
7972
},
8073
"MapTilesAPI": {
@@ -3496,7 +3489,8 @@
34963489
"variant": "CADASTRALPARCELS.PARCELLAIRE_EXPRESS.L93",
34973490
"name": "GeoportailFrance.Cadastralparcels_Parcellaire_express_L93",
34983491
"TileMatrixSet": "2154_10cm_12_20",
3499-
"apikey": "your_api_key_here"
3492+
"apikey": "your_api_key_here",
3493+
"status": "broken"
35003494
},
35013495
"Cadastralparcels_Parcels": {
35023496
"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}",
@@ -6003,7 +5997,8 @@
60035997
"variant": "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2.L93",
60045998
"name": "GeoportailFrance.Geographicalgridsystems_Planignv2_L93",
60055999
"TileMatrixSet": "2154_10cm_6_19",
6006-
"apikey": "your_api_key_here"
6000+
"apikey": "your_api_key_here",
6001+
"status": "broken"
60076002
},
60086003
"Geographicalgridsystems_Slopes_Mountain": {
60096004
"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}",
@@ -6233,7 +6228,8 @@
62336228
"variant": "HR.ORTHOIMAGERY.ORTHOPHOTOS.L93",
62346229
"name": "GeoportailFrance.Hr_Orthoimagery_Orthophotos_L93",
62356230
"TileMatrixSet": "2154_10cm_10_20",
6236-
"apikey": "your_api_key_here"
6231+
"apikey": "your_api_key_here",
6232+
"status": "broken"
62376233
},
62386234
"Hydrography_Bcae_2020": {
62396235
"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}",
@@ -15395,7 +15391,8 @@
1539515391
"variant": "Raster_ZH_centreVDL",
1539615392
"name": "GeoportailFrance.Raster_zh_centrevdl",
1539715393
"TileMatrixSet": "LAMB93_50cm_7_14",
15398-
"apikey": "your_api_key_here"
15394+
"apikey": "your_api_key_here",
15395+
"status": "broken"
1539915396
},
1540015397
"Raster_zh_centrevdl_et_auvergnera": {
1540115398
"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}",
@@ -15418,7 +15415,8 @@
1541815415
"variant": "Raster_ZH_centreVDL_et_auvergneRA",
1541915416
"name": "GeoportailFrance.Raster_zh_centrevdl_et_auvergnera",
1542015417
"TileMatrixSet": "LAMB93_50cm_7_14",
15421-
"apikey": "your_api_key_here"
15418+
"apikey": "your_api_key_here",
15419+
"status": "broken"
1542215420
},
1542315421
"Raster_zone_humide_ara_cvdl": {
1542415422
"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}",
@@ -15441,7 +15439,8 @@
1544115439
"variant": "Raster_zone_humide_ARA_CVDL",
1544215440
"name": "GeoportailFrance.Raster_zone_humide_ara_cvdl",
1544315441
"TileMatrixSet": "LAMB93_50cm_7_14",
15444-
"apikey": "your_api_key_here"
15442+
"apikey": "your_api_key_here",
15443+
"status": "broken"
1544515444
},
1544615445
"Raster_zone_humide_auvergnera": {
1544715446
"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}",
@@ -15464,7 +15463,8 @@
1546415463
"variant": "Raster_zone_humide_auvergneRA",
1546515464
"name": "GeoportailFrance.Raster_zone_humide_auvergnera",
1546615465
"TileMatrixSet": "LAMB93_50cm_7_14",
15467-
"apikey": "your_api_key_here"
15466+
"apikey": "your_api_key_here",
15467+
"status": "broken"
1546815468
},
1546915469
"Scan-edugeo_pyr-png_fxx_wm": {
1547015470
"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}",
@@ -16294,29 +16294,6 @@
1629416294
"TileMatrixSet": "PM_0_16",
1629516295
"apikey": "your_api_key_here"
1629616296
},
16297-
"Orthophoto_1955_calvados": {
16298-
"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}",
16299-
"html_attribution": "<a target=\"_blank\"href=\"https://www.geoportail.gouv.fr/\">Geoportail France</a>",
16300-
"attribution": "Geoportail France",
16301-
"bounds": [
16302-
[
16303-
48.742,
16304-
-1.17026
16305-
],
16306-
[
16307-
49.4485,
16308-
0.457061
16309-
]
16310-
],
16311-
"min_zoom": 0,
16312-
"max_zoom": 18,
16313-
"format": "image/png",
16314-
"style": "normal",
16315-
"variant": "orthophoto_1955_calvados",
16316-
"name": "GeoportailFrance.Orthophoto_1955_calvados",
16317-
"TileMatrixSet": "PM_0_18",
16318-
"apikey": "your_api_key_here"
16319-
},
1632016297
"Testsrd-pcrs86-poitiers": {
1632116298
"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}",
1632216299
"html_attribution": "<a target=\"_blank\"href=\"https://www.geoportail.gouv.fr/\">Geoportail France</a>",

‎xyzservices/tests/test_providers.py

+13-12
Original file line numberDiff line numberDiff line change
@@ -195,18 +195,19 @@ def test_openweathermap(provider_name):
195195
get_test_result(provider, allow_403=False)
196196

197197

198-
@pytest.mark.request
199-
@pytest.mark.parametrize("provider_name", xyz.HEREv3)
200-
def test_herev3(provider_name):
201-
try:
202-
token = os.environ["HEREV3"]
203-
except KeyError:
204-
pytest.xfail("Missing API token.")
205-
if token == "":
206-
pytest.xfail("Token empty.")
207-
208-
provider = xyz.HEREv3[provider_name](apiKey=token)
209-
get_test_result(provider, allow_403=False)
198+
# HEREV3 seems to block GHA as it errors with E429
199+
# @pytest.mark.request
200+
# @pytest.mark.parametrize("provider_name", xyz.HEREv3)
201+
# def test_herev3(provider_name):
202+
# try:
203+
# token = os.environ["HEREV3"]
204+
# except KeyError:
205+
# pytest.xfail("Missing API token.")
206+
# if token == "":
207+
# pytest.xfail("Token empty.")
208+
209+
# provider = xyz.HEREv3[provider_name](apiKey=token)
210+
# get_test_result(provider, allow_403=False)
210211

211212

212213
@pytest.mark.request

0 commit comments

Comments
 (0)