Skip to content

Commit

Permalink
release sdk 3.3.10
Browse files Browse the repository at this point in the history
  • Loading branch information
elias75015 committed Mar 4, 2022
2 parents 500326a + c3673fe commit f3ae39c
Show file tree
Hide file tree
Showing 71 changed files with 169 additions and 205 deletions.
10 changes: 5 additions & 5 deletions DRAFT_CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# SDK Geoportail 2D/3D, version 3.3.9
# SDK Geoportail 2D/3D, version 3.3.10

**15/02/2022 : version 3.3.9**
**04/03/2022 : version 3.3.10**

> Release SDK Geoportail 2D/3D
## Summary

* Mise à jour du package des Extensions OpenLayers en 3.2.9 ([release notes](https://github.com/IGNF/geoportal-extensions/releases/tag/ol-3.2.9))
Mise à jour de l'extension géoportail pour iTowns en version 2.3.6, pour utilisation d'iTowns 2.37 dans le SDK 3D

## Changelog

* [Added]

* [Changed]

- update iTowns en version 2.37

* [Removed]

* [Fixed]

- correction sur le layerswitcher selon le navigateur (hotfix portail)

* [Deprecated]

* [Security]
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "geoportal-sdk",
"version": "3.3.9",
"date": "15/02/2022",
"SDK2DVersion": "3.3.9",
"SDK3DVersion": "3.3.9",
"version": "3.3.10",
"date": "04/03/2022",
"SDK2DVersion": "3.3.10",
"SDK3DVersion": "3.3.10",
"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",
Expand Down Expand Up @@ -72,12 +72,12 @@
"exports-loader": "^0.7.0",
"expose-loader": "^0.7.5",
"fs-extra": "^9.0.0",
"geoportal-extensions-itowns": "2.3.5",
"geoportal-extensions-itowns": "2.3.6",
"geoportal-extensions-openlayers": "3.2.9",
"handlebars": "^4.7.5",
"handlebars-layouts": "^3.1.4",
"html-webpack-plugin": "^4.0.4",
"itowns": "2.33.0",
"itowns": "2.37.0",
"jsdoc-webpack-plugin": "^0.3.0",
"loglevel": "1.6.6",
"mini-css-extract-plugin": "^0.9.0",
Expand All @@ -88,7 +88,7 @@
"ol-mapbox-style": "6.7.0",
"optimize-css-assets-webpack-plugin": "^5.0.1",
"path": "^0.12.7",
"proj4": "2.7.2",
"proj4": "2.7.5",
"replace-bundle-webpack-plugin": "^1.0.0",
"requirejs": "^2.3.6",
"responsive-loader": "^1.2.0",
Expand All @@ -97,7 +97,7 @@
"string-template": "^1.0.0",
"style-loader": "^1.1.3",
"terser-webpack-plugin": "^2.0.0",
"three": "0.127.0",
"three": "0.135.0",
"three.meshline": "1.2.0",
"url-loader": "^4.0.0",
"webpack": "^4.41.5",
Expand Down
4 changes: 2 additions & 2 deletions samples-src/config-2d.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"baseurl" : "../..",
"resources" : "../resources",
"proxy" : "https://localhost/proxy/proxy.php",
"apikey" : "jhyvi0fgmnuxvfv0zjzorvdn",
"apikey2" : "kgco926a9mj4fcng4whjf5ac",
"apikey" : "essentiels,calcul",
"apikey2" : "parcellaire",
"apikey3" : "an7nvfzojv5wa96dsga5nk8w"
}
6 changes: 4 additions & 2 deletions samples-src/config-3d.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
"baseurl" : "../..",
"resources" : "../resources",
"proxy" : "https://localhost/proxy/proxy.php",
"apikey" : "ptlp78g6fvz9daz5mg2fztvr",
"apikey" : "essentiels,altimetrie,calcul",
"apikey2" : "an7nvfzojv5wa96dsga5nk8w",
"apikey3" : "jhyvi0fgmnuxvfv0zjzorvdn"
"apikey3" : "essentiels",
"apikey4" : "altimetrie",
"apikey5" : "calcul"
}
14 changes: 7 additions & 7 deletions samples-src/pages/2d/page-changeLayersColor-amd.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ <h1>changeLayerColor</h1>

