diff --git a/js/LayersConfig.js b/js/LayersConfig.js index 9b118ac..14924b5 100644 --- a/js/LayersConfig.js +++ b/js/LayersConfig.js @@ -86,6 +86,9 @@ BR.LayersConfig = L.Class.extend({ BR.layerIndex['swisstopo-aerial'].geometry = BR.confLayers.switzerlandPadded; BR.layerIndex['1017'].geometry = BR.confLayers.osmapaPl; + + BR.layerIndex['ignf-aerial'].geometry = BR.confLayers.franceBbox; + BR.layerIndex['ignf-map'].geometry = BR.confLayers.franceBbox; }, _addLanguageDefaultLayer: function () { diff --git a/layers/config/geometry.js b/layers/config/geometry.js index 15768be..a16dc90 100644 --- a/layers/config/geometry.js +++ b/layers/config/geometry.js @@ -1444,6 +1444,34 @@ BR.confLayers.switzerlandPadded = { ] }; +BR.confLayers.franceBbox = { + "type": "Polygon", + "coordinates": [ + [ + [ + -6.50391, + 40.9799 + ], + [ + 9.84375, + 40.9799 + ], + [ + 9.84375, + 51.2894 + ], + [ + -6.50391, + 51.2894 + ], + [ + -6.50391, + 40.9799 + ] + ] + ] +}; + // osmapa.pl (1017): manually derived from z9-z11, no worldwide tiles >z13, // but unclear because of general issues at z14+z15 as of 06/2019 BR.confLayers.osmapaPl = { diff --git a/layers/config/overrides.js b/layers/config/overrides.js index 5f87278..4b92705 100644 --- a/layers/config/overrides.js +++ b/layers/config/overrides.js @@ -150,7 +150,16 @@ BR.confLayers.getPropertyOverrides = function() { 'mapUrl': 'http://www.geodatenzentrum.de/geodaten/gdz_rahmen.gdz_div?gdz_spr=deu&gdz_user_id=0&gdz_akt_zeile=5&gdz_anz_zeile=1&gdz_unt_zeile=41', 'worldTiles': true // World -z9, Europe -z14 }, - + 'ignf-aerial': { + 'country_code': 'FR', + 'mapUrl': 'https://www.geoportail.gouv.fr/carte?c={lon},{lat}&z={zoom}&l0=ORTHOIMAGERY.ORTHOPHOTOS::GEOPORTAIL:OGC:WMTS(1)&permalink=yes', + 'worldTiles': true // -z12 + }, + 'ignf-map': { + 'country_code': 'FR', + 'mapUrl': 'https://www.geoportail.gouv.fr/carte?c={lon},{lat}&z={zoom}&l0=GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2::GEOPORTAIL:OGC:WMTS(1)&permalink=yes', + 'worldTiles': true // -z7 + }, 'OpenStreetMap-turistautak': { 'nameShort': 'OSM Turistautak', 'mapUrl': 'https://turistautak.openstreetmap.hu/?zoom={zoom}&lat={lat}&lon={lon}&layers=0B00F' diff --git a/layers/config/tree.js b/layers/config/tree.js index a2d5dff..3ee6261 100644 --- a/layers/config/tree.js +++ b/layers/config/tree.js @@ -47,6 +47,12 @@ BR.confLayers.tree = { ] }, 'topplus-open', + { + 'FR': [ + 'ignf-aerial', + 'ignf-map', + ] + }, { 'IL': [ 'Israel_Hiking', diff --git a/layers/extra/ignf-aerial.geojson b/layers/extra/ignf-aerial.geojson new file mode 100644 index 0000000..42ae003 --- /dev/null +++ b/layers/extra/ignf-aerial.geojson @@ -0,0 +1,15 @@ +{ + "geometry": null, + "properties": { + "attribution": { + "html": "© IGN" + }, + "id": "ignf-aerial", + "max_zoom": 21, + "name": "IGN France - Photographies aériennes", + "type": "tms", + "url": "https://wxs.ign.fr/ortho/geoportail/wmts?LAYER=ORTHOIMAGERY.ORTHOPHOTOS&EXCEPTIONS=text/xml&FORMAT=image/jpeg&SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&STYLE=normal&TILEMATRIXSET=PM&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}" + }, + "type": "Feature" +} + diff --git a/layers/extra/ignf-map.geojson b/layers/extra/ignf-map.geojson new file mode 100644 index 0000000..9672984 --- /dev/null +++ b/layers/extra/ignf-map.geojson @@ -0,0 +1,15 @@ +{ + "geometry": null, + "properties": { + "attribution": { + "html": "© IGN" + }, + "id": "ignf-map", + "max_zoom": 21, + "name": "IGN France - Plan IGN", + "type": "tms", + "url": "https://wxs.ign.fr/cartes/geoportail/wmts?LAYER=GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2&EXCEPTIONS=text/xml&FORMAT=image/png&SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&STYLE=normal&TILEMATRIXSET=PM&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}" + }, + "type": "Feature" +} +