From 35bb627ee7a582c9b8744b21b36cb24affe5bddd Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 28 Aug 2023 14:20:10 +0000 Subject: [PATCH 01/26] reset DRAFT_CHANGELOG --- DRAFT_CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md index 5615b73e5..cfc60e76e 100644 --- a/DRAFT_CHANGELOG.md +++ b/DRAFT_CHANGELOG.md @@ -6,16 +6,12 @@ ## Summary -Mise à jour des extensions Géoportail pour OpenLayers en version 3.3.4 - ## Changelog * [Added] * [Changed] - - ext-ol 3.3.4 - * [Removed] * [Fixed] From 944b45773ef5bf7a1489e3b8fe5b3e5d55661bde Mon Sep 17 00:00:00 2001 From: elias couppe Date: Wed, 30 Aug 2023 12:26:52 +0200 Subject: [PATCH 02/26] update(package): binaires extension new-gpf-url --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 816dff091..613f454db 100644 --- a/package.json +++ b/package.json @@ -72,8 +72,8 @@ "exports-loader": "^0.7.0", "expose-loader": "^0.7.5", "fs-extra": "^9.0.0", - "geoportal-extensions-itowns": "2.4.3", - "geoportal-extensions-openlayers": "3.3.4", + "geoportal-extensions-itowns": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/feature/new-gpf-url/build/scripts/release/geoportal-extensions-itowns-2.4.3.tgz", + "geoportal-extensions-openlayers": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/feature/new-gpf-url/build/scripts/release/geoportal-extensions-openlayers-3.3.3.tgz", "handlebars": "^4.7.5", "handlebars-layouts": "^3.1.4", "html-webpack-plugin": "^4.0.4", From 4db1fda9f6e69b55a17aff3d77249943f3dc8e26 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Tue, 19 Sep 2023 17:01:20 +0200 Subject: [PATCH 03/26] feat(samples): ajout couche disponible sur GPF --- samples-src/config-2d.json | 2 +- samples-src/config-3d.json | 2 +- .../pages/2d/page-controlsOptions-bundle.html | 5 +- .../3d/page-addRemoveControls-bundle.html | 5 +- .../pages/3d/page-buildings-bundle.html | 2 +- .../pages/3d/page-controls-bundle.html | 193 +----------------- .../3d/page-geolocateLocation-bundle.html | 6 + src/Itowns/ItMapControls.js | 1 - 8 files changed, 17 insertions(+), 199 deletions(-) diff --git a/samples-src/config-2d.json b/samples-src/config-2d.json index 78d0dd863..f72fafeeb 100644 --- a/samples-src/config-2d.json +++ b/samples-src/config-2d.json @@ -2,7 +2,7 @@ "baseurl" : "../..", "resources" : "../resources", "proxy" : "https://localhost/proxy/proxy.php", - "apikey" : "essentiels", + "apikey" : "full", "apikey2" : "parcellaire", "apikey3" : "an7nvfzojv5wa96dsga5nk8w" } \ No newline at end of file diff --git a/samples-src/config-3d.json b/samples-src/config-3d.json index 2d2892cee..9dffbecf4 100644 --- a/samples-src/config-3d.json +++ b/samples-src/config-3d.json @@ -2,7 +2,7 @@ "baseurl" : "../..", "resources" : "../resources", "proxy" : "https://localhost/proxy/proxy.php", - "apikey" : "essentiels,altimetrie", + "apikey" : "full", "apikey2" : "an7nvfzojv5wa96dsga5nk8w", "apikey3" : "essentiels", "apikey4" : "altimetrie", diff --git a/samples-src/pages/2d/page-controlsOptions-bundle.html b/samples-src/pages/2d/page-controlsOptions-bundle.html index 8ec3256e8..accdd0106 100644 --- a/samples-src/pages/2d/page-controlsOptions-bundle.html +++ b/samples-src/pages/2d/page-controlsOptions-bundle.html @@ -46,10 +46,7 @@

Ajout d'une carte avec Gp.Map.load() et l'ensemble des options possibles de }, // proxyUrl : "{{ proxy }}?url=", layersOptions : { - 'ORTHOIMAGERY.ORTHOPHOTOS': { - }, - 'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2': { - }, + "GEOGRAPHICALGRIDSYSTEMS.MAPS.SCAN50.1950" : {}, }, controlsOptions : { zoom : { diff --git a/samples-src/pages/3d/page-addRemoveControls-bundle.html b/samples-src/pages/3d/page-addRemoveControls-bundle.html index e8cd1082f..12c238c3c 100644 --- a/samples-src/pages/3d/page-addRemoveControls-bundle.html +++ b/samples-src/pages/3d/page-addRemoveControls-bundle.html @@ -38,7 +38,10 @@

Carte 3D.