<div id="geoportalMap"></div>
<div id="BoutonDiv">
<input type="button" name="export" onclick="changeLayerColor('GEOGRAPHICALGRIDSYSTEMS.MAPS');" value="changeLayerColor(maCoucheGP)"/><br/>
<input type="button" name="export" onclick="changeLayerColor('GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2');" value="changeLayerColor(maCoucheGP)"/><br/>
<input type="button" name="export" onclick="changeLayerColor('maCoucheWFS');" value="changeLayerColor(maCoucheWFS)"/><br/>
<input type="button" name="export" onclick="changeLayerColor('maCoucheWMS');" value="changeLayerColor(maCoucheWMS)"/><br/>
<input type="button" name="export" onclick="changeLayerColor('maCoucheWMS_CORS');" value="changeLayerColor(maCoucheWMS_CORS)"/><br/>
<input type="button" name="export" onclick="changeLayerColor('GEOGRAPHICALGRIDSYSTEMS.MAPS::GEOPORTAIL:OGC:WMTS');" value="changeLayerColor(maCoucheWMTS)"/><br/>
<input type="button" name="export" onclick="changeLayerColor('GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2::GEOPORTAIL:OGC:WMTS');" value="changeLayerColor(maCoucheWMTS)"/><br/>
<input type="button" name="export" onclick="changeLayerColor('maCoucheOSM');" value="changeLayerColor(maCoucheOSM)"/><br/>
</div>
{{/content}}
Expand All @@ -43,11 +43,11 @@ <h1>changeLayerColor</h1>
var map = null;

var layerColored = {
"GEOGRAPHICALGRIDSYSTEMS.MAPS" : false,
"GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2" : false,
"maCoucheWFS" : false,
"maCoucheWMS" : false,
"maCoucheWMS_CORS" : false,
"GEOGRAPHICALGRIDSYSTEMS.MAPS::GEOPORTAIL:OGC:WMTS" : false,
"GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2::GEOPORTAIL:OGC:WMTS" : false,
"maCoucheOSM" : false,
}

Expand All @@ -73,7 +73,7 @@ <h1>changeLayerColor</h1>
map = Gp.Map.load("geoportalMap",{
apiKey : "{{apikey}}",
layersOptions : {
"GEOGRAPHICALGRIDSYSTEMS.MAPS" : {
"GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2" : {
title : "maCoucheGP"
},
maCoucheWFS : {
Expand Down Expand Up @@ -105,15 +105,15 @@ <h1>changeLayerColor</h1>
layers : ["BATHY-DALLE_PYR-PNG_3857_WMSR"],
outputFormat : "image/png"
},
"GEOGRAPHICALGRIDSYSTEMS.MAPS::GEOPORTAIL:OGC:WMTS" : {
"GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2::GEOPORTAIL:OGC:WMTS" : {
title : "maCoucheWMTS",
format : "wmts",
minZoom : 0,
maxZoom : 16,
visibility : true,
opacity : 1 ,
url : "https://wxs.ign.fr/{{apikey}}/geoportail/wmts",
layer : "GEOGRAPHICALGRIDSYSTEMS.MAPS",
layer : "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2",
tileMatrixSet : "PM",
styleName : "normal",
outputFormat : "image/jpeg"
Expand Down
8 changes: 4 additions & 4 deletions samples-src/pages/2d/page-changeLayersColor-bundle.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h1>changeLayerColor</h1>
<input type="button" name="export" onclick="changeLayerColor('maCoucheWFS');" value="changeLayerColor(maCoucheWFS)"/><br/>
<input type="button" name="export" onclick="changeLayerColor('maCoucheWMS');" value="changeLayerColor(maCoucheWMS)"/><br/>
<!-- <input type="button" name="export" onclick="changeLayerColor('maCoucheWMS_CORS');" value="changeLayerColor(maCoucheWMS_CORS)"/><br/> -->
<input type="button" name="export" onclick="changeLayerColor('GEOGRAPHICALGRIDSYSTEMS.MAPS::GEOPORTAIL:OGC:WMTS');" value="changeLayerColor(maCoucheWMTS)"/><br/>
<input type="button" name="export" onclick="changeLayerColor('GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2::GEOPORTAIL:OGC:WMTS');" value="changeLayerColor(maCoucheWMTS)"/><br/>
<input type="button" name="export" onclick="changeLayerColor('maCoucheOSM');" value="changeLayerColor(maCoucheOSM)"/><br/>
</div>
{{/content}}
Expand Down Expand Up @@ -76,15 +76,15 @@ <h1>changeLayerColor</h1>
// layers : ["BATHY-DALLE_PYR-PNG_3857_WMSR"],
// outputFormat : "image/png"
// },
"GEOGRAPHICALGRIDSYSTEMS.MAPS::GEOPORTAIL:OGC:WMTS" : {
"GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2::GEOPORTAIL:OGC:WMTS" : {
title : "maCoucheWMTS",
format : "wmts",
minZoom : 0,
maxZoom : 16,
visibility : true,
opacity : 0.7,
url : "https://wxs.ign.fr/{{apikey}}/geoportail/wmts",
layer : "GEOGRAPHICALGRIDSYSTEMS.MAPS",
layer : "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2",
tileMatrixSet : "PM",
styleName : "normal",
outputFormat : "image/jpeg"
Expand Down Expand Up @@ -112,7 +112,7 @@ <h1>changeLayerColor</h1>
"maCoucheWFS" : false,
"maCoucheWMS" : false,
// "maCoucheWMS_CORS" : false,
"GEOGRAPHICALGRIDSYSTEMS.MAPS::GEOPORTAIL:OGC:WMTS" : false,
"GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2::GEOPORTAIL:OGC:WMTS" : false,
"maCoucheOSM" : false,
}

Expand Down
14 changes: 7 additions & 7 deletions samples-src/pages/2d/page-changeLayersColor-es6.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ <h1>changeLayerColor</h1>

<div id="geoportalMap"></div>
<div id="BoutonDiv">
<input type="button" name="export" onclick="changeLayerColor('GEOGRAPHICALGRIDSYSTEMS.MAPS');" value="changeLayerColor(maCoucheGP)"/><br/>
<input type="button" name="export" onclick="changeLayerColor('GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2');" value="changeLayerColor(maCoucheGP)"/><br/>
<input type="button" name="export" onclick="changeLayerColor('maCoucheWFS');" value="changeLayerColor(maCoucheWFS)"/><br/>
<input type="button" name="export" onclick="changeLayerColor('maCoucheWMS');" value="changeLayerColor(maCoucheWMS)"/><br/>
<input type="button" name="export" onclick="changeLayerColor('maCoucheWMS_CORS');" value="changeLayerColor(maCoucheWMS_CORS)"/><br/>
<input type="button" name="export" onclick="changeLayerColor('GEOGRAPHICALGRIDSYSTEMS.MAPS::GEOPORTAIL:OGC:WMTS');" value="changeLayerColor(maCoucheWMTS)"/><br/>
<input type="button" name="export" onclick="changeLayerColor('GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2::GEOPORTAIL:OGC:WMTS');" value="changeLayerColor(maCoucheWMTS)"/><br/>
<input type="button" name="export" onclick="changeLayerColor('maCoucheOSM');" value="changeLayerColor(maCoucheOSM)"/><br/>
</div>
{{/content}}
Expand All @@ -42,11 +42,11 @@ <h1>changeLayerColor</h1>
<script>
var map = null;
var layerColored = {
"GEOGRAPHICALGRIDSYSTEMS.MAPS" : false,
"GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2" : false,
"maCoucheWFS" : false,
"maCoucheWMS" : false,
"maCoucheWMS_CORS" : false,
"GEOGRAPHICALGRIDSYSTEMS.MAPS::GEOPORTAIL:OGC:WMTS" : false,
"GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2::GEOPORTAIL:OGC:WMTS" : false,
"maCoucheOSM" : false,
}

Expand All @@ -69,7 +69,7 @@ <h1>changeLayerColor</h1>
map = self.Gp.Map.load("geoportalMap",{
apiKey : "{{apikey}}",
layersOptions : {
"GEOGRAPHICALGRIDSYSTEMS.MAPS" : {
"GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2" : {
title : "maCoucheGP"
},
maCoucheWFS : {
Expand Down Expand Up @@ -101,15 +101,15 @@ <h1>changeLayerColor</h1>
layers : ["BATHY-DALLE_PYR-PNG_3857_WMSR"],
outputFormat : "image/png"
},
"GEOGRAPHICALGRIDSYSTEMS.MAPS::GEOPORTAIL:OGC:WMTS" : {
"GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2::GEOPORTAIL:OGC:WMTS" : {
title : "maCoucheWMTS",
format : "wmts",
minZoom : 0,
maxZoom : 16,
visibility : true,
opacity : 1 ,
url : "https://wxs.ign.fr/{{apikey}}/geoportail/wmts",
layer : "GEOGRAPHICALGRIDSYSTEMS.MAPS",
layer : "GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2",
tileMatrixSet : "PM",
styleName : "normal",
outputFormat : "image/jpeg"
Expand Down
6 changes: 3 additions & 3 deletions samples-src/pages/2d/page-controls-amd.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ <h1>Gestion des controles avec le SDK</h1>
}
// overview
// ctrlOpts[elem.value]["layers"] = ["GEOGRAPHICALGRIDSYSTEMS.MAPS.OVERVIEW"] ;
ctrlOpts[elem.value]["layers"] = ["GEOGRAPHICALGRIDSYSTEMS.MAPS"] ;
ctrlOpts[elem.value]["layers"] = ["GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2"] ;
ctrlOpts[elem.value]["strokeOpacity"] = 1 ;
ctrlOpts[elem.value]["strokeColor"] = "#ff0000" ;
// route
Expand Down Expand Up @@ -106,7 +106,7 @@ <h1>Gestion des controles avec le SDK</h1>
}
function addLayer() {
map.addLayers({
'GEOGRAPHICALGRIDSYSTEMS.MAPS': {
'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2': {
title : "Cartes modifiées",
legends : [{
format : "image/gif",
Expand Down Expand Up @@ -150,7 +150,7 @@ <h1>Gestion des controles avec le SDK</h1>
layersOptions : {
'ORTHOIMAGERY.ORTHOPHOTOS': {
},
'GEOGRAPHICALGRIDSYSTEMS.MAPS': {
'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2': {
},
'osmLyr' : {
format : "osm",
Expand Down
6 changes: 3 additions & 3 deletions samples-src/pages/2d/page-controls-bundle.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h1>Gestion des controles avec le SDK</h1>
layersOptions : {
'ORTHOIMAGERY.ORTHOPHOTOS': {
},
'GEOGRAPHICALGRIDSYSTEMS.MAPS': {
'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2': {
},
'osmLyr' : {
format : "osm",
Expand Down Expand Up @@ -139,7 +139,7 @@ <h1>Gestion des controles avec le SDK</h1>
}
// overview
// ctrlOpts[elem.value]["layers"] = ["GEOGRAPHICALGRIDSYSTEMS.MAPS.OVERVIEW"] ;
ctrlOpts[elem.value]["layers"] = ["GEOGRAPHICALGRIDSYSTEMS.MAPS"] ;
ctrlOpts[elem.value]["layers"] = ["GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2"] ;
ctrlOpts[elem.value]["strokeOpacity"] = 1 ;
ctrlOpts[elem.value]["strokeColor"] = "#ff0000" ;
// route
Expand Down Expand Up @@ -183,7 +183,7 @@ <h1>Gestion des controles avec le SDK</h1>
}
function addLayer() {
map.addLayers({
'GEOGRAPHICALGRIDSYSTEMS.MAPS': {
'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2': {
title : "Cartes modifiées",
legends : [{
format : "image/gif",
Expand Down
6 changes: 3 additions & 3 deletions samples-src/pages/2d/page-controls-es6.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ <h1>Gestion des controles avec le SDK</h1>
}
// overview
// ctrlOpts[elem.value]["layers"] = ["GEOGRAPHICALGRIDSYSTEMS.MAPS.OVERVIEW"] ;
ctrlOpts[elem.value]["layers"] = ["GEOGRAPHICALGRIDSYSTEMS.MAPS"] ;
ctrlOpts[elem.value]["layers"] = ["GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2"] ;
ctrlOpts[elem.value]["strokeOpacity"] = 1 ;
ctrlOpts[elem.value]["strokeColor"] = "#ff0000" ;
// route
Expand Down Expand Up @@ -105,7 +105,7 @@ <h1>Gestion des controles avec le SDK</h1>
}
function addLayer() {
map.addLayers({
'GEOGRAPHICALGRIDSYSTEMS.MAPS': {
'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2': {
title : "Cartes modifiées",
legends : [{
format : "image/gif",
Expand Down Expand Up @@ -145,7 +145,7 @@ <h1>Gestion des controles avec le SDK</h1>
layersOptions : {
'ORTHOIMAGERY.ORTHOPHOTOS': {
},
'GEOGRAPHICALGRIDSYSTEMS.MAPS': {
'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2': {
},
'osmLyr' : {
format : "osm",
Expand Down
4 changes: 2 additions & 2 deletions samples-src/pages/2d/page-controlsOptions-bundle.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ <h1>Ajout d'une carte avec Gp.Map.load() et l'ensemble des options possibles de
layersOptions : {
'ORTHOIMAGERY.ORTHOPHOTOS': {
},
'GEOGRAPHICALGRIDSYSTEMS.MAPS': {
'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2': {
},
},
controlsOptions : {
Expand Down Expand Up @@ -327,7 +327,7 @@ <h1>Ajout d'une carte avec Gp.Map.load() et l'ensemble des options possibles de
}
// overview
// ctrlOpts[elem.value]["layers"] = ["GEOGRAPHICALGRIDSYSTEMS.MAPS.OVERVIEW"] ;
ctrlOpts[elem.value]["layers"] = ["GEOGRAPHICALGRIDSYSTEMS.MAPS"] ;
ctrlOpts[elem.value]["layers"] = ["GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2"] ;
ctrlOpts[elem.value]["strokeOpacity"] = 1 ;
ctrlOpts[elem.value]["strokeColor"] = "#ff0000" ;
// route
Expand Down
2 changes: 1 addition & 1 deletion samples-src/pages/2d/page-div-bundle.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h2>CAS 3 : L'élément HTML indiqué par l'utilisateur n'existe pas.</h2>
var map1 = Gp.Map.load('geoportalMap1', {
configUrl : "{{resources}}/autoconf.js", // apiKey : "{{apikey}}",
layersOptions : {
"GEOGRAPHICALGRIDSYSTEMS.MAPS" : {}
"GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2" : {}
},
controlsOptions : {
"search" : {
Expand Down
4 changes: 2 additions & 2 deletions samples-src/pages/2d/page-events-bundle.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ <h1>Abonnement aux evenements</h1>
minZoom : 1,
maxZoom : 15
},
'GEOGRAPHICALGRIDSYSTEMS.MAPS' : {},
'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2' : {},
'CADASTRALPARCELS.PARCELS' : {}
},
controlsOptions : {
Expand All @@ -63,7 +63,7 @@ <h1>Abonnement aux evenements</h1>
'layerChanged' : action,
'configured' : function () {
// map.addLayers({
// 'GEOGRAPHICALGRIDSYSTEMS.MAPS' : {}
// 'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2' : {}
// }) ;
}
},
Expand Down
2 changes: 1 addition & 1 deletion samples-src/pages/2d/page-exportmap-bundle.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h1>Export de l'état d'une carte.</h1>
mapEventsOptions : {
'configured' : function () {
this.addLayers({
'GEOGRAPHICALGRIDSYSTEMS.MAPS' : {},
'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2' : {},
'CADASTRALPARCELS.PARCELS' : {}
}) ;
}
Expand Down
2 changes: 1 addition & 1 deletion samples-src/pages/2d/page-gpplayer-bundle.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1>Une carte affichant des couches Géoportail</h1>
configUrl : "{{resources}}/autoconf.js", // apiKey : "{{apikey}}",
layersOptions : {
'ORTHOIMAGERY.ORTHOPHOTOS': {},
'GEOGRAPHICALGRIDSYSTEMS.MAPS' :{
'GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2' :{
opacity :0.3
},
'CADASTRALPARCELS.PARCELS' : {
Expand Down
2 changes: 1 addition & 1 deletion samples-src/pages/2d/page-graphicScale-bundle.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h1>Une carte affichant une échelle graphique</h1>
}
},
layersOptions : {
"GEOGRAPHICALGRIDSYSTEMS.MAPS.SCAN-EXPRESS.STANDARD" : {}
"GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2.SCAN-EXPRESS.STANDARD" : {}
},
zoom : 13
}
Expand Down
Loading

0 comments on commit f3ae39c

Please sign in to comment.