From 1af7970ea1b1fdf188a6279e16a5888eb18c2aba Mon Sep 17 00:00:00 2001 From: "jean-philippe.bazonnais" Date: Thu, 3 Dec 2020 17:33:17 +0100 Subject: [PATCH 1/3] =?UTF-8?q?ci=20:=20ajout=20token=20github-actions=20?= =?UTF-8?q?=3D>=20token=20admin=20pour=20ecriture=20dans=20une=20branche?= =?UTF-8?q?=20protected=20(=C3=A0=20tester)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release-itowns.yml | 1 + .github/workflows/release-leaflet.yml | 1 + .github/workflows/release-ol.yml | 1 + samples-src/resources/itowns/JSONLayers/IGN_MNT.json | 2 +- samples-src/resources/itowns/JSONLayers/IGN_MNT_HIGHRES.json | 2 +- samples-src/resources/itowns/JSONLayers/IGN_MNT_SRTM.json | 2 +- samples-src/resources/itowns/JSONLayers/Ortho.json | 4 ++-- samples-src/resources/itowns/JSONLayers/OrthosCRS.json | 2 +- samples-src/resources/itowns/JSONLayers/Region.json | 2 +- samples-src/resources/itowns/JSONLayers/ScanEX.json | 2 +- 10 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-itowns.yml b/.github/workflows/release-itowns.yml index 9138c710e..b1c5677b2 100644 --- a/.github/workflows/release-itowns.yml +++ b/.github/workflows/release-itowns.yml @@ -235,6 +235,7 @@ jobs: with: repository: IGNF/geoportal-extensions ref: develop + token: ${{ secrets.ADMIN_GEOPORTAL_TOKEN }} - name: Download ChangeLog artifacts uses: actions/download-artifact@v2 diff --git a/.github/workflows/release-leaflet.yml b/.github/workflows/release-leaflet.yml index 144e04a8d..a3b664c3b 100644 --- a/.github/workflows/release-leaflet.yml +++ b/.github/workflows/release-leaflet.yml @@ -235,6 +235,7 @@ jobs: with: repository: IGNF/geoportal-extensions ref: develop + token: ${{ secrets.ADMIN_GEOPORTAL_TOKEN }} - name: Download ChangeLog artifacts uses: actions/download-artifact@v2 diff --git a/.github/workflows/release-ol.yml b/.github/workflows/release-ol.yml index 407d27a90..91e8bb304 100644 --- a/.github/workflows/release-ol.yml +++ b/.github/workflows/release-ol.yml @@ -237,6 +237,7 @@ jobs: with: repository: IGNF/geoportal-extensions ref: develop + token: ${{ secrets.ADMIN_GEOPORTAL_TOKEN }} - name: Download ChangeLog artifacts uses: actions/download-artifact@v2 diff --git a/samples-src/resources/itowns/JSONLayers/IGN_MNT.json b/samples-src/resources/itowns/JSONLayers/IGN_MNT.json index a9bc006f8..c0d8655b0 100644 --- a/samples-src/resources/itowns/JSONLayers/IGN_MNT.json +++ b/samples-src/resources/itowns/JSONLayers/IGN_MNT.json @@ -24,7 +24,7 @@ }] }], "format": "image/x-bil;bits=32", - "crs" : "EPSG:4326", + "projection" : "EPSG:4326", "tileMatrixSet": "WGS84G", "tileMatrixSetLimits": { "3": { diff --git a/samples-src/resources/itowns/JSONLayers/IGN_MNT_HIGHRES.json b/samples-src/resources/itowns/JSONLayers/IGN_MNT_HIGHRES.json index 98994dafe..5c66ad585 100644 --- a/samples-src/resources/itowns/JSONLayers/IGN_MNT_HIGHRES.json +++ b/samples-src/resources/itowns/JSONLayers/IGN_MNT_HIGHRES.json @@ -24,7 +24,7 @@ "crossOrigin" : "omit" }, "format": "image/x-bil;bits=32", - "crs" : "EPSG:4326", + "projection" : "EPSG:4326", "tileMatrixSet": "WGS84G", "tileMatrixSetLimits": { "6": { diff --git a/samples-src/resources/itowns/JSONLayers/IGN_MNT_SRTM.json b/samples-src/resources/itowns/JSONLayers/IGN_MNT_SRTM.json index d1cb5f18c..45b908796 100644 --- a/samples-src/resources/itowns/JSONLayers/IGN_MNT_SRTM.json +++ b/samples-src/resources/itowns/JSONLayers/IGN_MNT_SRTM.json @@ -24,7 +24,7 @@ }] }], "format": "image/x-bil;bits=32", - "crs" : "EPSG:4326", + "projection" : "EPSG:4326", "tileMatrixSet": "WGS84G", "tileMatrixSetLimits": { "1": { diff --git a/samples-src/resources/itowns/JSONLayers/Ortho.json b/samples-src/resources/itowns/JSONLayers/Ortho.json index 43bcd0208..b997a94a4 100644 --- a/samples-src/resources/itowns/JSONLayers/Ortho.json +++ b/samples-src/resources/itowns/JSONLayers/Ortho.json @@ -4,7 +4,7 @@ "source": { "protocol": "wmts", "url": "https://wxs.ign.fr/ptlp78g6fvz9daz5mg2fztvr/geoportail/wmts", - "crs" : "EPSG:3857", + "projection" : "EPSG:3857", "updateStrategy": { "type": "0", "options": {} @@ -225,4 +225,4 @@ } } } -} \ No newline at end of file +} diff --git a/samples-src/resources/itowns/JSONLayers/OrthosCRS.json b/samples-src/resources/itowns/JSONLayers/OrthosCRS.json index c611c23cf..4069bdbad 100644 --- a/samples-src/resources/itowns/JSONLayers/OrthosCRS.json +++ b/samples-src/resources/itowns/JSONLayers/OrthosCRS.json @@ -19,7 +19,7 @@ "url" : "http://www.ign.fr" }], "format": "image/jpeg", - "crs" : "EPSG:4326", + "projection" : "EPSG:4326", "tileMatrixSet": "WGS84", "extent": { "west": "-178.187", diff --git a/samples-src/resources/itowns/JSONLayers/Region.json b/samples-src/resources/itowns/JSONLayers/Region.json index 52011cdf4..3cc5b0c4e 100644 --- a/samples-src/resources/itowns/JSONLayers/Region.json +++ b/samples-src/resources/itowns/JSONLayers/Region.json @@ -8,7 +8,7 @@ "format" : "image/png", "name" : "REGION.2016", "style" : "", - "crs" : "EPSG:3857", + "projection" : "EPSG:3857", "transparent" : true, "featureInfoMimeType" : "", "dateTime" : "", diff --git a/samples-src/resources/itowns/JSONLayers/ScanEX.json b/samples-src/resources/itowns/JSONLayers/ScanEX.json index 56122cfcd..c33c6e8db 100644 --- a/samples-src/resources/itowns/JSONLayers/ScanEX.json +++ b/samples-src/resources/itowns/JSONLayers/ScanEX.json @@ -22,7 +22,7 @@ }], "name": "GEOGRAPHICALGRIDSYSTEMS.MAPS.SCAN-EXPRESS.STANDARD", "format": "image/jpeg", - "crs" : "EPSG:3857", + "projection" : "EPSG:3857", "tileMatrixSet": "PM", "tileMatrixSetLimits": { "6" : { From aba9816436bd148774eb746e190911ef8c449b5a Mon Sep 17 00:00:00 2001 From: Elias Date: Wed, 9 Dec 2020 12:20:43 +0100 Subject: [PATCH 2/3] =?UTF-8?q?update(changelog)=20:=20met=20=C3=A0=20jour?= =?UTF-8?q?=20le=20changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DRAFT_CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md index eeee9512f..076dca87d 100644 --- a/DRAFT_CHANGELOG.md +++ b/DRAFT_CHANGELOG.md @@ -72,7 +72,7 @@ Ajout d'évènements sur les contrôles ## Summary -Version Leaflet 1.7.1 +Mise à jour de Leaflet en version 1.7.1 ## Changelog @@ -80,7 +80,8 @@ Version Leaflet 1.7.1 * [Changed] - - mise à jour de la documentation + - leaflet en version 1.7.1 + - mise à jour de la documentation (5c189f7ef6de22e398ca7426d84abb751f049717) * [Deprecated] From fdea1b8f871536c78cfe36b39d32a2bb9c769af1 Mon Sep 17 00:00:00 2001 From: Elias Date: Wed, 9 Dec 2020 12:40:46 +0100 Subject: [PATCH 3/3] release ext-leaflet 2.1.7 --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 00d6bbf1b..528f908e4 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "geoportal-extensions", "description": "French Geoportal Extensions for OpenLayers, Leaflet and iTowns libraries", - "version": "2.3.0", - "date": "02/12/2020", + "version": "2.3.1", + "date": "09/12/2020", "leafletExtName": "French Geoportal Extension for Leaflet", - "leafletExtVersion": "2.1.6", + "leafletExtVersion": "2.1.7", "olExtName": "French Geoportal Extension for OpenLayers", "olExtVersion": "3.0.13", "itownsExtName": "French Geoportal Extension for Itowns",