projection : "EPSG:4326" }, layersOptions : { - "ORTHOIMAGERY.ORTHOPHOTOS" : {} + "GEOGRAPHICALGRIDSYSTEMS.MAPS.SCAN50.1950" : {}, + "ELEVATION.ELEVATIONGRIDCOVERAGE" : { + type : "elevation" + } }, controlsOptions : { layerSwitcher : { diff --git a/samples-src/pages/3d/page-buildings-bundle.html b/samples-src/pages/3d/page-buildings-bundle.html index cad1d0882..8e41e44f5 100644 --- a/samples-src/pages/3d/page-buildings-bundle.html +++ b/samples-src/pages/3d/page-buildings-bundle.html @@ -35,7 +35,7 @@

Test de l'ajout du control Buildings

} }, layersOptions : { - 'ORTHOIMAGERY.ORTHOPHOTOS': {} + "GEOGRAPHICALGRIDSYSTEMS.MAPS.SCAN50.1950" : {} }, center : { x : 2.357, diff --git a/samples-src/pages/3d/page-controls-bundle.html b/samples-src/pages/3d/page-controls-bundle.html index 6a7eaaeec..d6941bd31 100644 --- a/samples-src/pages/3d/page-controls-bundle.html +++ b/samples-src/pages/3d/page-controls-bundle.html @@ -37,196 +37,9 @@

Carte 3D.

y : 48.83 }, layersOptions : { - 'ORTHOIMAGERY.ORTHOPHOTOS': { - type : "color", - title : "Photographies aériennes", - description : "Photographies aériennes", - format : "wmts", - outputFormat : "image/jpeg", - url : "https://wxs.ign.fr/{{apikey3}}/geoportail/wmts", - layer : "ORTHOIMAGERY.ORTHOPHOTOS", - projection : "EPSG:3857", - tileMatrixSet : "PM", - tileMatrixSetLimits : { - "0": { - "minTileRow": "0", - "maxTileRow": "1", - "minTileCol": "0", - "maxTileCol": "1" - }, - "1": { - "minTileRow": "0", - "maxTileRow": "2", - "minTileCol": "0", - "maxTileCol": "2" - }, - "2": { - "minTileRow": "0", - "maxTileRow": "4", - "minTileCol": "0", - "maxTileCol": "4" - }, - "3": { - "minTileRow": "0", - "maxTileRow": "8", - "minTileCol": "0", - "maxTileCol": "8" - }, - "4": { - "minTileRow": "0", - "maxTileRow": "16", - "minTileCol": "0", - "maxTileCol": "16" - }, - "5": { - "minTileRow": "0", - "maxTileRow": "32", - "minTileCol": "0", - "maxTileCol": "32" - }, - "6": { - "minTileRow": "0", - "maxTileRow": "64", - "minTileCol": "0", - "maxTileCol": "64" - }, - "7": { - "minTileRow": "0", - "maxTileRow": "128", - "minTileCol": "0", - "maxTileCol": "128" - }, - "8": { - "minTileRow": "0", - "maxTileRow": "256", - "minTileCol": "0", - "maxTileCol": "256" - }, - "9": { - "minTileRow": "0", - "maxTileRow": "512", - "minTileCol": "0", - "maxTileCol": "512" - }, - "10": { - "minTileRow": "0", - "maxTileRow": "1024", - "minTileCol": "0", - "maxTileCol": "1024" - }, - "11": { - "minTileRow": "0", - "maxTileRow": "2048", - "minTileCol": "0", - "maxTileCol": "2048" - }, - "12": { - "minTileRow": "0", - "maxTileRow": "4096", - "minTileCol": "0", - "maxTileCol": "4096" - }, - "13": { - "minTileRow": "0", - "maxTileRow": "8192", - "minTileCol": "0", - "maxTileCol": "8192" - }, - "14": { - "minTileRow": "0", - "maxTileRow": "16384", - "minTileCol": "0", - "maxTileCol": "16384" - }, - "15": { - "minTileRow": "0", - "maxTileRow": "32768", - "minTileCol": "0", - "maxTileCol": "32768" - }, - "16": { - "minTileRow": "0", - "maxTileRow": "65536", - "minTileCol": "0", - "maxTileCol": "65536" - }, - "17": { - "minTileRow": "0", - "maxTileRow": "131072", - "minTileCol": "0", - "maxTileCol": "131072" - }, - "18": { - "minTileRow": "0", - "maxTileRow": "262144", - "minTileCol": "0", - "maxTileCol": "262144" - }, - "19": { - "minTileRow": "0", - "maxTileRow": "524288", - "minTileCol": "0", - "maxTileCol": "524288" - }, - "20": { - "minTileRow": "0", - "maxTileRow": "1048576", - "minTileCol": "0", - "maxTileCol": "1048576" - }, - "21": { - "minTileRow": "0", - "maxTileRow": "2097152", - "minTileCol": "0", - "maxTileCol": "2097152" - } - }, - topLeftCorner : { - x:-20037508, - y:20037508 - }, - resolutions : [156543.033928041,78271.51696402048,39135.758482010235,19567.87924100512,9783.93962050256,4891.96981025128,2445.98490512564,1222.99245256282,611.49622628141,305.7481131407048,152.8740565703525,76.43702828517624,38.21851414258813,19.10925707129406,9.554628535647032,4.777314267823516,2.388657133911758,1.194328566955879,0.5971642834779395,0.2985821417389697,0.1492910708694849,0.0746455354347424], - matrixIds : ["0","1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21"], - styleName : "normal", - // version : "1.1.0", - outputFormat : "image/jpeg", - minZoom : 0, - maxZoom : 19, - visibility : true, - quicklookUrl:"https://wxs.ign.fr/static/pictures/ign_ortho.jpg", - legends:[ - {"format":"format","url":"https://wxs.ign.fr/static/legends/ign_bdortho_legende.jpg","minScaleDenominator":1067}, - {"format":"format","url":"https://wxs.ign.fr/static/legends/legend3.jpg","minScaleDenominator":2133}, - {"format":"format","url":"https://wxs.ign.fr/static/legends/legend2.jpg","minScaleDenominator":136495}, - {"format":"format","url":"https://wxs.ign.fr/static/legends/legend1.jpg","minScaleDenominator":534} - ], - metadata:[{"format":"xml","url":"https://wxs.ign.fr/geoportail/csw?service=CSW&version=2.0.2&request=GetRecordById&Id=IGNF_BDORTHOr_2-0.xml"},{"format":"xml","url":"https://wxs.ign.fr/geoportail/csw?service=CSW&version=2.0.2&request=GetRecordById&Id=SPOT5.xml"},{"format":"xml","url":"https://wxs.ign.fr/geoportail/csw?service=CSW&version=2.0.2&request=GetRecordById&Id=NCL-DITTT-ORTHO.xml"},{"format":"xml","url":"https://wxs.ign.fr/geoportail/csw?service=CSW&version=2.0.2&request=GetRecordById&Id=IGNF_BDORTHOr_2-0.xml"},{"format":"xml","url":"https://wxs.ign.fr/geoportail/csw?service=CSW&version=2.0.2&request=GetRecordById&Id=IGNF_ORTHOHR_1-0.xml"}], - originators:[ - {"name":"IGN","attribution":"Institut national de l'information géographique et forestière","logo":"https://wxs.ign.fr/static/logos/IGN/IGN.gif","url":"http://www.ign.fr","constraints":[{"crs":"EPSG:4326","bbox":{"left":-63.160706,"right":55.84643,"top":51.090965,"bottom":-21.401262},"minScaleDenominator":1067,"maxScaleDenominator":1067,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-178.18713,"right":55.85611,"top":51.090965,"bottom":-21.401329},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-178.18713,"right":55.85611,"top":51.090965,"bottom":-21.401329},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-178.18713,"right":55.85611,"top":51.090965,"bottom":-21.401329},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-178.18713,"right":55.85611,"top":51.090965,"bottom":-21.401329},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-178.18713,"right":55.85611,"top":51.090965,"bottom":-21.401329},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-178.18713,"right":55.85611,"top":51.090965,"bottom":-21.401329},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":2.2243388,"right":5.7168245,"top":45.11295,"bottom":43.153347},"minScaleDenominator":534,"maxScaleDenominator":534,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"e-Megalis","attribution":"Syndicat mixte de coopération territoriale (e-Megalis)","logo":"https://wxs.ign.fr/static/logos/e-Megalis/e-Megalis.gif","url":"http://www.e-megalisbretagne.org//","constraints":[{"crs":"EPSG:4326","bbox":{"left":-5.1937118,"right":-0.98568505,"top":48.980812,"bottom":47.23789},"minScaleDenominator":1067,"maxScaleDenominator":1067,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-5.1937118,"right":-0.98568505,"top":48.980812,"bottom":47.23789},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-5.1937118,"right":-0.98568505,"top":48.980812,"bottom":47.23789},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-5.1937118,"right":-0.98568505,"top":48.980812,"bottom":47.23789},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-5.1937118,"right":-0.98568505,"top":48.980812,"bottom":47.23789},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-5.1937118,"right":-0.98568505,"top":48.980812,"bottom":47.23789},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-5.1937118,"right":-0.98568505,"top":48.980812,"bottom":47.23789},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"CRCORSE","attribution":"CRCORSE","logo":"https://wxs.ign.fr/static/logos/CRCORSE/CRCORSE.gif","url":"http://www.corse.fr//","constraints":[{"crs":"EPSG:4326","bbox":{"left":8.428783,"right":9.688606,"top":43.08541,"bottom":41.338627},"minScaleDenominator":1067,"maxScaleDenominator":559082265,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":8.428783,"right":9.688606,"top":43.08541,"bottom":41.338627},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":8.428783,"right":9.688606,"top":43.08541,"bottom":41.338627},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":8.428783,"right":9.688606,"top":43.08541,"bottom":41.338627},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":8.428783,"right":9.688606,"top":43.08541,"bottom":41.338627},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":8.428783,"right":9.688606,"top":43.08541,"bottom":41.338627},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":8.428783,"right":9.688606,"top":43.08541,"bottom":41.338627},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"FEDER2","attribution":"Fonds européen de développement économique et régional","logo":"https://wxs.ign.fr/static/logos/FEDER2/FEDER2.gif","url":"http://www.europe-en-france.gouv.fr/","constraints":[{"crs":"EPSG:4326","bbox":{"left":1.3577043,"right":4.269964,"top":50.37648,"bottom":48.824635},"minScaleDenominator":1067,"maxScaleDenominator":1067,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.3577043,"right":4.269964,"top":50.37648,"bottom":48.824635},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.3577043,"right":4.269964,"top":50.37648,"bottom":48.824635},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.3577043,"right":4.269964,"top":50.37648,"bottom":48.824635},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.3577043,"right":4.269964,"top":50.37648,"bottom":48.824635},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.3577043,"right":4.269964,"top":50.37648,"bottom":48.824635},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.3577043,"right":4.269964,"top":50.37648,"bottom":48.824635},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"CRAIG","attribution":"Centre Régional Auvergnat de l'Information Géographique (CRAIG)","logo":"https://wxs.ign.fr/static/logos/CRAIG/CRAIG.gif","url":"http://www.craig.fr","constraints":[{"crs":"EPSG:4326","bbox":{"left":2.0398402,"right":4.5090737,"top":46.8038,"bottom":44.60505},"minScaleDenominator":1067,"maxScaleDenominator":1067,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":2.0398402,"right":4.5090737,"top":46.8038,"bottom":44.60505},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":2.0398402,"right":4.5090737,"top":46.8038,"bottom":44.60505},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":2.0398402,"right":4.5090737,"top":46.8038,"bottom":44.60505},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":2.0398402,"right":4.5090737,"top":46.8038,"bottom":44.60505},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":2.0398402,"right":4.5090737,"top":46.8038,"bottom":44.60505},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":2.0398402,"right":4.5090737,"top":46.8038,"bottom":44.60505},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":2.2243388,"right":2.7314367,"top":45.11295,"bottom":44.76621},"minScaleDenominator":534,"maxScaleDenominator":534,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"CNES_AUVERGNE","attribution":"Centre national d'études spatiales (CNES)","logo":"https://wxs.ign.fr/static/logos/CNES_AUVERGNE/CNES_AUVERGNE.gif","url":"http://www.cnes.fr/","constraints":[{"crs":"EPSG:4326","bbox":{"left":2.2656832,"right":4.0227704,"top":46.8038,"bottom":45.279934},"minScaleDenominator":1067,"maxScaleDenominator":1067,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":2.2656832,"right":4.0227704,"top":46.8038,"bottom":45.279934},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":2.2656832,"right":4.0227704,"top":46.8038,"bottom":45.279934},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":2.2656832,"right":4.0227704,"top":46.8038,"bottom":45.279934},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":2.2656832,"right":4.0227704,"top":46.8038,"bottom":45.279934},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":2.2656832,"right":4.0227704,"top":46.8038,"bottom":45.279934},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":2.2656832,"right":4.0227704,"top":46.8038,"bottom":45.279934},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"PPIGE","attribution":"PPIGE","logo":"https://wxs.ign.fr/static/logos/PPIGE/PPIGE.gif","url":"http://www.ppige-npdc.fr/","constraints":[{"crs":"EPSG:4326","bbox":{"left":1.5212119,"right":4.2673664,"top":51.090965,"bottom":49.957302},"minScaleDenominator":1067,"maxScaleDenominator":1067,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.5212119,"right":4.2673664,"top":51.090965,"bottom":49.957302},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.5212119,"right":4.2673664,"top":51.090965,"bottom":49.957302},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.5212119,"right":4.2673664,"top":51.090965,"bottom":49.957302},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.5212119,"right":4.2673664,"top":51.090965,"bottom":49.957302},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.5212119,"right":4.2673664,"top":51.090965,"bottom":49.957302},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.5212119,"right":4.2673664,"top":51.090965,"bottom":49.957302},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"SIGLR","attribution":"SIGLR","logo":"https://wxs.ign.fr/static/logos/SIGLR/SIGLR.gif","url":"http://www.siglr.org//","constraints":[{"crs":"EPSG:4326","bbox":{"left":1.6784439,"right":4.8729386,"top":44.978218,"bottom":42.316307},"minScaleDenominator":1067,"maxScaleDenominator":1067,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.6784439,"right":4.8729386,"top":44.978218,"bottom":42.316307},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.6784439,"right":4.8729386,"top":44.978218,"bottom":42.316307},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.6784439,"right":4.8729386,"top":44.978218,"bottom":42.316307},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.6784439,"right":4.8729386,"top":44.978218,"bottom":42.316307},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.6784439,"right":4.8729386,"top":44.978218,"bottom":42.316307},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.6784439,"right":4.8729386,"top":44.978218,"bottom":42.316307},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"CG45","attribution":"Le conseil général du Loiret","logo":"https://wxs.ign.fr/static/logos/CG45/CG45.gif","url":"http://www.loiret.com","constraints":[{"crs":"EPSG:4326","bbox":{"left":1.4883244,"right":3.1349874,"top":48.354233,"bottom":47.471867},"minScaleDenominator":1067,"maxScaleDenominator":1067,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.4883244,"right":3.1349874,"top":48.354233,"bottom":47.471867},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.4883244,"right":3.1349874,"top":48.354233,"bottom":47.471867},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.4883244,"right":3.1349874,"top":48.354233,"bottom":47.471867},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.4883244,"right":3.1349874,"top":48.354233,"bottom":47.471867},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.4883244,"right":3.1349874,"top":48.354233,"bottom":47.471867},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":1.4883244,"right":3.1349874,"top":48.354233,"bottom":47.471867},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"CG06","attribution":"Département Alpes Maritimes (06) en partenariat avec : Groupement Orthophoto 06 (NCA, Ville de Cannes, CARF, CASA,CG06, CA de Grasse) ","logo":"https://wxs.ign.fr/static/logos/CG06/CG06.gif","url":"http://www.cg06.fr","constraints":[{"crs":"EPSG:4326","bbox":{"left":6.6093955,"right":7.7436337,"top":44.377018,"bottom":43.44647},"minScaleDenominator":1067,"maxScaleDenominator":1067,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":6.6093955,"right":7.7436337,"top":44.377018,"bottom":43.44647},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":6.6093955,"right":7.7436337,"top":44.377018,"bottom":43.44647},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":6.6093955,"right":7.7436337,"top":44.377018,"bottom":43.44647},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":6.6093955,"right":7.7436337,"top":44.377018,"bottom":43.44647},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":6.6093955,"right":7.7436337,"top":44.377018,"bottom":43.44647},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":6.6093955,"right":7.7436337,"top":44.377018,"bottom":43.44647},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"RGD_SAVOIE","attribution":"Régie de Gestion de Données des Pays de Savoie (RGD 73-74)","logo":"https://wxs.ign.fr/static/logos/RGD_SAVOIE/RGD_SAVOIE.gif","url":"http://www.rgd.fr","constraints":[{"crs":"EPSG:4326","bbox":{"left":5.7759595,"right":7.0887337,"top":46.438328,"bottom":45.65335},"minScaleDenominator":1067,"maxScaleDenominator":1067,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":5.5923314,"right":7.2323394,"top":46.438328,"bottom":45.017353},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":5.5923314,"right":7.2323394,"top":46.438328,"bottom":45.017353},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":5.5923314,"right":7.2323394,"top":46.438328,"bottom":45.017353},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":5.5923314,"right":7.2323394,"top":46.438328,"bottom":45.017353},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":5.5923314,"right":7.2323394,"top":46.438328,"bottom":45.017353},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":5.5923314,"right":7.2323394,"top":46.438328,"bottom":45.017353},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"CNES_971","attribution":"Centre national d'études spatiales (CNES)","logo":"https://wxs.ign.fr/static/logos/CNES_971/CNES_971.gif","url":"http://www.cnes.fr/","constraints":[{"crs":"EPSG:4326","bbox":{"left":-61.82342,"right":-60.99497,"top":16.521578,"bottom":15.819616},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-61.82342,"right":-60.99497,"top":16.521578,"bottom":15.819616},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-61.82342,"right":-60.99497,"top":16.521578,"bottom":15.819616},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-61.82342,"right":-60.99497,"top":16.521578,"bottom":15.819616},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-61.82342,"right":-60.99497,"top":16.521578,"bottom":15.819616},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-61.82342,"right":-60.99497,"top":16.521578,"bottom":15.819616},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"CNES_972","attribution":"Centre national d'études spatiales (CNES)","logo":"https://wxs.ign.fr/static/logos/CNES_972/CNES_972.gif","url":"http://www.cnes.fr/","constraints":[{"crs":"EPSG:4326","bbox":{"left":-61.247208,"right":-60.778458,"top":14.899901,"bottom":14.371855},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-61.247208,"right":-60.778458,"top":14.899901,"bottom":14.371855},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-61.247208,"right":-60.778458,"top":14.899901,"bottom":14.371855},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-61.247208,"right":-60.778458,"top":14.899901,"bottom":14.371855},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-61.247208,"right":-60.778458,"top":14.899901,"bottom":14.371855},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-61.247208,"right":-60.778458,"top":14.899901,"bottom":14.371855},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"DITTT","attribution":"Direction des Infrastructures, de la Topographie et des Transports Terrestres","logo":"https://wxs.ign.fr/static/logos/DITTT/DITTT.gif","url":"http://www.dittt.gouv.nc/portal/page/portal/dittt/","constraints":[{"crs":"EPSG:4326","bbox":{"left":163.47784,"right":167.94624,"top":-19.434975,"bottom":-22.767689},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":163.47784,"right":167.94624,"top":-19.434975,"bottom":-22.767689},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":163.47784,"right":167.94624,"top":-19.434975,"bottom":-22.767689},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":163.47784,"right":167.94624,"top":-19.434975,"bottom":-22.767689},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":163.47784,"right":167.94624,"top":-19.434975,"bottom":-22.767689},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":163.47784,"right":167.94624,"top":-19.434975,"bottom":-22.767689},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"CNES_ALSACE","attribution":"Centre national d'études spatiales (CNES)","logo":"https://wxs.ign.fr/static/logos/CNES_ALSACE/CNES_ALSACE.gif","url":"http://www.cnes.fr/","constraints":[{"crs":"EPSG:4326","bbox":{"left":6.8086324,"right":7.668318,"top":48.32695,"bottom":47.39981},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":6.8086324,"right":7.668318,"top":48.32695,"bottom":47.39981},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":6.8086324,"right":7.668318,"top":48.32695,"bottom":47.39981},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":6.8086324,"right":7.668318,"top":48.32695,"bottom":47.39981},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":6.8086324,"right":7.668318,"top":48.32695,"bottom":47.39981},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":6.8086324,"right":7.668318,"top":48.32695,"bottom":47.39981},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"CNES_978","attribution":"Centre national d'études spatiales (CNES)","logo":"https://wxs.ign.fr/static/logos/CNES_978/CNES_978.gif","url":"http://www.cnes.fr/","constraints":[{"crs":"EPSG:4326","bbox":{"left":-63.160706,"right":-62.962185,"top":18.133898,"bottom":18.04345},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-63.160706,"right":-62.962185,"top":18.133898,"bottom":18.04345},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-63.160706,"right":-62.962185,"top":18.133898,"bottom":18.04345},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-63.160706,"right":-62.962185,"top":18.133898,"bottom":18.04345},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-63.160706,"right":-62.962185,"top":18.133898,"bottom":18.04345},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-63.160706,"right":-62.962185,"top":18.133898,"bottom":18.04345},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"CNES_974","attribution":"Centre national d'études spatiales (CNES)","logo":"https://wxs.ign.fr/static/logos/CNES_974/CNES_974.gif","url":"http://www.cnes.fr/","constraints":[{"crs":"EPSG:4326","bbox":{"left":55.205757,"right":55.84643,"top":-20.862825,"bottom":-21.401262},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":55.205757,"right":55.84643,"top":-20.862825,"bottom":-21.401262},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":55.205757,"right":55.84643,"top":-20.862825,"bottom":-21.401262},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":55.205757,"right":55.84643,"top":-20.862825,"bottom":-21.401262},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":55.205757,"right":55.84643,"top":-20.862825,"bottom":-21.401262},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":55.205757,"right":55.84643,"top":-20.862825,"bottom":-21.401262},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"CNES","attribution":"Centre national d'études spatiales (CNES)","logo":"https://wxs.ign.fr/static/logos/CNES/CNES.gif","url":"http://www.cnes.fr/","constraints":[{"crs":"EPSG:4326","bbox":{"left":-55.01953,"right":-50.88867,"top":6.053161,"bottom":1.845384},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-55.01953,"right":-50.88867,"top":6.053161,"bottom":1.845384},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-55.01953,"right":-50.88867,"top":6.053161,"bottom":1.845384},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-55.01953,"right":-50.88867,"top":6.053161,"bottom":1.845384},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"ASTRIUM","attribution":"Airbus Defence and Space","logo":"https://wxs.ign.fr/static/logos/ASTRIUM/ASTRIUM.gif","url":"http://www.geo-airbusds.com/","constraints":[{"crs":"EPSG:4326","bbox":{"left":-55.01953,"right":-50.88867,"top":6.053161,"bottom":1.845384},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-55.01953,"right":-50.88867,"top":6.053161,"bottom":1.845384},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-55.01953,"right":-50.88867,"top":6.053161,"bottom":1.845384},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-55.01953,"right":-50.88867,"top":6.053161,"bottom":1.845384},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"CNES_975","attribution":"Centre national d'études spatiales (CNES)","logo":"https://wxs.ign.fr/static/logos/CNES_975/CNES_975.gif","url":"http://www.cnes.fr/","constraints":[{"crs":"EPSG:4326","bbox":{"left":-56.410988,"right":-56.10308,"top":47.149963,"bottom":46.734093},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-56.410988,"right":-56.10308,"top":47.149963,"bottom":46.734093},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-56.410988,"right":-56.10308,"top":47.149963,"bottom":46.734093},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-56.410988,"right":-56.10308,"top":47.149963,"bottom":46.734093},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-56.410988,"right":-56.10308,"top":47.149963,"bottom":46.734093},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-56.410988,"right":-56.10308,"top":47.149963,"bottom":46.734093},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"CNES_976","attribution":"Centre national d'études spatiales (CNES)","logo":"https://wxs.ign.fr/static/logos/CNES_976/CNES_976.gif","url":"http://www.cnes.fr/","constraints":[{"crs":"EPSG:4326","bbox":{"left":44.916977,"right":45.30442,"top":-12.564543,"bottom":-13.089187},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":44.916977,"right":45.30442,"top":-12.564543,"bottom":-13.089187},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":44.916977,"right":45.30442,"top":-12.564543,"bottom":-13.089187},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":44.916977,"right":45.30442,"top":-12.564543,"bottom":-13.089187},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":44.916977,"right":45.30442,"top":-12.564543,"bottom":-13.089187},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":44.916977,"right":45.30442,"top":-12.564543,"bottom":-13.089187},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"CNES_977","attribution":"Centre national d'études spatiales (CNES)","logo":"https://wxs.ign.fr/static/logos/CNES_977/CNES_977.gif","url":"http://www.cnes.fr/","constraints":[{"crs":"EPSG:4326","bbox":{"left":-62.952805,"right":-62.78276,"top":17.98024,"bottom":17.862621},"minScaleDenominator":2133,"maxScaleDenominator":2133,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-62.952805,"right":-62.78276,"top":17.98024,"bottom":17.862621},"minScaleDenominator":4266,"maxScaleDenominator":4266,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-62.952805,"right":-62.78276,"top":17.98024,"bottom":17.862621},"minScaleDenominator":68248,"maxScaleDenominator":68248,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-62.952805,"right":-62.78276,"top":17.98024,"bottom":17.862621},"minScaleDenominator":34124,"maxScaleDenominator":34124,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-62.952805,"right":-62.78276,"top":17.98024,"bottom":17.862621},"minScaleDenominator":17062,"maxScaleDenominator":17062,"temporalExtent":["2008-06-18","2016-04-13"]},{"crs":"EPSG:4326","bbox":{"left":-62.952805,"right":-62.78276,"top":17.98024,"bottom":17.862621},"minScaleDenominator":8531,"maxScaleDenominator":8531,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"PLANETOBSERVER","attribution":"PlanetObserver (images satellites)","logo":"https://wxs.ign.fr/static/logos/PLANETOBSERVER/PLANETOBSERVER.gif","url":"http://www.planetobserver.com/","constraints":[{"crs":"EPSG:4326","bbox":{"left":-180,"right":180,"top":84,"bottom":-86},"minScaleDenominator":136495,"maxScaleDenominator":559082265,"temporalExtent":["2008-06-18","2016-04-13"]}]}, - {"name":"MPM","attribution":"Marseille Provence Métropole","logo":"https://wxs.ign.fr/static/logos/MPM/MPM.gif","url":"http://www.marseille-provence.com/","constraints":[{"crs":"EPSG:4326","bbox":{"left":5.076959,"right":5.7168245,"top":43.454994,"bottom":43.153347},"minScaleDenominator":534,"maxScaleDenominator":534,"temporalExtent":["2008-06-18","2016-04-13"]}]} - ], + "GEOGRAPHICALGRIDSYSTEMS.MAPS.SCAN50.1950" : {}, + "ELEVATION.ELEVATIONGRIDCOVERAGE" : { + type : "elevation" } }, controlsOptions : { diff --git a/samples-src/pages/3d/page-geolocateLocation-bundle.html b/samples-src/pages/3d/page-geolocateLocation-bundle.html index 1981912fb..b4c5b976d 100644 --- a/samples-src/pages/3d/page-geolocateLocation-bundle.html +++ b/samples-src/pages/3d/page-geolocateLocation-bundle.html @@ -31,6 +31,12 @@

Carte 3D.

var map = Gp.Map.load("viewerDiv", { apiKey : "{{apikey}}", viewMode : "3d", + layersOptions : { + "GEOGRAPHICALGRIDSYSTEMS.MAPS.SCAN50.1950" : {}, + "ELEVATION.ELEVATIONGRIDCOVERAGE" : { + type : "elevation" + } + }, center : { // locationType : "PositionOfInterest", location : "73 avenue de Paris, 94160 Saint Mandé" diff --git a/src/Itowns/ItMapControls.js b/src/Itowns/ItMapControls.js index 980c09f53..c2fbb3ae7 100644 --- a/src/Itowns/ItMapControls.js +++ b/src/Itowns/ItMapControls.js @@ -389,7 +389,6 @@ ItMap.prototype.addBoostReliefControl = function (controlOpts) { * @param {Number} [controlOpts.x] - The position of the buildings button from the left of the container div * @param {Number} [controlOpts.y] - The position of the buildings button from the bottom of the container div * @param {HTMLElement} controlOpts.div - The HTML Element where the scalebar is put - * @param {String} [controlOpts.key = "essentiels"] - Defines the apiKey used to add the buildings layer * @param {Boolean} [controlOpts.MNT = true] - adds the MNT to the globe (ELEVATION.ELEVATIONGRIDCOVERAGE.HIGHRES) * @param {Boolean} [controlOpts.buildingsOnGround = false] - If true, put the buildings without elevation * @param {Number} [controlOpts.defaultVisibility = true] - Display the building when the globe is initialized From 51796cdfd3a8976e3e8dced4dfe7d80d6fceb67a Mon Sep 17 00:00:00 2001 From: elias couppe Date: Wed, 20 Sep 2023 18:42:33 +0200 Subject: [PATCH 04/26] update(package): tgz 3.3.4 ext-ol --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 613f454db..e89bc64cf 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "expose-loader": "^0.7.5", "fs-extra": "^9.0.0", "geoportal-extensions-itowns": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/feature/new-gpf-url/build/scripts/release/geoportal-extensions-itowns-2.4.3.tgz", - "geoportal-extensions-openlayers": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/feature/new-gpf-url/build/scripts/release/geoportal-extensions-openlayers-3.3.3.tgz", + "geoportal-extensions-openlayers": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/feature/new-gpf-url/build/scripts/release/geoportal-extensions-openlayers-3.3.4.tgz", "handlebars": "^4.7.5", "handlebars-layouts": "^3.1.4", "html-webpack-plugin": "^4.0.4", From a622ab8ed92a1c7c53d0929f22838ee72557b875 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Thu, 21 Sep 2023 20:43:31 +0200 Subject: [PATCH 05/26] release sdk 3.5.0-beta --- package.json | 12 +++---- scripts/release/package-SDK2D.json | 54 +++++++++++++++--------------- scripts/release/package-SDK3D.json | 54 +++++++++++++++--------------- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/package.json b/package.json index e89bc64cf..b5d4c28df 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "geoportal-sdk", - "version": "3.4.3", - "date": "28/08/2023", - "SDK2DVersion": "3.4.3", - "SDK3DVersion": "3.4.3", + "version": "3.5.0-beta", + "date": "21/09/2023", + "SDK2DVersion": "3.5.0-beta", + "SDK3DVersion": "3.5.0-beta", "description": "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries", "main": "dist/2d/GpSDK2D-src.js, dist/3d/GpSDK3d-src.js", "module": "src/SDK2D.js, src/SDK3D.js", @@ -72,8 +72,8 @@ "exports-loader": "^0.7.0", "expose-loader": "^0.7.5", "fs-extra": "^9.0.0", - "geoportal-extensions-itowns": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/feature/new-gpf-url/build/scripts/release/geoportal-extensions-itowns-2.4.3.tgz", - "geoportal-extensions-openlayers": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/feature/new-gpf-url/build/scripts/release/geoportal-extensions-openlayers-3.3.4.tgz", + "geoportal-extensions-itowns": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-itowns-2.5.0-beta.tgz", + "geoportal-extensions-openlayers": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-openlayers-3.4.0-beta.tgz", "handlebars": "^4.7.5", "handlebars-layouts": "^3.1.4", "html-webpack-plugin": "^4.0.4", diff --git a/scripts/release/package-SDK2D.json b/scripts/release/package-SDK2D.json index ec0bd8d1d..938745903 100644 --- a/scripts/release/package-SDK2D.json +++ b/scripts/release/package-SDK2D.json @@ -1,39 +1,39 @@ { - "bugs" : { - "url" : "https://github.com/IGNF/geoportal-sdk/issues" - }, - "name" : "@ignf-geoportal/sdk-2d", - "description" : "French Geoportal SDK based on OpenLayers (2D)", - "date" : "04/08/2023", - "scripts" : {}, - "module" : "src/SDK2D.js", "author" : "IGNF", "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", - "files" : [ - "dist/", - "src/", - "LICENCE.md", - "README.md", - "package.json" - ], - "directories" : {}, "main" : "dist/GpSDK2D-src.js", + "version" : "3.5.0-beta", + "directories" : {}, + "repository" : { + "type" : "git", + "url" : "https://github.com/IGNF/geoportal-sdk.git" + }, + "license" : "CECILL-B", + "module" : "src/SDK2D.js", + "dependencies" : { + "ol" : "6.9.0", + "geoportal-extensions-openlayers" : "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-openlayers-3.4.0-beta.tgz", + "xmldom" : "^0.1.27", + "node-fetch" : "^2.6.1" + }, + "date" : "21/09/2023", "keywords" : [ "openlayers", "geoportail", "webservice", "javascript" ], - "dependencies" : { - "geoportal-extensions-openlayers" : "3.3.3", - "node-fetch" : "^2.6.1", - "xmldom" : "^0.1.27", - "ol" : "6.9.0" + "bugs" : { + "url" : "https://github.com/IGNF/geoportal-sdk/issues" }, - "license" : "CECILL-B", - "version" : "3.4.2", - "repository" : { - "type" : "git", - "url" : "https://github.com/IGNF/geoportal-sdk.git" - } + "files" : [ + "dist/", + "src/", + "LICENCE.md", + "README.md", + "package.json" + ], + "scripts" : {}, + "description" : "French Geoportal SDK based on OpenLayers (2D)", + "name" : "@ignf-geoportal/sdk-2d" } diff --git a/scripts/release/package-SDK3D.json b/scripts/release/package-SDK3D.json index beecc83ed..1f2733ddd 100644 --- a/scripts/release/package-SDK3D.json +++ b/scripts/release/package-SDK3D.json @@ -1,42 +1,42 @@ { - "keywords" : [ - "openlayers", - "itowns", - "geoportail", - "webservice", - "javascript" - ], - "scripts" : {}, - "date" : "04/08/2023", - "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries", - "main" : "dist/GpSDK3D-src.js", "module" : "src/SDK3D.js", - "directories" : {}, - "license" : "CECILL-B", - "files" : [ - "dist/", - "src/", - "LICENCE.md", - "README.md", - "package.json" - ], "bugs" : { "url" : "https://github.com/IGNF/geoportal-sdk/issues" }, - "version" : "3.4.2", + "author" : "IGNF", + "directories" : {}, "dependencies" : { - "geoportal-extensions-openlayers" : "3.3.3", "ol" : "6.9.0", - "node-fetch" : "^2.6.1", - "geoportal-extensions-itowns" : "2.4.3", + "geoportal-extensions-openlayers" : "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-openlayers-3.4.0-beta.tgz", + "geoportal-extensions-itowns" : "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-itowns-2.5.0-beta.tgz", "itowns" : "2.38.2", + "node-fetch" : "^2.6.1", "xmldom" : "^0.1.27" }, + "version" : "3.5.0-beta", + "date" : "21/09/2023", + "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries", + "files" : [ + "dist/", + "src/", + "LICENCE.md", + "README.md", + "package.json" + ], + "keywords" : [ + "openlayers", + "itowns", + "geoportail", + "webservice", + "javascript" + ], + "main" : "dist/GpSDK3D-src.js", + "scripts" : {}, "name" : "@ignf-geoportal/sdk-3d", + "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", + "license" : "CECILL-B", "repository" : { "url" : "https://github.com/IGNF/geoportal-sdk.git", "type" : "git" - }, - "author" : "IGNF", - "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html" + } } From 90a72723e22bcb9e58a4f89f48f44ceb56534b9e Mon Sep 17 00:00:00 2001 From: elias couppe Date: Thu, 21 Sep 2023 20:46:09 +0200 Subject: [PATCH 06/26] build release sdk 3.5.0-beta --- scripts/release/package-SDK2D.json | 44 +++++++++++++++--------------- scripts/release/package-SDK3D.json | 30 ++++++++++---------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/scripts/release/package-SDK2D.json b/scripts/release/package-SDK2D.json index 938745903..dea8763b3 100644 --- a/scripts/release/package-SDK2D.json +++ b/scripts/release/package-SDK2D.json @@ -1,31 +1,19 @@ { - "author" : "IGNF", - "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", + "name" : "@ignf-geoportal/sdk-2d", + "description" : "French Geoportal SDK based on OpenLayers (2D)", + "license" : "CECILL-B", + "date" : "21/09/2023", "main" : "dist/GpSDK2D-src.js", - "version" : "3.5.0-beta", "directories" : {}, "repository" : { - "type" : "git", - "url" : "https://github.com/IGNF/geoportal-sdk.git" - }, - "license" : "CECILL-B", - "module" : "src/SDK2D.js", - "dependencies" : { - "ol" : "6.9.0", - "geoportal-extensions-openlayers" : "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-openlayers-3.4.0-beta.tgz", - "xmldom" : "^0.1.27", - "node-fetch" : "^2.6.1" + "url" : "https://github.com/IGNF/geoportal-sdk.git", + "type" : "git" }, - "date" : "21/09/2023", - "keywords" : [ - "openlayers", - "geoportail", - "webservice", - "javascript" - ], "bugs" : { "url" : "https://github.com/IGNF/geoportal-sdk/issues" }, + "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", + "version" : "3.5.0-beta", "files" : [ "dist/", "src/", @@ -34,6 +22,18 @@ "package.json" ], "scripts" : {}, - "description" : "French Geoportal SDK based on OpenLayers (2D)", - "name" : "@ignf-geoportal/sdk-2d" + "dependencies" : { + "xmldom" : "^0.1.27", + "ol" : "6.9.0", + "geoportal-extensions-openlayers" : "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-openlayers-3.4.0-beta.tgz", + "node-fetch" : "^2.6.1" + }, + "author" : "IGNF", + "keywords" : [ + "openlayers", + "geoportail", + "webservice", + "javascript" + ], + "module" : "src/SDK2D.js" } diff --git a/scripts/release/package-SDK3D.json b/scripts/release/package-SDK3D.json index 1f2733ddd..7263ae7df 100644 --- a/scripts/release/package-SDK3D.json +++ b/scripts/release/package-SDK3D.json @@ -1,21 +1,17 @@ { + "directories" : {}, "module" : "src/SDK3D.js", "bugs" : { "url" : "https://github.com/IGNF/geoportal-sdk/issues" }, - "author" : "IGNF", - "directories" : {}, "dependencies" : { + "geoportal-extensions-itowns" : "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-itowns-2.5.0-beta.tgz", + "xmldom" : "^0.1.27", "ol" : "6.9.0", "geoportal-extensions-openlayers" : "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-openlayers-3.4.0-beta.tgz", - "geoportal-extensions-itowns" : "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-itowns-2.5.0-beta.tgz", "itowns" : "2.38.2", - "node-fetch" : "^2.6.1", - "xmldom" : "^0.1.27" + "node-fetch" : "^2.6.1" }, - "version" : "3.5.0-beta", - "date" : "21/09/2023", - "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries", "files" : [ "dist/", "src/", @@ -23,6 +19,16 @@ "README.md", "package.json" ], + "name" : "@ignf-geoportal/sdk-3d", + "main" : "dist/GpSDK3D-src.js", + "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries", + "version" : "3.5.0-beta", + "repository" : { + "url" : "https://github.com/IGNF/geoportal-sdk.git", + "type" : "git" + }, + "date" : "21/09/2023", + "license" : "CECILL-B", "keywords" : [ "openlayers", "itowns", @@ -30,13 +36,7 @@ "webservice", "javascript" ], - "main" : "dist/GpSDK3D-src.js", "scripts" : {}, - "name" : "@ignf-geoportal/sdk-3d", "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", - "license" : "CECILL-B", - "repository" : { - "url" : "https://github.com/IGNF/geoportal-sdk.git", - "type" : "git" - } + "author" : "IGNF" } From b63143591e3628281294722844cb198c35acd8ed Mon Sep 17 00:00:00 2001 From: elias couppe Date: Thu, 21 Sep 2023 21:01:01 +0200 Subject: [PATCH 07/26] =?UTF-8?q?fix=20:=20ajout=20cl=C3=A9=20full=20par?= =?UTF-8?q?=20d=C3=A9faut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Interface/IMapBase.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Interface/IMapBase.js b/src/Interface/IMapBase.js index ac779d4ea..07ccd5308 100644 --- a/src/Interface/IMapBase.js +++ b/src/Interface/IMapBase.js @@ -589,6 +589,8 @@ IMap.prototype = { // on essaye de trouver une configuration existante if (Config) { this.apiKey = Object.keys(Config.generalOptions.apiKeys); + } else { + this.apiKey = "full"; } } From a7fa69d61188f55410fe30500948ac557a9ad424 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Thu, 21 Sep 2023 21:11:17 +0200 Subject: [PATCH 08/26] =?UTF-8?q?fix=20:=20needsGetConfig=20true=20si=20pa?= =?UTF-8?q?s=20de=20cl=C3=A9=20fournie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Interface/IMapBase.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Interface/IMapBase.js b/src/Interface/IMapBase.js index 07ccd5308..c609fbc8c 100644 --- a/src/Interface/IMapBase.js +++ b/src/Interface/IMapBase.js @@ -590,7 +590,9 @@ IMap.prototype = { if (Config) { this.apiKey = Object.keys(Config.generalOptions.apiKeys); } else { + // clé full par défaut et on charge la config this.apiKey = "full"; + needsGetConfig = true; } } From 9bc26601912d7ca5b881d205e1ced8737330ef12 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Mon, 23 Oct 2023 18:12:03 +0200 Subject: [PATCH 09/26] update(package): utilisation extensions no-proxy --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 816dff091..6593e4591 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "expose-loader": "^0.7.5", "fs-extra": "^9.0.0", "geoportal-extensions-itowns": "2.4.3", - "geoportal-extensions-openlayers": "3.3.4", + "geoportal-extensions-openlayers": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/feature/import-no-proxy/build/scripts/release/geoportal-extensions-openlayers-3.3.4.tgz", "handlebars": "^4.7.5", "handlebars-layouts": "^3.1.4", "html-webpack-plugin": "^4.0.4", From 968203a66bf966a3afbf53de2441be9ad60cd0b4 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Mon, 23 Oct 2023 19:02:04 +0200 Subject: [PATCH 10/26] =?UTF-8?q?update(package):=20utilisation=20extensio?= =?UTF-8?q?ns=20tagg=C3=A9e=20portail-pre-migration-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6593e4591..237954f6f 100644 --- a/package.json +++ b/package.json @@ -72,8 +72,8 @@ "exports-loader": "^0.7.0", "expose-loader": "^0.7.5", "fs-extra": "^9.0.0", - "geoportal-extensions-itowns": "2.4.3", - "geoportal-extensions-openlayers": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/feature/import-no-proxy/build/scripts/release/geoportal-extensions-openlayers-3.3.4.tgz", + "geoportal-extensions-itowns": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/develop/build/scripts/release/geoportal-extensions-itowns-2.4.3.tgz", + "geoportal-extensions-openlayers": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/develop/build/scripts/release/geoportal-extensions-openlayers-3.3.4.tgz", "handlebars": "^4.7.5", "handlebars-layouts": "^3.1.4", "html-webpack-plugin": "^4.0.4", From 0f2107cb042ae3e745e9a08943011d181e933f0b Mon Sep 17 00:00:00 2001 From: elias couppe Date: Mon, 23 Oct 2023 19:14:20 +0200 Subject: [PATCH 11/26] update tgz --- scripts/release/package-SDK2D.json | 40 ++++++++++++------------- scripts/release/package-SDK3D.json | 48 +++++++++++++++--------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/scripts/release/package-SDK2D.json b/scripts/release/package-SDK2D.json index ec0bd8d1d..20d129db7 100644 --- a/scripts/release/package-SDK2D.json +++ b/scripts/release/package-SDK2D.json @@ -1,23 +1,17 @@ { + "main" : "dist/GpSDK2D-src.js", + "version" : "3.4.3", + "module" : "src/SDK2D.js", "bugs" : { "url" : "https://github.com/IGNF/geoportal-sdk/issues" }, + "repository" : { + "url" : "https://github.com/IGNF/geoportal-sdk.git", + "type" : "git" + }, + "directories" : {}, "name" : "@ignf-geoportal/sdk-2d", - "description" : "French Geoportal SDK based on OpenLayers (2D)", - "date" : "04/08/2023", - "scripts" : {}, - "module" : "src/SDK2D.js", "author" : "IGNF", - "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", - "files" : [ - "dist/", - "src/", - "LICENCE.md", - "README.md", - "package.json" - ], - "directories" : {}, - "main" : "dist/GpSDK2D-src.js", "keywords" : [ "openlayers", "geoportail", @@ -25,15 +19,21 @@ "javascript" ], "dependencies" : { + "xmldom" : "^0.1.27", "geoportal-extensions-openlayers" : "3.3.3", "node-fetch" : "^2.6.1", - "xmldom" : "^0.1.27", "ol" : "6.9.0" }, + "description" : "French Geoportal SDK based on OpenLayers (2D)", + "date" : "28/08/2023", "license" : "CECILL-B", - "version" : "3.4.2", - "repository" : { - "type" : "git", - "url" : "https://github.com/IGNF/geoportal-sdk.git" - } + "files" : [ + "dist/", + "src/", + "LICENCE.md", + "README.md", + "package.json" + ], + "scripts" : {}, + "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html" } diff --git a/scripts/release/package-SDK3D.json b/scripts/release/package-SDK3D.json index beecc83ed..94d056a31 100644 --- a/scripts/release/package-SDK3D.json +++ b/scripts/release/package-SDK3D.json @@ -1,4 +1,15 @@ { + "license" : "CECILL-B", + "author" : "IGNF", + "name" : "@ignf-geoportal/sdk-3d", + "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", + "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries", + "scripts" : {}, + "repository" : { + "url" : "https://github.com/IGNF/geoportal-sdk.git", + "type" : "git" + }, + "main" : "dist/GpSDK3D-src.js", "keywords" : [ "openlayers", "itowns", @@ -6,13 +17,20 @@ "webservice", "javascript" ], - "scripts" : {}, - "date" : "04/08/2023", - "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries", - "main" : "dist/GpSDK3D-src.js", "module" : "src/SDK3D.js", + "dependencies" : { + "geoportal-extensions-openlayers" : "3.3.3", + "itowns" : "2.38.2", + "node-fetch" : "^2.6.1", + "xmldom" : "^0.1.27", + "geoportal-extensions-itowns" : "2.4.3", + "ol" : "6.9.0" + }, + "version" : "3.4.3", "directories" : {}, - "license" : "CECILL-B", + "bugs" : { + "url" : "https://github.com/IGNF/geoportal-sdk/issues" + }, "files" : [ "dist/", "src/", @@ -20,23 +38,5 @@ "README.md", "package.json" ], - "bugs" : { - "url" : "https://github.com/IGNF/geoportal-sdk/issues" - }, - "version" : "3.4.2", - "dependencies" : { - "geoportal-extensions-openlayers" : "3.3.3", - "ol" : "6.9.0", - "node-fetch" : "^2.6.1", - "geoportal-extensions-itowns" : "2.4.3", - "itowns" : "2.38.2", - "xmldom" : "^0.1.27" - }, - "name" : "@ignf-geoportal/sdk-3d", - "repository" : { - "url" : "https://github.com/IGNF/geoportal-sdk.git", - "type" : "git" - }, - "author" : "IGNF", - "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html" + "date" : "28/08/2023" } From 8451f4e1c5457f36079b52b7d097177280359900 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Fri, 27 Oct 2023 18:49:27 +0200 Subject: [PATCH 12/26] update(package): utilisation ext-gpf beta2 --- package.json | 4 ++-- scripts/release/package-SDK2D.json | 2 +- scripts/release/package-SDK3D.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b5d4c28df..287a9c70d 100644 --- a/package.json +++ b/package.json @@ -72,8 +72,8 @@ "exports-loader": "^0.7.0", "expose-loader": "^0.7.5", "fs-extra": "^9.0.0", - "geoportal-extensions-itowns": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-itowns-2.5.0-beta.tgz", - "geoportal-extensions-openlayers": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-openlayers-3.4.0-beta.tgz", + "geoportal-extensions-itowns": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-itowns-2.5.0-beta2.tgz", + "geoportal-extensions-openlayers": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-openlayers-3.4.0-beta2.tgz", "handlebars": "^4.7.5", "handlebars-layouts": "^3.1.4", "html-webpack-plugin": "^4.0.4", diff --git a/scripts/release/package-SDK2D.json b/scripts/release/package-SDK2D.json index dea8763b3..b44492010 100644 --- a/scripts/release/package-SDK2D.json +++ b/scripts/release/package-SDK2D.json @@ -25,7 +25,7 @@ "dependencies" : { "xmldom" : "^0.1.27", "ol" : "6.9.0", - "geoportal-extensions-openlayers" : "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-openlayers-3.4.0-beta.tgz", + "geoportal-extensions-openlayers" : "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-openlayers-3.4.0-beta2.tgz", "node-fetch" : "^2.6.1" }, "author" : "IGNF", diff --git a/scripts/release/package-SDK3D.json b/scripts/release/package-SDK3D.json index 7263ae7df..352275007 100644 --- a/scripts/release/package-SDK3D.json +++ b/scripts/release/package-SDK3D.json @@ -5,10 +5,10 @@ "url" : "https://github.com/IGNF/geoportal-sdk/issues" }, "dependencies" : { - "geoportal-extensions-itowns" : "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-itowns-2.5.0-beta.tgz", + "geoportal-extensions-itowns" : "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-itowns-2.5.0-beta2.tgz", "xmldom" : "^0.1.27", "ol" : "6.9.0", - "geoportal-extensions-openlayers" : "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-openlayers-3.4.0-beta.tgz", + "geoportal-extensions-openlayers" : "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-openlayers-3.4.0-beta2.tgz", "itowns" : "2.38.2", "node-fetch" : "^2.6.1" }, From ba72cef308b05c9725e311bbbb77b945dbcd2a64 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Mon, 30 Oct 2023 19:22:48 +0100 Subject: [PATCH 13/26] release 3.5.0-beta2 --- DRAFT_CHANGELOG.md | 6 ++++ package.json | 12 +++---- scripts/release/package-SDK2D.json | 48 +++++++++++++------------- scripts/release/package-SDK3D.json | 54 +++++++++++++++--------------- 4 files changed, 63 insertions(+), 57 deletions(-) diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md index cfc60e76e..1ab6a3030 100644 --- a/DRAFT_CHANGELOG.md +++ b/DRAFT_CHANGELOG.md @@ -6,12 +6,18 @@ ## Summary +Release 3.5.0-beta2 : utilisation du service de Geocodage de la Geoplateforme + ## Changelog * [Added] * [Changed] + - Les widgets utilisent le service d'automplétion, de geocodage direct et inverse de la Geoplateforme + - Extensions en beta2 + - Bibliothèque d'accès en beta2 + * [Removed] * [Fixed] diff --git a/package.json b/package.json index 287a9c70d..9072ba2ec 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "geoportal-sdk", - "version": "3.5.0-beta", - "date": "21/09/2023", - "SDK2DVersion": "3.5.0-beta", - "SDK3DVersion": "3.5.0-beta", + "version": "3.5.0-beta2", + "date": "30/10/2023", + "SDK2DVersion": "3.5.0-beta2", + "SDK3DVersion": "3.5.0-beta2", "description": "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries", "main": "dist/2d/GpSDK2D-src.js, dist/3d/GpSDK3d-src.js", "module": "src/SDK2D.js, src/SDK3D.js", @@ -72,8 +72,8 @@ "exports-loader": "^0.7.0", "expose-loader": "^0.7.5", "fs-extra": "^9.0.0", - "geoportal-extensions-itowns": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-itowns-2.5.0-beta2.tgz", - "geoportal-extensions-openlayers": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-openlayers-3.4.0-beta2.tgz", + "geoportal-extensions-itowns": "2.5.0-beta2", + "geoportal-extensions-openlayers": "3.4.0-beta2", "handlebars": "^4.7.5", "handlebars-layouts": "^3.1.4", "html-webpack-plugin": "^4.0.4", diff --git a/scripts/release/package-SDK2D.json b/scripts/release/package-SDK2D.json index b44492010..837870e8b 100644 --- a/scripts/release/package-SDK2D.json +++ b/scripts/release/package-SDK2D.json @@ -1,19 +1,23 @@ { + "module" : "src/SDK2D.js", + "dependencies" : { + "geoportal-extensions-openlayers" : "3.4.0-beta2", + "node-fetch" : "^2.6.1", + "ol" : "6.9.0", + "xmldom" : "^0.1.27" + }, + "keywords" : [ + "openlayers", + "geoportail", + "webservice", + "javascript" + ], "name" : "@ignf-geoportal/sdk-2d", - "description" : "French Geoportal SDK based on OpenLayers (2D)", - "license" : "CECILL-B", - "date" : "21/09/2023", - "main" : "dist/GpSDK2D-src.js", "directories" : {}, - "repository" : { - "url" : "https://github.com/IGNF/geoportal-sdk.git", - "type" : "git" - }, + "main" : "dist/GpSDK2D-src.js", "bugs" : { "url" : "https://github.com/IGNF/geoportal-sdk/issues" }, - "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", - "version" : "3.5.0-beta", "files" : [ "dist/", "src/", @@ -21,19 +25,15 @@ "README.md", "package.json" ], - "scripts" : {}, - "dependencies" : { - "xmldom" : "^0.1.27", - "ol" : "6.9.0", - "geoportal-extensions-openlayers" : "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-openlayers-3.4.0-beta2.tgz", - "node-fetch" : "^2.6.1" - }, + "date" : "30/10/2023", "author" : "IGNF", - "keywords" : [ - "openlayers", - "geoportail", - "webservice", - "javascript" - ], - "module" : "src/SDK2D.js" + "description" : "French Geoportal SDK based on OpenLayers (2D)", + "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", + "repository" : { + "type" : "git", + "url" : "https://github.com/IGNF/geoportal-sdk.git" + }, + "license" : "CECILL-B", + "scripts" : {}, + "version" : "3.5.0-beta2" } diff --git a/scripts/release/package-SDK3D.json b/scripts/release/package-SDK3D.json index 352275007..bb5785bae 100644 --- a/scripts/release/package-SDK3D.json +++ b/scripts/release/package-SDK3D.json @@ -1,34 +1,24 @@ { - "directories" : {}, - "module" : "src/SDK3D.js", - "bugs" : { - "url" : "https://github.com/IGNF/geoportal-sdk/issues" + "main" : "dist/GpSDK3D-src.js", + "repository" : { + "type" : "git", + "url" : "https://github.com/IGNF/geoportal-sdk.git" }, + "license" : "CECILL-B", "dependencies" : { - "geoportal-extensions-itowns" : "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-itowns-2.5.0-beta2.tgz", - "xmldom" : "^0.1.27", - "ol" : "6.9.0", - "geoportal-extensions-openlayers" : "https://raw.githubusercontent.com/IGNF/geoportal-extensions/releases-gpf-beta/build/scripts/release/geoportal-extensions-openlayers-3.4.0-beta2.tgz", + "geoportal-extensions-itowns" : "2.5.0-beta2", "itowns" : "2.38.2", - "node-fetch" : "^2.6.1" + "node-fetch" : "^2.6.1", + "xmldom" : "^0.1.27", + "geoportal-extensions-openlayers" : "3.4.0-beta2", + "ol" : "6.9.0" }, - "files" : [ - "dist/", - "src/", - "LICENCE.md", - "README.md", - "package.json" - ], - "name" : "@ignf-geoportal/sdk-3d", - "main" : "dist/GpSDK3D-src.js", + "scripts" : {}, "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries", - "version" : "3.5.0-beta", - "repository" : { - "url" : "https://github.com/IGNF/geoportal-sdk.git", - "type" : "git" - }, - "date" : "21/09/2023", - "license" : "CECILL-B", + "directories" : {}, + "name" : "@ignf-geoportal/sdk-3d", + "version" : "3.5.0-beta2", + "date" : "30/10/2023", "keywords" : [ "openlayers", "itowns", @@ -36,7 +26,17 @@ "webservice", "javascript" ], - "scripts" : {}, + "files" : [ + "dist/", + "src/", + "LICENCE.md", + "README.md", + "package.json" + ], + "author" : "IGNF", "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", - "author" : "IGNF" + "bugs" : { + "url" : "https://github.com/IGNF/geoportal-sdk/issues" + }, + "module" : "src/SDK3D.js" } From d327c374135b6d9a449debe8643724ebddeaf776 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Thu, 23 Nov 2023 16:05:24 +0100 Subject: [PATCH 14/26] release 3.5.0-beta3 utlisation des extensions en beta3 --- DRAFT_CHANGELOG.md | 7 ++--- package.json | 12 ++++---- scripts/release/package-SDK2D.json | 42 +++++++++++++------------- scripts/release/package-SDK3D.json | 48 +++++++++++++++--------------- 4 files changed, 54 insertions(+), 55 deletions(-) diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md index 1ab6a3030..ba1ebaea4 100644 --- a/DRAFT_CHANGELOG.md +++ b/DRAFT_CHANGELOG.md @@ -6,7 +6,7 @@ ## Summary -Release 3.5.0-beta2 : utilisation du service de Geocodage de la Geoplateforme +Release 3.5.0-beta3 : ajout possible de couches à accès restreint avec clé personnelle via un fichier de configuration custom ## Changelog @@ -14,9 +14,8 @@ Release 3.5.0-beta2 : utilisation du service de Geocodage de la Geoplateforme * [Changed] - - Les widgets utilisent le service d'automplétion, de geocodage direct et inverse de la Geoplateforme - - Extensions en beta2 - - Bibliothèque d'accès en beta2 + - L'ajout simplifié de couches WMTS/WMS en accès restreint de l'IGN sur la Géoplateforme est possible. + - Extensions en beta3 * [Removed] diff --git a/package.json b/package.json index 9072ba2ec..a7619c55d 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "geoportal-sdk", - "version": "3.5.0-beta2", - "date": "30/10/2023", - "SDK2DVersion": "3.5.0-beta2", - "SDK3DVersion": "3.5.0-beta2", + "version": "3.5.0-beta3", + "date": "23/11/2023", + "SDK2DVersion": "3.5.0-beta3", + "SDK3DVersion": "3.5.0-beta3", "description": "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries", "main": "dist/2d/GpSDK2D-src.js, dist/3d/GpSDK3d-src.js", "module": "src/SDK2D.js, src/SDK3D.js", @@ -72,8 +72,8 @@ "exports-loader": "^0.7.0", "expose-loader": "^0.7.5", "fs-extra": "^9.0.0", - "geoportal-extensions-itowns": "2.5.0-beta2", - "geoportal-extensions-openlayers": "3.4.0-beta2", + "geoportal-extensions-itowns": "2.5.0-beta3", + "geoportal-extensions-openlayers": "3.4.0-beta3", "handlebars": "^4.7.5", "handlebars-layouts": "^3.1.4", "html-webpack-plugin": "^4.0.4", diff --git a/scripts/release/package-SDK2D.json b/scripts/release/package-SDK2D.json index 837870e8b..02160d61e 100644 --- a/scripts/release/package-SDK2D.json +++ b/scripts/release/package-SDK2D.json @@ -1,23 +1,33 @@ { - "module" : "src/SDK2D.js", - "dependencies" : { - "geoportal-extensions-openlayers" : "3.4.0-beta2", - "node-fetch" : "^2.6.1", - "ol" : "6.9.0", - "xmldom" : "^0.1.27" - }, "keywords" : [ "openlayers", "geoportail", "webservice", "javascript" ], - "name" : "@ignf-geoportal/sdk-2d", - "directories" : {}, - "main" : "dist/GpSDK2D-src.js", + "date" : "23/11/2023", "bugs" : { "url" : "https://github.com/IGNF/geoportal-sdk/issues" }, + "module" : "src/SDK2D.js", + "author" : "IGNF", + "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", + "scripts" : {}, + "license" : "CECILL-B", + "repository" : { + "type" : "git", + "url" : "https://github.com/IGNF/geoportal-sdk.git" + }, + "dependencies" : { + "xmldom" : "^0.1.27", + "geoportal-extensions-openlayers" : "3.4.0-beta2", + "node-fetch" : "^2.6.1", + "ol" : "6.9.0" + }, + "main" : "dist/GpSDK2D-src.js", + "version" : "3.5.0-beta3", + "description" : "French Geoportal SDK based on OpenLayers (2D)", + "directories" : {}, "files" : [ "dist/", "src/", @@ -25,15 +35,5 @@ "README.md", "package.json" ], - "date" : "30/10/2023", - "author" : "IGNF", - "description" : "French Geoportal SDK based on OpenLayers (2D)", - "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", - "repository" : { - "type" : "git", - "url" : "https://github.com/IGNF/geoportal-sdk.git" - }, - "license" : "CECILL-B", - "scripts" : {}, - "version" : "3.5.0-beta2" + "name" : "@ignf-geoportal/sdk-2d" } diff --git a/scripts/release/package-SDK3D.json b/scripts/release/package-SDK3D.json index bb5785bae..089a9a81c 100644 --- a/scripts/release/package-SDK3D.json +++ b/scripts/release/package-SDK3D.json @@ -1,31 +1,10 @@ { - "main" : "dist/GpSDK3D-src.js", + "directories" : {}, "repository" : { "type" : "git", "url" : "https://github.com/IGNF/geoportal-sdk.git" }, - "license" : "CECILL-B", - "dependencies" : { - "geoportal-extensions-itowns" : "2.5.0-beta2", - "itowns" : "2.38.2", - "node-fetch" : "^2.6.1", - "xmldom" : "^0.1.27", - "geoportal-extensions-openlayers" : "3.4.0-beta2", - "ol" : "6.9.0" - }, - "scripts" : {}, - "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries", - "directories" : {}, - "name" : "@ignf-geoportal/sdk-3d", - "version" : "3.5.0-beta2", - "date" : "30/10/2023", - "keywords" : [ - "openlayers", - "itowns", - "geoportail", - "webservice", - "javascript" - ], + "main" : "dist/GpSDK3D-src.js", "files" : [ "dist/", "src/", @@ -34,9 +13,30 @@ "package.json" ], "author" : "IGNF", + "date" : "23/11/2023", + "version" : "3.5.0-beta3", "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", + "keywords" : [ + "openlayers", + "itowns", + "geoportail", + "webservice", + "javascript" + ], + "dependencies" : { + "xmldom" : "^0.1.27", + "node-fetch" : "^2.6.1", + "geoportal-extensions-itowns" : "2.5.0-beta2", + "itowns" : "2.38.2", + "geoportal-extensions-openlayers" : "3.4.0-beta2", + "ol" : "6.9.0" + }, + "license" : "CECILL-B", + "module" : "src/SDK3D.js", + "name" : "@ignf-geoportal/sdk-3d", "bugs" : { "url" : "https://github.com/IGNF/geoportal-sdk/issues" }, - "module" : "src/SDK3D.js" + "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries", + "scripts" : {} } From 3a5b88381018438f623bca7457be449a78534003 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Thu, 23 Nov 2023 16:23:18 +0100 Subject: [PATCH 15/26] release 3.5.0-beta3 : update package --- scripts/release/package-SDK2D.json | 44 ++++++++++++++-------------- scripts/release/package-SDK3D.json | 46 +++++++++++++++--------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/scripts/release/package-SDK2D.json b/scripts/release/package-SDK2D.json index 02160d61e..08ea76624 100644 --- a/scripts/release/package-SDK2D.json +++ b/scripts/release/package-SDK2D.json @@ -1,39 +1,39 @@ { + "main" : "dist/GpSDK2D-src.js", "keywords" : [ "openlayers", "geoportail", "webservice", "javascript" ], - "date" : "23/11/2023", - "bugs" : { - "url" : "https://github.com/IGNF/geoportal-sdk/issues" - }, + "files" : [ + "dist/", + "src/", + "LICENCE.md", + "README.md", + "package.json" + ], "module" : "src/SDK2D.js", "author" : "IGNF", - "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", - "scripts" : {}, - "license" : "CECILL-B", + "version" : "3.5.0-beta3", "repository" : { "type" : "git", "url" : "https://github.com/IGNF/geoportal-sdk.git" }, + "name" : "@ignf-geoportal/sdk-2d", + "description" : "French Geoportal SDK based on OpenLayers (2D)", + "license" : "CECILL-B", + "date" : "23/11/2023", + "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", + "directories" : {}, + "bugs" : { + "url" : "https://github.com/IGNF/geoportal-sdk/issues" + }, "dependencies" : { - "xmldom" : "^0.1.27", - "geoportal-extensions-openlayers" : "3.4.0-beta2", "node-fetch" : "^2.6.1", - "ol" : "6.9.0" + "xmldom" : "^0.1.27", + "ol" : "6.9.0", + "geoportal-extensions-openlayers" : "3.4.0-beta3" }, - "main" : "dist/GpSDK2D-src.js", - "version" : "3.5.0-beta3", - "description" : "French Geoportal SDK based on OpenLayers (2D)", - "directories" : {}, - "files" : [ - "dist/", - "src/", - "LICENCE.md", - "README.md", - "package.json" - ], - "name" : "@ignf-geoportal/sdk-2d" + "scripts" : {} } diff --git a/scripts/release/package-SDK3D.json b/scripts/release/package-SDK3D.json index 089a9a81c..88e130940 100644 --- a/scripts/release/package-SDK3D.json +++ b/scripts/release/package-SDK3D.json @@ -1,10 +1,29 @@ { + "date" : "23/11/2023", + "author" : "IGNF", + "bugs" : { + "url" : "https://github.com/IGNF/geoportal-sdk/issues" + }, + "scripts" : {}, + "main" : "dist/GpSDK3D-src.js", + "dependencies" : { + "itowns" : "2.38.2", + "ol" : "6.9.0", + "xmldom" : "^0.1.27", + "geoportal-extensions-openlayers" : "3.4.0-beta3", + "geoportal-extensions-itowns" : "2.5.0-beta3", + "node-fetch" : "^2.6.1" + }, + "license" : "CECILL-B", + "module" : "src/SDK3D.js", + "name" : "@ignf-geoportal/sdk-3d", + "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries", "directories" : {}, "repository" : { - "type" : "git", - "url" : "https://github.com/IGNF/geoportal-sdk.git" + "url" : "https://github.com/IGNF/geoportal-sdk.git", + "type" : "git" }, - "main" : "dist/GpSDK3D-src.js", + "version" : "3.5.0-beta3", "files" : [ "dist/", "src/", @@ -12,10 +31,6 @@ "README.md", "package.json" ], - "author" : "IGNF", - "date" : "23/11/2023", - "version" : "3.5.0-beta3", - "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", "keywords" : [ "openlayers", "itowns", @@ -23,20 +38,5 @@ "webservice", "javascript" ], - "dependencies" : { - "xmldom" : "^0.1.27", - "node-fetch" : "^2.6.1", - "geoportal-extensions-itowns" : "2.5.0-beta2", - "itowns" : "2.38.2", - "geoportal-extensions-openlayers" : "3.4.0-beta2", - "ol" : "6.9.0" - }, - "license" : "CECILL-B", - "module" : "src/SDK3D.js", - "name" : "@ignf-geoportal/sdk-3d", - "bugs" : { - "url" : "https://github.com/IGNF/geoportal-sdk/issues" - }, - "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries", - "scripts" : {} + "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html" } From 32724737d138b369aff0b3181975ae6fad4da895 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Fri, 15 Dec 2023 14:03:27 +0100 Subject: [PATCH 16/26] release 3.5.0-beta4 --- DRAFT_CHANGELOG.md | 6 +++--- package.json | 12 ++++++------ scripts/release/package-SDK2D.json | 6 +++--- scripts/release/package-SDK3D.json | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md index ba1ebaea4..8f42cf673 100644 --- a/DRAFT_CHANGELOG.md +++ b/DRAFT_CHANGELOG.md @@ -6,7 +6,7 @@ ## Summary -Release 3.5.0-beta3 : ajout possible de couches à accès restreint avec clé personnelle via un fichier de configuration custom +Release 3.5.0-beta4 : branchement au service d'altimétrie de la Géoplateforme ## Changelog @@ -14,8 +14,8 @@ Release 3.5.0-beta3 : ajout possible de couches à accès restreint avec clé pe * [Changed] - - L'ajout simplifié de couches WMTS/WMS en accès restreint de l'IGN sur la Géoplateforme est possible. - - Extensions en beta3 + - Bibliothèque d'accès aux services en beta 4 + - Extensions en beta 4 * [Removed] diff --git a/package.json b/package.json index a7619c55d..e93486da0 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "geoportal-sdk", - "version": "3.5.0-beta3", - "date": "23/11/2023", - "SDK2DVersion": "3.5.0-beta3", - "SDK3DVersion": "3.5.0-beta3", + "version": "3.5.0-beta4", + "date": "15/12/2023", + "SDK2DVersion": "3.5.0-beta4", + "SDK3DVersion": "3.5.0-beta4", "description": "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries", "main": "dist/2d/GpSDK2D-src.js, dist/3d/GpSDK3d-src.js", "module": "src/SDK2D.js, src/SDK3D.js", @@ -72,8 +72,8 @@ "exports-loader": "^0.7.0", "expose-loader": "^0.7.5", "fs-extra": "^9.0.0", - "geoportal-extensions-itowns": "2.5.0-beta3", - "geoportal-extensions-openlayers": "3.4.0-beta3", + "geoportal-extensions-itowns": "2.5.0-beta4", + "geoportal-extensions-openlayers": "3.4.0-beta4", "handlebars": "^4.7.5", "handlebars-layouts": "^3.1.4", "html-webpack-plugin": "^4.0.4", diff --git a/scripts/release/package-SDK2D.json b/scripts/release/package-SDK2D.json index 08ea76624..3ff442da4 100644 --- a/scripts/release/package-SDK2D.json +++ b/scripts/release/package-SDK2D.json @@ -15,7 +15,7 @@ ], "module" : "src/SDK2D.js", "author" : "IGNF", - "version" : "3.5.0-beta3", + "version" : "3.5.0-beta4", "repository" : { "type" : "git", "url" : "https://github.com/IGNF/geoportal-sdk.git" @@ -23,7 +23,7 @@ "name" : "@ignf-geoportal/sdk-2d", "description" : "French Geoportal SDK based on OpenLayers (2D)", "license" : "CECILL-B", - "date" : "23/11/2023", + "date" : "15/12/2023", "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html", "directories" : {}, "bugs" : { @@ -33,7 +33,7 @@ "node-fetch" : "^2.6.1", "xmldom" : "^0.1.27", "ol" : "6.9.0", - "geoportal-extensions-openlayers" : "3.4.0-beta3" + "geoportal-extensions-openlayers" : "3.4.0-beta4" }, "scripts" : {} } diff --git a/scripts/release/package-SDK3D.json b/scripts/release/package-SDK3D.json index 88e130940..3b5d64b68 100644 --- a/scripts/release/package-SDK3D.json +++ b/scripts/release/package-SDK3D.json @@ -1,5 +1,5 @@ { - "date" : "23/11/2023", + "date" : "15/12/2023", "author" : "IGNF", "bugs" : { "url" : "https://github.com/IGNF/geoportal-sdk/issues" @@ -10,8 +10,8 @@ "itowns" : "2.38.2", "ol" : "6.9.0", "xmldom" : "^0.1.27", - "geoportal-extensions-openlayers" : "3.4.0-beta3", - "geoportal-extensions-itowns" : "2.5.0-beta3", + "geoportal-extensions-openlayers" : "3.4.0-beta4", + "geoportal-extensions-itowns" : "2.5.0-beta4", "node-fetch" : "^2.6.1" }, "license" : "CECILL-B", @@ -23,7 +23,7 @@ "url" : "https://github.com/IGNF/geoportal-sdk.git", "type" : "git" }, - "version" : "3.5.0-beta3", + "version" : "3.5.0-beta4", "files" : [ "dist/", "src/", From d07a043749551fc199b02935512432f6cfb6eb70 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Tue, 5 Mar 2024 17:23:27 +0100 Subject: [PATCH 17/26] fix: no tile grid (256) pour couches tuiles VT avec OL --- src/OpenLayers/OlMapVectorTile.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/OpenLayers/OlMapVectorTile.js b/src/OpenLayers/OlMapVectorTile.js index f97ab72c2..28190c97a 100644 --- a/src/OpenLayers/OlMapVectorTile.js +++ b/src/OpenLayers/OlMapVectorTile.js @@ -1308,14 +1308,15 @@ OlMap.prototype._addMapBoxLayer = function (layerObj) { vectorSource = new VectorTileSource({ attributions : vectorTileJson.getAttributions() || tileJSONContent.attribution, format : vectorFormat, - // overlaps ? - // projection ? - tileGrid : olCreateXYZTileGrid({ - extent : _glSource.bounds, // [minx, miny, maxx, maxy] - maxZoom : tileJSONContent.maxzoom || _glSource.maxzoom || 22, - minZoom : tileJSONContent.minzoom || _glSource.minzoom || 0, - tileSize : tileJSONContent.tileSize || _glSource.tileSize || 256 - }), + // INFO + // on supprime la grille pour forcer l'utilisation par defaut des tuiles en 512 + // sur du vecteur tuilé + // tileGrid : olCreateXYZTileGrid({ // TODO scheme tms ? + // extent : _glSource.bounds, // [minx, miny, maxx, maxy] + // maxZoom : _glSource.maxzoom || 22, + // minZoom : _glSource.minzoom || 1, + // tileSize : _glSource.tileSize || 256 + // }), urls : tiles }); vectorSource._title = _title; From 263f38dfadc945427dc2f1537c768a5da52d19d0 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Thu, 7 Mar 2024 17:53:49 +0100 Subject: [PATCH 18/26] fix(tilegrid):512 oubli d'une occurence --- src/OpenLayers/OlMapVectorTile.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/OpenLayers/OlMapVectorTile.js b/src/OpenLayers/OlMapVectorTile.js index 28190c97a..2d8b446f0 100644 --- a/src/OpenLayers/OlMapVectorTile.js +++ b/src/OpenLayers/OlMapVectorTile.js @@ -1221,12 +1221,12 @@ OlMap.prototype._addMapBoxLayer = function (layerObj) { // overlaps // projection format : vectorFormat, - tileGrid : olCreateXYZTileGrid({ // TODO scheme tms ? - extent : _glSource.bounds, // [minx, miny, maxx, maxy] - maxZoom : _glSource.maxzoom || 22, - minZoom : _glSource.minzoom || 1, - tileSize : _glSource.tileSize || 256 - }), + // tileGrid : olCreateXYZTileGrid({ // TODO scheme tms ? + // extent : _glSource.bounds, // [minx, miny, maxx, maxy] + // maxZoom : _glSource.maxzoom || 22, + // minZoom : _glSource.minzoom || 1, + // tileSize : _glSource.tileSize || 256 + // }), urls : _glTiles }); vectorSource._title = _title; From c74391f0a8bc5f47eedc1e6dbf9517ff8e895a58 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Mon, 11 Mar 2024 19:29:41 +0100 Subject: [PATCH 19/26] fix(2D:VectorTiles): revert TileSize 512, mauvais rendu --- src/OpenLayers/OlMapVectorTile.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/OpenLayers/OlMapVectorTile.js b/src/OpenLayers/OlMapVectorTile.js index 2d8b446f0..4892acfee 100644 --- a/src/OpenLayers/OlMapVectorTile.js +++ b/src/OpenLayers/OlMapVectorTile.js @@ -1221,12 +1221,12 @@ OlMap.prototype._addMapBoxLayer = function (layerObj) { // overlaps // projection format : vectorFormat, - // tileGrid : olCreateXYZTileGrid({ // TODO scheme tms ? - // extent : _glSource.bounds, // [minx, miny, maxx, maxy] - // maxZoom : _glSource.maxzoom || 22, - // minZoom : _glSource.minzoom || 1, - // tileSize : _glSource.tileSize || 256 - // }), + tileGrid : olCreateXYZTileGrid({ // TODO scheme tms ? + extent : _glSource.bounds, // [minx, miny, maxx, maxy] + maxZoom : _glSource.maxzoom || 22, + minZoom : _glSource.minzoom || 1, + tileSize : _glSource.tileSize || 256 + }), urls : _glTiles }); vectorSource._title = _title; @@ -1308,15 +1308,15 @@ OlMap.prototype._addMapBoxLayer = function (layerObj) { vectorSource = new VectorTileSource({ attributions : vectorTileJson.getAttributions() || tileJSONContent.attribution, format : vectorFormat, - // INFO + // INFO // on supprime la grille pour forcer l'utilisation par defaut des tuiles en 512 // sur du vecteur tuilé - // tileGrid : olCreateXYZTileGrid({ // TODO scheme tms ? - // extent : _glSource.bounds, // [minx, miny, maxx, maxy] - // maxZoom : _glSource.maxzoom || 22, - // minZoom : _glSource.minzoom || 1, - // tileSize : _glSource.tileSize || 256 - // }), + tileGrid : olCreateXYZTileGrid({ // TODO scheme tms ? + extent : _glSource.bounds, // [minx, miny, maxx, maxy] + maxZoom : _glSource.maxzoom || 22, + minZoom : _glSource.minzoom || 1, + tileSize : _glSource.tileSize || 256 + }), urls : tiles }); vectorSource._title = _title; From c7d2407e0fc66e3f3ec14bfcd90b91a392575bd4 Mon Sep 17 00:00:00 2001 From: elias couppe Date: Fri, 15 Mar 2024 17:46:48 +0100 Subject: [PATCH 20/26] =?UTF-8?q?docs:=20mise=20=C3=A0=20jour=20globale=20?= =?UTF-8?q?de=20la=20doc=20pour=20la=20GPF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README-SDK-2D.md | 73 +++++++++++-------- README-SDK-3D.md | 54 +++++++------- .../pages/2d/page-changeLayersColor-amd.html | 6 +- .../2d/page-changeLayersColor-bundle.html | 6 +- .../pages/2d/page-changeLayersColor-es6.html | 6 +- .../pages/2d/page-controlsOptions-bundle.html | 2 +- samples-src/pages/2d/page-gfi-bundle.html | 10 +-- .../pages/2d/page-layersPosition-bundle.html | 4 +- .../2d/page-without-autoconf-bundle.html | 6 +- samples-src/pages/2d/page-wms-gfi-bundle.html | 2 +- .../pages/2d/page-wmts-geoportail-bundle.html | 2 +- .../pages/3d/page-boostRelief-bundle.html | 2 +- samples-src/pages/3d/page-geojson-bundle.html | 2 +- .../3d/page-geojson-with-points-bundle.html | 2 +- samples-src/pages/3d/page-gpx-bundle.html | 2 +- samples-src/pages/3d/page-kml-bundle.html | 2 +- .../pages/3d/page-layerSwitcher-bundle.html | 2 +- ...erSwitcher-layer-added-from-ol-bundle.html | 2 +- samples-src/pages/3d/page-miniMap-bundle.html | 2 +- .../pages/3d/page-mousePosition-bundle.html | 2 +- samples-src/pages/3d/page-scale-bundle.html | 2 +- samples-src/pages/3d/page-test-bundle.html | 4 +- .../page-without-autoconf-2d-3d-bundle.html | 2 +- .../page-without-autoconf-3d-2d-bundle.html | 2 +- samples-src/pages/3d/page-wms-gfi-bundle.html | 2 +- src/Interface/IMapBase.js | 2 +- src/OpenLayers/OlMapControls.js | 6 +- 27 files changed, 110 insertions(+), 99 deletions(-) diff --git a/README-SDK-2D.md b/README-SDK-2D.md index bfc46c1d8..a4d3724bc 100644 --- a/README-SDK-2D.md +++ b/README-SDK-2D.md @@ -1,4 +1,4 @@ -# Kit de Développement (SDK) Géoportail - version 2D +# Kit de Développement (SDK) Géoplateforme - version 2D @@ -11,15 +11,15 @@ * [Utilisation dans module ES6](#utilisation-dans-module-es6) * [Interfaces de programmation](#interfaces-de-programmation) * [Création et affichage d'une carte](#creation-et-affichage-dune-carte) - * [Configuration de l'accès à la plateforme Géoportail](#configuration-de-lacces-a-la-plateforme-geoportail) + * [Configuration de l'accès à la Géoplateforme](#configuration-de-lacces-a-la-geoplateforme) * [Configuration dynamique](#configuration-dynamique) * [Optimisation du chargement : configuration locale](#optimisation-du-chargement--configuration-locale) * [Configuration du centrage de la carte](#configuration-du-centrage-de-la-carte) + [Centrage par coordonnées](#centrage-par-coordonnees) - + [Centrage en utilisant le service de géocodage du Géoportail](#centrage-en-utilisant-le-service-de-geocodage-du-geoportail) + + [Centrage en utilisant le service de géocodage du Géoplateforme](#centrage-en-utilisant-le-service-de-geocodage-du-geoplateforme) + [Centrage par géolocalisation du terminal utilisé](#centrage-par-geolocalisation-du-terminal-utilise) * [Configuration des couches utilisées pour composer la carte](#configuration-des-couches-utilisees-pour-composer-la-carte) - + [Affichage des couches Géoportail WMS et WMTS](#affichage-des-couches-geoportail-wms-et-wmts) + + [Affichage des couches Géoplateforme WMS et WMTS](#affichage-des-couches-geoplateforme-wms-et-wmts) + [Affichage des couches "externes"](#affichage-des-couches-externes) * [Configuration des markers](#configuration-des-markers) * [Configuration des outils additionnels à proposer sur la carte](#configuration-des-outils-additionnels-a-proposer-sur-la-carte) @@ -30,7 +30,7 @@ -Le Kit de Développement Géoportail dans sa version "SDK-2D" s’adresse à des gestionnaires de site internet désireux de proposer rapidement une cartographie dynamique en 2D utilisant les fonds IGN sur leur site et faisant appel à des fonctionnalités simples : +Le Kit de Développement Web Géoplateforme dans sa version "SDK-2D" s’adresse à des gestionnaires de site internet désireux de proposer rapidement une cartographie dynamique en 2D utilisant les fonds IGN sur leur site et faisant appel à des fonctionnalités simples : * positionnement de la carte ([centrage, orientation, niveau de zoom](#center)) @@ -44,12 +44,12 @@ Le Kit de Développement Géoportail dans sa version "SDK-2D" s’adresse à des ### Téléchargement -Vous pouvez récupérer le Kit de Développement Géoportail soit par [téléchargement direct](#download-direct), soit en utilisant le [gestionnaire de dépendances javascript NPM](#download-npm). +Vous pouvez récupérer le Kit de Développement Web Géoplateforme soit par [téléchargement direct](#download-direct), soit en utilisant le [gestionnaire de dépendances javascript NPM](#download-npm). Il contient l'arborescence suivante : - / + / GpSDK2D.js (version minifiée du code javascript pour une utilisation en production) GpSDK2D.css @@ -68,8 +68,8 @@ Il contient l'arborescence suivante : #### Téléchargement direct -Vous pouvez télécharger la dernière version du Kit de Développement Géoportail directement sur [la page Github des releases du SDK](https://github.com/IGNF/geoportal-sdk/releases). - +Vous pouvez télécharger la dernière version du Kit de Développement Web Géoplateforme directement sur [la page Github des releases du SDK](https://github.com/IGNF/geoportal-sdk/releases). +Kit de Développement Géoplateforme L'archive téléchargée (GpSDK.zip) comprend l'arborescence décrite ci-dessus. @@ -77,7 +77,7 @@ L'archive téléchargée (GpSDK.zip) comprend l'arborescence décrite ci-dessus. #### Récupération avec NPM -Le Kit de Développement Géoportail est aussi disponible dans les dépôts [NPM](https://www.npmjs.com/package/@ignf-geoportal/sdk-2d). +Le Kit de Développement Web Géoplateforme est aussi disponible dans les dépôts [NPM](https://www.npmjs.com/package/@ignf-geoportal/sdk-2d). Prérequis : [NodeJS](https://nodejs.org/en/) et [npm](https://www.npmjs.com/) installés. @@ -105,7 +105,7 @@ Placez les fichiers du SDK géoportail dans l'arborescence de votre serveur web. Intégrez le SDK géoportail dans votre page web classiquement à l'aide d'une balise **script** pour charger le fichier javascript et d'une balise **link** pour charger le fichier css. ``` html - + @@ -118,7 +118,7 @@ import * as Gp from "@ignf-geoportal/sdk-2d"; // votre utilisation du SDK var map = Gp.Map.load("myDivId",{ - apiKey : "myApiKey", + apiKey : "monThemeGeoplateforme", ... }); ``` @@ -147,7 +147,7 @@ var map = Gp.Map.load( "mapDiv", // identifiant du conteneur HTML // options d'affichage de la carte (Gp.MapOptions) { - // clef(s) d'accès à la plateforme + // thème(s) d'accès à la plateforme apiKey: "cartes,essentiels", // centrage de la carte center : { @@ -177,9 +177,9 @@ var map = Gp.Map.load( Permet, d'afficher une carte avec les options suivantes : -* utilisation des **droits d'une ou de plusieurs clefs** 'APIKEY-1', 'APIKEY-2' ([Plus d'infos sur les possibilités de paramétrage des droits...](#config)); +* utilisation facultative de **configurations des ressources d'un ou plusieurs thème Géoplateforme** 'THEME-1', 'THEME-2'. Si absent, une configuration Géoplateforme complète est récupérée ([Plus d'infos sur les possibilités de paramétrage des droits...](#config)); -* **centrage** sur l'adresse *"73 avenue de Paris, Saint-Mandé"* (en utilisant le service de géocodage du Géoportail) zoomée au niveau 17 ; ([Plus d'infos sur les possibilités de centrage...](#center)) +* **centrage** sur l'adresse *"73 avenue de Paris, Saint-Mandé"* (en utilisant le service de géocodage du Géoplateforme) zoomée au niveau 17 ; ([Plus d'infos sur les possibilités de centrage...](#center)) * **fonds de carte** : ressource *Cartes SCAN Express Standard (GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2*). [Plus d'infos sur le paramétrage des couches...](#layers); @@ -194,14 +194,27 @@ Permet, d'afficher une carte avec les options suivantes : -### Configuration de l'accès à la plateforme Géoportail +### Configuration de l'accès à la Géoplateforme + +L'extension Géoplateforme pour iTowns exploite les services web exposés par la Géoplateforme. Ceux-ci sont en libre accès. + +Vous pouvez cependant paramétrer l'utilisation de l'extension avec une ou plusieurs thématiques Géoplateforme qui correspondent à vos besoins en générant un fichier de configuration local à partir de [cette interface](https://geoplateforme-configuration.onrender.com/) ou en passant par le paramètre apiKey. + +Si ni apiKey, ni fichier de configuration local n'est spécifié, l'utilisateur récupérera une configuration complète avec toutes les ressources de la Géoplateforme (qui pourra donc être très volumineuse). + + +Le SDK web Géoplateforme exploite les services web exposés par la Géoplateforme. Ceux-ci sont en libre accès. + +Vous pouvez cependant paramétrer l'utilisation de l'extension avec une ou plusieurs thématiques Géoplateforme qui correspondent à vos besoins en générant un fichier de configuration local à partir de [cette interface](https://geoplateforme-configuration.onrender.com/) ou en passant par le paramètre apiKey. + +Si ni apiKey, ni fichier de configuration local n'est spécifié, l'utilisateur récupérera une configuration complète avec toutes les ressources de la Géoplateforme (qui pourra donc être très volumineuse). -Le SDK Géoportail exploite les services web exposés par la plateforme Géoportail. Ceux-ci sont soumis à l'obtention d'une ou de plusieurs **clefs d'accès génériques** obtenues sur le site [geoservices.ign.fr](https://geoservices.ign.fr/services-web) ayant les droits sur les ressources que vous souhaitez exploiter. Il est possible de savoir quelle clef est associée à quelle ressource [ici](https://geoservices.ign.fr/documentation/services/tableau_ressources). +Il est possible de savoir quelle thème est associée à quelle ressource [ici](https://geoservices.ign.fr/documentation/services/tableau_ressources). ### Configuration dynamique -Une fois la ou les clefs voulues choisies, vous pouvez les utiliser pour paramétrer le SDK à l'aide de la propriété **apiKey** lors de l'initialisation de la carte : +Une fois la ou les thèmes voulus choisies, vous pouvez les utiliser pour paramétrer le SDK à l'aide de la propriété **apiKey** lors de l'initialisation de la carte : ``` javascript @@ -211,7 +224,7 @@ var map = Gp.Map.load( { ... // clef d'accès à la plateforme - apiKey: "APIKEY-1,APIKEY-2", + apiKey: "THEME-1,THEME-2", ... } ) ; @@ -272,9 +285,9 @@ var map = Gp.Map.load( Plus d'informations sur le paramétrage des projections [ici](#projections). -#### Centrage en utilisant le service de géocodage du Géoportail +#### Centrage en utilisant le service de géocodage du Géoplateforme -La propriété **location** permet de préciser le lieu à géocoder et la propriété **locationType** permet de préciser le type de Géocodage à appliquer, selon la terminologie suivante (rendez vous [ici](https://geoservices.ign.fr/documentation/geoservices/geocodage.html) pour plus d'informations sur le service de Géocodage du Géoportail...) : +La propriété **location** permet de préciser le lieu à géocoder et la propriété **locationType** permet de préciser le type de Géocodage à appliquer, selon la terminologie suivante (rendez vous [ici](https://geoservices.ign.fr/documentation/geoservices/geocodage.html) pour plus d'informations sur le service de Géocodage du Géoplateforme...) : * "PositionOfInterest" : géocodage par noms de lieux @@ -301,7 +314,7 @@ var map = Gp.Map.load( ) ; ``` -*NB* : Cette possibilité de centrage ne fonctionne que si au moins [une clef d'accès à la plateforme Géoportail utilisée pour paramétrer le SDK](#config) possède les droits nécessaires sur les ressources utilisées pour le Géocodage, par exemple la clé "essentiels". +*NB* : Cette possibilité de centrage ne fonctionne que si au moins [une clef d'accès à la Géoplateforme utilisée pour paramétrer le SDK](#config) possède les droits nécessaires sur les ressources utilisées pour le Géocodage, par exemple la clé "essentiels". #### Centrage par géolocalisation du terminal utilisé @@ -336,12 +349,12 @@ C'est un objet javascript dont chaque propriété va représenter une couche com Si cette propriété n'est pas renseignée, l'affichage se fera par défaut avec la couche des Photographies aériennes ("ORTHOIMAGERY.ORTHOPHOTOS") servie en images tuilées (WMTS) si la [clef d'accès utilisée pour initialiser la carte](#config) en possède les droits. -Selon le type de couches à afficher ("Géoportail" ou externe), le paramétrage varie. +Selon le type de couches à afficher ("Géoplateforme" ou externe), le paramétrage varie. -#### Affichage des couches Géoportail WMS et WMTS +#### Affichage des couches Géoplateforme WMS et WMTS -Les couches Géoportail sont les couches auxquelles donne droit [les clefs utilisées pour paramétrer la carte](#config). Pour ajouter une telle couche à la carte, il suffit d'utiliser son nom technique comme clef de l'objet **layersOptions** et de passer comme valeur associée, un objet javascript de type [Gp.LayerOptions](https://ignf.github.io/geoportal-sdk/latest/jsdoc/Gp.LayerOptions.html) contenant, si besoin, des propriétés particulières ou vide si la configuration par défaut convient. +Les couches Géoplateforme sont les couches auxquelles donne droit [les clefs utilisées pour paramétrer la carte](#config). Pour ajouter une telle couche à la carte, il suffit d'utiliser son nom technique comme clef de l'objet **layersOptions** et de passer comme valeur associée, un objet javascript de type [Gp.LayerOptions](https://ignf.github.io/geoportal-sdk/latest/jsdoc/Gp.LayerOptions.html) contenant, si besoin, des propriétés particulières ou vide si la configuration par défaut convient. **Exemple 1** : ajout des couches WMTS Photographies aériennes et cartes avec une opacité de 30%. @@ -368,7 +381,7 @@ var map = Gp.Map.load( **Voir l'exemple complet sur [jsFiddle](http://jsfiddle.net/ignfgeoportail/oLy81mf6/embedded/result,js,css,html/)** -**Exemple 2** : ajout de couches WMS INSPIRE servies par la plateforme Géoportail. +**Exemple 2** : ajout de couches WMS INSPIRE servies par la Géoplateforme. ``` javascript var map = Gp.Map.load( @@ -390,7 +403,7 @@ var map = Gp.Map.load( #### Affichage des couches "externes" -Les couches externes sont des données issues d'autres serveurs que ceux de la plateforme Géoportail. Pour ajouter de telles couches à la carte, vous utilisez un identifiant de votre choix comme clef de l'objet **layersOptions** et passez comme valeur associée, un objet javascript de type [Gp.LayerOptions](https://ignf.github.io/geoportal-sdk/latest/jsdoc/Gp.LayerOptions.html) contenant le paramétrage nécessaire qui permettra au SDK d'afficher la couche. +Les couches externes sont des données issues d'autres serveurs que ceux de la Géoplateforme. Pour ajouter de telles couches à la carte, vous utilisez un identifiant de votre choix comme clef de l'objet **layersOptions** et passez comme valeur associée, un objet javascript de type [Gp.LayerOptions](https://ignf.github.io/geoportal-sdk/latest/jsdoc/Gp.LayerOptions.html) contenant le paramétrage nécessaire qui permettra au SDK d'afficher la couche. Les formats supportés par le SDK pour les couches externes sont les suivants : @@ -398,7 +411,7 @@ Pour les données images : WMS, WMTS, Open Street Map Pour les données vecteur : WFS, KML, GPX, GeoJSON -Le type de couches à afficher, lorsqu'il ne s'agit pas d'une couche Géoportail, doit être passé via la propriété "format" de l'objet [Gp.LayerOptions](https://ignf.github.io/geoportal-sdk/latest/jsdoc/Gp.LayerOptions.html). +Le type de couches à afficher, lorsqu'il ne s'agit pas d'une couche Géoplateforme, doit être passé via la propriété "format" de l'objet [Gp.LayerOptions](https://ignf.github.io/geoportal-sdk/latest/jsdoc/Gp.LayerOptions.html). **Exemple** : ajout d'une couche WMS externe. @@ -579,7 +592,7 @@ L'objet [Gp.MapOptions](https://ignf.github.io/geoportal-sdk/latest/jsdoc/Gp.Map La fonction [Gp.Map.load()](https://ignf.github.io/geoportal-sdk/latest/jsdoc/module-Utils_MapLoader.html) retourne un objet de type [Gp.Map](https://ignf.github.io/geoportal-sdk/latest/jsdoc/Gp.Map.html) avec lequel il sera possible d'intéragir programmatiquement **à partir du moment où l'événement "mapLoaded" sera émis**. -Pour un bon fonctionnement, il faut donc conditionner les traitements ultérieurs au chargement de la carte à la réception de cet événement à l'aide de la propriété mapEventsOptions [comme décrit précédemment](#events). Un script javascript utilisant le SDK Géoportail aura donc l'allure générale suivante : +Pour un bon fonctionnement, il faut donc conditionner les traitements ultérieurs au chargement de la carte à la réception de cet événement à l'aide de la propriété mapEventsOptions [comme décrit précédemment](#events). Un script javascript utilisant le SDK web Géoplateforme aura donc l'allure générale suivante : ``` javascript @@ -596,7 +609,7 @@ map = Gp.Map.load( "mapDiv", // identifiant du conteneur HTML // options d'affichage de la carte (Gp.MapOptions) { - apiKey : "APIKEY-1, APIKEY-2", + apiKey : "THEME-1, THEME-2", ... mapEventsOptions : { // Appel de la fonction après le chargement de la carte diff --git a/README-SDK-3D.md b/README-SDK-3D.md index 8d9e765ba..cc4b4c50d 100644 --- a/README-SDK-3D.md +++ b/README-SDK-3D.md @@ -1,8 +1,8 @@ -# Kit de Développement (SDK) Géoportail - version 3D +# Kit de Développement (SDK) Web Géoplateforme - version 3D -- [Kit de Développement (SDK) Géoportail - version 3D](#kit-de-développement-sdk-géoportail---version-3d) +- [Kit de Développement (SDK) Web Géoplateforme - version 3D](#kit-de-développement-sdk-web-géoplateforme---version-3d) - [Mise en oeuvre](#mise-en-oeuvre) - [Téléchargement](#téléchargement) - [Téléchargement direct](#téléchargement-direct) @@ -12,15 +12,15 @@ - [Utilisation dans module ES6](#utilisation-dans-module-es6) - [Interfaces de programmation](#interfaces-de-programmation) - [Création et affichage d'une carte](#création-et-affichage-dune-carte) - - [Configuration de l'accès à la plateforme Géoportail](#configuration-de-laccès-à-la-plateforme-géoportail) + - [Configuration de l'accès à la Géoplateforme](#configuration-de-laccès-à-la-géoplateforme) - [Configuration dynamique](#configuration-dynamique) - [Optimisation du chargement : configuration locale](#optimisation-du-chargement--configuration-locale) - [Configuration du centrage de la carte](#configuration-du-centrage-de-la-carte) - [Centrage par coordonnées](#centrage-par-coordonnées) - - [Centrage en utilisant le service de géocodage du Géoportail](#centrage-en-utilisant-le-service-de-géocodage-du-géoportail) + - [Centrage en utilisant le service de géocodage du Géoplateforme](#centrage-en-utilisant-le-service-de-géocodage-du-géoplateforme) - [Centrage par géolocalisation du terminal utilisé](#centrage-par-géolocalisation-du-terminal-utilisé) - [Configuration des couches utilisées pour composer la carte](#configuration-des-couches-utilisées-pour-composer-la-carte) - - [Affichage des couches Géoportail WMS et WMTS](#affichage-des-couches-géoportail-wms-et-wmts) + - [Affichage des couches Géoplateforme WMS et WMTS](#affichage-des-couches-géoplateforme-wms-et-wmts) - [Affichage des couches "externes"](#affichage-des-couches-externes) - [Configuration des markers - visu 2D uniquement](#configuration-des-markers---visu-2d-uniquement) - [Configuration des outils additionnels à proposer sur la carte](#configuration-des-outils-additionnels-à-proposer-sur-la-carte) @@ -31,7 +31,7 @@ -Le Kit de Développement Géoportail dans sa version "SDK 3D" s’adresse à des gestionnaires de site internet désireux de proposer rapidement une cartographie dynamique en 2D et 3D utilisant les fonds IGN sur leur site et faisant appel à des fonctionnalités simples : +Le Kit de Développement Web Géoplateforme dans sa version "SDK 3D" s’adresse à des gestionnaires de site internet désireux de proposer rapidement une cartographie dynamique en 2D et 3D utilisant les fonds IGN sur leur site et faisant appel à des fonctionnalités simples : * positionnement de la carte ([centrage, orientation, niveau de zoom](#center)) @@ -45,12 +45,12 @@ Le Kit de Développement Géoportail dans sa version "SDK 3D" s’adresse à des ### Téléchargement -Vous pouvez récupérer le Kit de Développement Géoportail soit par [téléchargement direct](#download-direct), soit en utilisant le [gestionnaire de dépendances javascript NPM](#download-npm). +Vous pouvez récupérer le Kit de Développement Web Géoplateforme soit par [téléchargement direct](#download-direct), soit en utilisant le [gestionnaire de dépendances javascript NPM](#download-npm). Il contient l'arborescence suivante : - / + / GpSDK3D.js (version minifiée du code javascript pour une utilisation en production) GpSDK3D.css @@ -69,7 +69,7 @@ Il contient l'arborescence suivante : #### Téléchargement direct -Vous pouvez télécharger la dernière version du Kit de Développement Géoportail directement sur [la page Github des releases du SDK](https://github.com/IGNF/geoportal-sdk/releases). +Vous pouvez télécharger la dernière version du Kit de Développement Web Géoplateforme directement sur [la page Github des releases du SDK](https://github.com/IGNF/geoportal-sdk/releases). L'archive téléchargée (GpSDK.zip) comprend l'arborescence décrite ci-dessus. @@ -78,7 +78,7 @@ L'archive téléchargée (GpSDK.zip) comprend l'arborescence décrite ci-dessus. #### Récupération avec NPM -Le Kit de Développement Géoportail est aussi disponible dans les dépôts [NPM](https://www.npmjs.com/package/@ignf-geoportal/sdk-3d). +Le Kit de Développement Web Géoplateforme est aussi disponible dans les dépôts [NPM](https://www.npmjs.com/package/@ignf-geoportal/sdk-3d). Prérequis : [NodeJS](https://nodejs.org/en/) et [npm](https://www.npmjs.com/) installés. @@ -106,12 +106,12 @@ https://ignf.github.io/geoportal-sdk/latest/dist/3d/GpSDK3D-src.css ### Intégration dans une page web -Placez les fichiers du SDK géoportail dans l'arborescence de votre serveur web. Vous pouvez positionner à votre guise les fichiers css et javascript. Le répertoire img doit cependant être positionné au même niveau que le fichier css pour que les ressources images qui y sont référencées soient correctement chargées. +Placez les fichiers du SDK géoplateforme dans l'arborescence de votre serveur web. Vous pouvez positionner à votre guise les fichiers css et javascript. Le répertoire img doit cependant être positionné au même niveau que le fichier css pour que les ressources images qui y sont référencées soient correctement chargées. -Intégrez le SDK géoportail dans votre page web classiquement à l'aide d'une balise **script** pour charger le fichier javascript et d'une balise **link** pour charger le fichier css. +Intégrez le SDK géoplateforme dans votre page web classiquement à l'aide d'une balise **script** pour charger le fichier javascript et d'une balise **link** pour charger le fichier css. ``` html - + ``` @@ -132,7 +132,7 @@ var map = Gp.Map.load("myDivId",{ ### Interfaces de programmation -Le chargement du SDK vous donne accès à son [interface de programmation](https://ignf.github.io/geoportal-sdk/latest/jsdoc/index.html) en plus des interfaces de programmation de [la bibliothèque d'accès](http://ignf.github.io/geoportal-access-lib/latest/jsdoc/index.html) ; d'[OpenLayers](https://openlayers.org/en/v4.0.1/apidoc/) et de son [extension géoportail dédiée](http://ignf.github.io/geoportal-extensions/current/jsdoc/openlayers/); d'[iTowns](https://www.itowns-project.org/itowns/API_Doc/) et de son [extension géoportail dédiée](http://ignf.github.io/geoportal-extensions/current/jsdoc/itowns/). +Le chargement du SDK vous donne accès à son [interface de programmation](https://ignf.github.io/geoportal-sdk/latest/jsdoc/index.html) en plus des interfaces de programmation de [la bibliothèque d'accès](http://ignf.github.io/geoportal-access-lib/latest/jsdoc/index.html) ; d'[OpenLayers](https://openlayers.org/en/v4.0.1/apidoc/) et de son [extension géoplateforme dédiée](http://ignf.github.io/geoportal-extensions/current/jsdoc/openlayers/); d'[iTowns](https://www.itowns-project.org/itowns/API_Doc/) et de son [extension géoplateforme dédiée](http://ignf.github.io/geoportal-extensions/current/jsdoc/itowns/). @@ -187,7 +187,7 @@ Permet, d'afficher une carte avec les options suivantes : * **viewMode** : "**3d**" pour un chargement de la cartographie en 3D, **avec la librairie iTowns,** ou "**2d**" (par défaut) pour un chargement de la cartographie en 2D, **avec la librairie OpenLayers.** Il sera ensuite possible de basculer d'un mode de visualisation à l'autre (Voir la partie "Bascule entre 2D et 3D). -* **centrage** sur l'adresse *"73 avenue de Paris, Saint-Mandé"* (en utilisant le service de géocodage du Géoportail) zoomée au niveau 17 ; ([Plus d'infos sur les possibilités de centrage...](#center)) +* **centrage** sur l'adresse *"73 avenue de Paris, Saint-Mandé"* (en utilisant le service de géocodage de la Géoplateforme) zoomée au niveau 17 ; ([Plus d'infos sur les possibilités de centrage...](#center)) * **fonds de carte** : ressource *Cartes SCAN Express Standard (GEOGRAPHICALGRIDSYSTEMS.MAPS.SCAN-EXPRESS.STANDARD*). [Plus d'infos sur le paramétrage des couches...](#layers); @@ -198,9 +198,9 @@ Permet, d'afficher une carte avec les options suivantes : -### Configuration de l'accès à la plateforme Géoportail +### Configuration de l'accès à la Géoplateforme -Le SDK Géoportail exploite les services web exposés par la plateforme Géoportail. Ceux-ci sont soumis à l'obtention d'une ou de plusieurs **clefs d'accès génériques** obtenues sur le site [geoservices.ign.fr](https://geoservices.ign.fr/services-web) ayant les droits sur les ressources que vous souhaitez exploiter. Il est possible de savoir quelle clef est associée à quelle ressource [ici](https://geoservices.ign.fr/documentation/services/tableau_ressources). +Le SDK web Géoplateforme exploite les services web exposés par la Géoplateforme. Ceux-ci sont soumis à l'obtention d'une ou de plusieurs **clefs d'accès génériques** obtenues sur le site [geoservices.ign.fr](https://geoservices.ign.fr/services-web) ayant les droits sur les ressources que vous souhaitez exploiter. Il est possible de savoir quelle clef est associée à quelle ressource [ici](https://geoservices.ign.fr/documentation/services/tableau_ressources). ### Configuration dynamique @@ -278,9 +278,9 @@ var map = Gp.Map.load( Plus d'informations sur le paramétrage des projections [ici](#projections). -#### Centrage en utilisant le service de géocodage du Géoportail +#### Centrage en utilisant le service de géocodage de la Géoplateforme -La propriété **location** permet de préciser le lieu à géocoder et la propriété **locationType** permet de préciser le type de Géocodage à appliquer, selon la terminologie suivante (rendez vous [ici](https://geoservices.ign.fr/documentation/geoservices/geocodage.html) pour plus d'informations sur le service de Géocodage du Géoportail...) : +La propriété **location** permet de préciser le lieu à géocoder et la propriété **locationType** permet de préciser le type de Géocodage à appliquer, selon la terminologie suivante (rendez vous [ici](https://geoservices.ign.fr/documentation/geoservices/geocodage.html) pour plus d'informations sur le service de Géocodage de la Géoplateforme...) : * "PositionOfInterest" : géocodage par noms de lieux @@ -306,7 +306,7 @@ var map = Gp.Map.load( ) ; ``` -*NB* : Cette possibilité de centrage ne fonctionne que si au moins [une clef d'accès à la plateforme Géoportail utilisée pour paramétrer le SDK](#config) possède les droits nécessaires sur les ressources utilisées pour le Géocodage. +*NB* : Cette possibilité de centrage ne fonctionne que si au moins [une clef d'accès à la Géoplateforme utilisée pour paramétrer le SDK](#config) possède les droits nécessaires sur les ressources utilisées pour le Géocodage. #### Centrage par géolocalisation du terminal utilisé @@ -343,12 +343,12 @@ C'est un objet javascript dont chaque propriété va représenter une couche com Si cette propriété n'est pas renseignée, l'affichage se fera par défaut avec la couche des Photographies aériennes ("ORTHOIMAGERY.ORTHOPHOTOS") servie en images tuilées (WMTS) si la [clef d'accès utilisée pour initialiser la carte](#config) en possède les droits. -Selon le type de couches à afficher ("Géoportail" ou externe), le paramétrage varie. +Selon le type de couches à afficher ("Géoplateforme" ou externe), le paramétrage varie. -#### Affichage des couches Géoportail WMS et WMTS +#### Affichage des couches Géoplateforme WMS et WMTS -Les couches Géoportail sont les couches auxquelles donne droit [les clefs utilisées pour paramétrer la carte](#config). Pour ajouter une telle couche à la carte, il suffit d'utiliser son nom technique comme clef de l'objet **layersOptions** et de passer comme valeur associée, un objet javascript de type [Gp.LayerOptions](https://ignf.github.io/geoportal-sdk/latest/jsdoc/Gp.LayerOptions.html) contenant, si besoin, des propriétés particulières ou vide si la configuration par défaut convient. +Les couches Géoplateforme sont les couches auxquelles donne droit [les clefs utilisées pour paramétrer la carte](#config). Pour ajouter une telle couche à la carte, il suffit d'utiliser son nom technique comme clef de l'objet **layersOptions** et de passer comme valeur associée, un objet javascript de type [Gp.LayerOptions](https://ignf.github.io/geoportal-sdk/latest/jsdoc/Gp.LayerOptions.html) contenant, si besoin, des propriétés particulières ou vide si la configuration par défaut convient. Pour afficher un MNT IGN dans un contexte 3D, il suffit de renseigner le paramètre "isElevation" à true. @@ -377,7 +377,7 @@ var map = Gp.Map.load( **Voir l'exemple complet sur [jsFiddle](http://jsfiddle.net/ignfgeoportail/ewe0ms98/embedded/result,js,css,html/)** -**Exemple 2** : ajout de couches WMS INSPIRE servies par la plateforme Géoportail. +**Exemple 2** : ajout de couches WMS INSPIRE servies par la Géoplateforme. ``` javascript var map = Gp.Map.load( @@ -422,7 +422,7 @@ var map = Gp.Map.load( #### Affichage des couches "externes" -Les couches externes sont des données issues d'autres serveurs que ceux de la plateforme Géoportail. Pour ajouter de telles couches à la carte, vous utilisez un identifiant de votre choix comme clef de l'objet **layersOptions** et passez comme valeur associée, un objet javascript de type [Gp.LayerOptions](https://ignf.github.io/geoportal-sdk/latest/jsdoc/Gp.LayerOptions.html) contenant le paramétrage nécessaire qui permettra au SDK d'afficher la couche. +Les couches externes sont des données issues d'autres serveurs que ceux de la Géoplateforme. Pour ajouter de telles couches à la carte, vous utilisez un identifiant de votre choix comme clef de l'objet **layersOptions** et passez comme valeur associée, un objet javascript de type [Gp.LayerOptions](https://ignf.github.io/geoportal-sdk/latest/jsdoc/Gp.LayerOptions.html) contenant le paramétrage nécessaire qui permettra au SDK d'afficher la couche. Les formats supportés par le SDK pour les couches externes sont les suivants : @@ -430,7 +430,7 @@ Pour les données images : WMS, WMTS (Open Street Map uniquement en 2D) Pour les données vecteur : KML, GPX, GeoJSON (WFS uniquement en 2D) -Le type de couches à afficher, lorsqu'il ne s'agit pas d'une couche Géoportail, doit être passé via la propriété "format" de l'objet [Gp.LayerOptions](https://ignf.github.io/geoportal-sdk/latest/jsdoc/Gp.LayerOptions.html). +Le type de couches à afficher, lorsqu'il ne s'agit pas d'une couche Géoplateforme, doit être passé via la propriété "format" de l'objet [Gp.LayerOptions](https://ignf.github.io/geoportal-sdk/latest/jsdoc/Gp.LayerOptions.html). **Exemple** : ajout d'une couche WMS externe. @@ -637,7 +637,7 @@ L'objet [Gp.MapOptions](https://ignf.github.io/geoportal-sdk/latest/jsdoc/Gp.Map La fonction [Gp.Map.load()](https://ignf.github.io/geoportal-sdk/latest/jsdoc/module-Map.html) retourne un objet de type [Gp.Map](https://ignf.github.io/geoportal-sdk/latest/jsdoc/Gp.Map.html) avec lequel il sera possible d'interagir programmatiquement **à partir du moment où l'événement "mapLoaded" sera émis**. -Pour un bon fonctionnement, il faut donc conditionner les traitements ultérieurs au chargement de la carte à la réception de cet événement à l'aide de la propriété mapEventsOptions [comme décrit précédemment](#events). Un script javascript utilisant le SDK Géoportail aura donc l'allure générale suivante : +Pour un bon fonctionnement, il faut donc conditionner les traitements ultérieurs au chargement de la carte à la réception de cet événement à l'aide de la propriété mapEventsOptions [comme décrit précédemment](#events). Un script javascript utilisant le SDK web Géoplateforme aura donc l'allure générale suivante : ``` javascript diff --git a/samples-src/pages/2d/page-changeLayersColor-amd.html b/samples-src/pages/2d/page-changeLayersColor-amd.html index 73f17b63c..ba96209f2 100644 --- a/samples-src/pages/2d/page-changeLayersColor-amd.html +++ b/samples-src/pages/2d/page-changeLayersColor-amd.html @@ -79,7 +79,7 @@

changeLayerColor

maCoucheWFS : { title : "maCoucheWFS", format : "wfs", - url : "https://wxs.ign.fr/{{apikey}}/geoportail/wfs", + url : "https://data.geopf.fr/wfs/ows", typeNames : "LIMITES_ADMINISTRATIVES_EXPRESS.LATEST:arrondissement_departemental", version : "2.0.0", outputFormat : "application/json", @@ -92,7 +92,7 @@

changeLayerColor

format : "wms", queryable : true, tiled : false, // pour test - url : "https://wxs.ign.fr/{{apikey}}/geoportail/v/wms", + url : "https://data.geopf.fr/wms-v/wms", layers : ["UTILITYANDGOVERNMENTALSERVICES.IGN.POI.ENSEIGNEMENTPRIMAIRE"], outputFormat : "image/png" }, @@ -112,7 +112,7 @@

changeLayerColor

maxZoom : 16, visibility : true, opacity : 1 , - url : "https://wxs.ign.fr/{{apikey}}/geoportail/wmts", + url : "https://data.geopf.fr/wmts", layer : "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2", tileMatrixSet : "PM", styleName : "normal", diff --git a/samples-src/pages/2d/page-changeLayersColor-bundle.html b/samples-src/pages/2d/page-changeLayersColor-bundle.html index 200ac81be..2f4bbf03f 100644 --- a/samples-src/pages/2d/page-changeLayersColor-bundle.html +++ b/samples-src/pages/2d/page-changeLayersColor-bundle.html @@ -50,7 +50,7 @@

changeLayerColor

maCoucheWFS : { title : "maCoucheWFS", format : "wfs", - url : "https://wxs.ign.fr/{{apikey}}/geoportail/wfs", + url : "https://data.geopf.fr/wfs/ows", typeNames : "BDPARCELLAIRE-VECTEUR_WLD_BDD_WGS84G:commune", version : "2.0.0", outputFormat : "application/json", @@ -63,7 +63,7 @@

changeLayerColor

format : "wms", queryable : true, tiled : false, // pour test - url : "https://wxs.ign.fr/{{apikey}}/geoportail/v/wms", + url : "https://data.geopf.fr/wms-v/wms", layers : ["UTILITYANDGOVERNMENTALSERVICES.IGN.POI.ENSEIGNEMENTPRIMAIRE"], outputFormat : "image/png" }, @@ -83,7 +83,7 @@

changeLayerColor

maxZoom : 16, visibility : true, opacity : 0.7, - url : "https://wxs.ign.fr/{{apikey}}/geoportail/wmts", + url : "https://data.geopf.fr/wmts", layer : "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2", tileMatrixSet : "PM", styleName : "normal", diff --git a/samples-src/pages/2d/page-changeLayersColor-es6.html b/samples-src/pages/2d/page-changeLayersColor-es6.html index 9d09562e3..d70c3ae60 100644 --- a/samples-src/pages/2d/page-changeLayersColor-es6.html +++ b/samples-src/pages/2d/page-changeLayersColor-es6.html @@ -75,7 +75,7 @@

changeLayerColor

maCoucheWFS : { title : "maCoucheWFS", format : "wfs", - url : "https://wxs.ign.fr/{{apikey}}/geoportail/wfs", + url : "https://data.geopf.fr/wfs/ows", typeNames : "LIMITES_ADMINISTRATIVES_EXPRESS.LATEST:arrondissement_departemental", version : "2.0.0", outputFormat : "application/json", @@ -88,7 +88,7 @@

changeLayerColor

format : "wms", queryable : true, tiled : false, // pour test - url : "https://wxs.ign.fr/{{apikey}}/geoportail/v/wms", + url : "https://data.geopf.fr/wms-v/wms", layers : ["UTILITYANDGOVERNMENTALSERVICES.IGN.POI.ENSEIGNEMENTPRIMAIRE"], outputFormat : "image/png" }, @@ -108,7 +108,7 @@

changeLayerColor

maxZoom : 16, visibility : true, opacity : 1 , - url : "https://wxs.ign.fr/{{apikey}}/geoportail/wmts", + url : "https://data.geopf.fr/wmts", layer : "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2", tileMatrixSet : "PM", styleName : "normal", diff --git a/samples-src/pages/2d/page-controlsOptions-bundle.html b/samples-src/pages/2d/page-controlsOptions-bundle.html index accdd0106..20302bd2d 100644 --- a/samples-src/pages/2d/page-controlsOptions-bundle.html +++ b/samples-src/pages/2d/page-controlsOptions-bundle.html @@ -156,7 +156,7 @@

Ajout d'une carte avec Gp.Map.load() et l'ensemble des options possibles de layerTypes : ["WMS","WMTS","KML","GPX","GeoJSON", "Vecteur tuilé"], webServicesOptions : { proxyUrl : "{{ proxy }}?url=", - noProxyDomains : ["https://wxs.ign.fr"] + noProxyDomains : ["https://data.geopf.fr"] }, defaultStyles : { "KML" : { diff --git a/samples-src/pages/2d/page-gfi-bundle.html b/samples-src/pages/2d/page-gfi-bundle.html index 2a0222869..df923ca9b 100644 --- a/samples-src/pages/2d/page-gfi-bundle.html +++ b/samples-src/pages/2d/page-gfi-bundle.html @@ -27,8 +27,6 @@

Get Feature Info