diff --git a/docs/changelog.rst b/docs/changelog.rst index fb962d1def..5bac41e6cd 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -25,8 +25,8 @@ CHANGELOG **Maintenance** -- Update check_ign_keys script to match new IGN urls -- Update base.py configuratio for layers +- Update ``check_ign_keys`` script to match new IGN urls +- Update ``base.py`` configuratio for layers **Bug fixes** diff --git a/docs/install/advanced-configuration.rst b/docs/install/advanced-configuration.rst index 978511d971..f265f4e033 100644 --- a/docs/install/advanced-configuration.rst +++ b/docs/install/advanced-configuration.rst @@ -200,7 +200,7 @@ Example with IGN and OSM basemaps: '//data.geopf.fr/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2&STYLE=normal&FORMAT=image/png&TILEMATRIXSET=PM&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}', { 'attribution': 'Plan IGNV2 - Carte © IGN/Geoportail', - 'maxNativeZoom': 19, + 'maxNativeZoom': 16, 'maxZoom': 22 } ), @@ -213,15 +213,6 @@ Example with IGN and OSM basemaps: 'maxZoom': 22 } ), - ( - 'IGN Cadastre', - '//data.geopf.fr/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=CADASTRALPARCELS.PARCELLAIRE_EXPRESS&STYLE=normal&FORMAT=image/png&TILEMATRIXSET=PM&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}', - { - 'attribution': 'Cadastre - Carte © IGN/Geoportail', - 'maxNativeZoom': 19, - 'maxZoom': 22 - } - ), ( 'OpenStreetMap', '//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', @@ -245,7 +236,7 @@ Example with IGN and OSM basemaps: '//data.geopf.fr/private/wmts?apikey=ign_scan_ws&LAYER=GEOGRAPHICALGRIDSYSTEMS.MAPS&EXCEPTIONS=text/xml&FORMAT=image/jpeg&SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&STYLE=normal&TILEMATRIXSET=PM&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}', { 'attribution': 'Plan Scan 25 Touristique - Carte © IGN/Geoportail', - 'maxNativeZoom': 19, + 'maxNativeZoom': 17, 'maxZoom': 22 } ), diff --git a/geotrek/common/tests/__init__.py b/geotrek/common/tests/__init__.py index dcaa36522a..641e0d40c8 100644 --- a/geotrek/common/tests/__init__.py +++ b/geotrek/common/tests/__init__.py @@ -150,7 +150,7 @@ def test_structure_is_set(self): obj = self.model.objects.last() self.assertEqual(obj.structure, self.user.profile.structure) - @override_settings(FORCED_LAYERS=[('OSM', [(42, 100000), (43.87017822557581, 7.506408691406249), + @override_settings(FORCED_LAYERS=[('OpenStreetMap', [(42, 100000), (43.87017822557581, 7.506408691406249), (43.90185050527358, 7.555847167968749), (42, 100000)])]) def test_forced_layers(self): if self.model is None: