diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md
index e7b2de3b1..224c89f21 100644
--- a/DRAFT_CHANGELOG.md
+++ b/DRAFT_CHANGELOG.md
@@ -6,7 +6,7 @@
## Summary
-Correctif mineur sur le passage de l'option "projection"
+Mise à jour du package des extensions OpenLayers : [3.3.12](https://github.com/IGNF/geoportal-extensions/releases/tag/ol-3.2.12)
## Changelog
@@ -18,8 +18,6 @@ Correctif mineur sur le passage de l'option "projection"
* [Fixed]
- - passage du paramètre projection lors de l'ajout d'une couche 2D (https://github.com/IGNF/geoportal-sdk/pull/93)
-
* [Deprecated]
* [Security]
diff --git a/package.json b/package.json
index 8ebbf447a..498887c4b 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
{
"name": "geoportal-sdk",
- "version": "3.3.13",
- "date": "13/04/2022",
- "SDK2DVersion": "3.3.13",
- "SDK3DVersion": "3.3.13",
+ "version": "3.3.14",
+ "date": "09/05/2022",
+ "SDK2DVersion": "3.3.14",
+ "SDK3DVersion": "3.3.14",
"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",
@@ -73,7 +73,7 @@
"expose-loader": "^0.7.5",
"fs-extra": "^9.0.0",
"geoportal-extensions-itowns": "2.3.6",
- "geoportal-extensions-openlayers": "3.2.11",
+ "geoportal-extensions-openlayers": "3.2.12",
"handlebars": "^4.7.5",
"handlebars-layouts": "^3.1.4",
"html-webpack-plugin": "^4.0.4",
diff --git a/samples-src/pages/3d/page-switch-bundle.html b/samples-src/pages/3d/page-switch-bundle.html
index 1dee284b7..18b0f313d 100644
--- a/samples-src/pages/3d/page-switch-bundle.html
+++ b/samples-src/pages/3d/page-switch-bundle.html
@@ -38,7 +38,46 @@
Test de la bascule 3D / 2D
},*/
layersOptions : {
"ORTHOIMAGERY.ORTHOPHOTOS" : {
- }/*,
+ },
+ "KML_1" : {
+ title : "Paris 1",
+ description : "KML de Paris numéro 1",
+ format : "KML",
+ url : "../resources/KML/paris_1.kml",
+ opacity : 0.7,
+ minZoom : 8,
+ maxZoom : 15,
+ visibility : true,
+ opacity : 1,
+ styleOptions : {
+ polyFillColor : "blue",
+ polyFillOpacity : 1,
+ strokeColor : "white",
+ strokeOpacity : 0.8,
+ strokeWidth : 2
+ },
+ extractStyles : true
+ },
+ "KML_2" : {
+ title : "Paris 2",
+ description : "KML de Paris numéro 2",
+ format : "KML",
+ url : "../resources/KML/paris_2.kml",
+ opacity : 0.7,
+ minZoom : 8,
+ maxZoom : 15,
+ visibility : true,
+ opacity : 1,
+ styleOptions : {
+ polyFillColor : "red",
+ polyFillOpacity : 0.8,
+ strokeColor : "green",
+ strokeOpacity : 0.5,
+ strokeWidth : 5
+ },
+ extractStyles : false
+ }
+ /*,
"HY.PhysicalWaters" : {
},
"TN.RoadTransportNetwork" : {
diff --git a/scripts/release/package-SDK2D.json b/scripts/release/package-SDK2D.json
index b2612a370..7a0165c63 100644
--- a/scripts/release/package-SDK2D.json
+++ b/scripts/release/package-SDK2D.json
@@ -1,39 +1,39 @@
{
- "license" : "CECILL-B",
- "directories" : {},
- "scripts" : {},
- "module" : "src/SDK2D.js",
- "bugs" : {
- "url" : "https://github.com/IGNF/geoportal-sdk/issues"
- },
"repository" : {
- "type" : "git",
- "url" : "https://github.com/IGNF/geoportal-sdk.git"
+ "url" : "https://github.com/IGNF/geoportal-sdk.git",
+ "type" : "git"
},
+ "version" : "3.3.14",
"main" : "dist/GpSDK2D-src.js",
- "description" : "French Geoportal SDK based on OpenLayers (2D)",
- "version" : "3.3.12",
- "date" : "31/03/2022",
"keywords" : [
"openlayers",
"geoportail",
"webservice",
"javascript"
],
- "dependencies" : {
- "node-fetch" : "^2.6.1",
- "geoportal-extensions-openlayers" : "3.2.11",
- "ol" : "6.9.0",
- "xmldom" : "^0.1.27"
- },
- "author" : "IGNF",
- "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html",
+ "date" : "09/05/2022",
"name" : "@ignf-geoportal/sdk-2d",
+ "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html",
+ "author" : "IGNF",
+ "description" : "French Geoportal SDK based on OpenLayers (2D)",
+ "module" : "src/SDK2D.js",
"files" : [
"dist/",
"src/",
"LICENCE.md",
"README.md",
"package.json"
- ]
+ ],
+ "dependencies" : {
+ "geoportal-extensions-openlayers" : "3.2.12",
+ "xmldom" : "^0.1.27",
+ "ol" : "6.9.0",
+ "node-fetch" : "^2.6.1"
+ },
+ "license" : "CECILL-B",
+ "directories" : {},
+ "bugs" : {
+ "url" : "https://github.com/IGNF/geoportal-sdk/issues"
+ },
+ "scripts" : {}
}
diff --git a/scripts/release/package-SDK3D.json b/scripts/release/package-SDK3D.json
index e32503146..09991dd63 100644
--- a/scripts/release/package-SDK3D.json
+++ b/scripts/release/package-SDK3D.json
@@ -1,36 +1,25 @@
{
- "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html",
- "bugs" : {
- "url" : "https://github.com/IGNF/geoportal-sdk/issues"
- },
- "license" : "CECILL-B",
- "name" : "@ignf-geoportal/sdk-3d",
- "repository" : {
- "type" : "git",
- "url" : "https://github.com/IGNF/geoportal-sdk.git"
- },
- "scripts" : {},
+ "directories" : {},
"module" : "src/SDK3D.js",
+ "version" : "3.3.14",
+ "main" : "dist/GpSDK3D-src.js",
"dependencies" : {
+ "itowns" : "2.37.0",
"geoportal-extensions-itowns" : "2.3.6",
"ol" : "6.9.0",
- "itowns" : "2.37.0",
+ "geoportal-extensions-openlayers" : "3.2.12",
"xmldom" : "^0.1.27",
- "node-fetch" : "^2.6.1",
- "geoportal-extensions-openlayers" : "3.2.11"
+ "node-fetch" : "^2.6.1"
+ },
+ "name" : "@ignf-geoportal/sdk-3d",
+ "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries",
+ "license" : "CECILL-B",
+ "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html",
+ "repository" : {
+ "url" : "https://github.com/IGNF/geoportal-sdk.git",
+ "type" : "git"
},
"author" : "IGNF",
- "main" : "dist/GpSDK3D-src.js",
- "date" : "31/03/2022",
- "directories" : {},
- "version" : "3.3.12",
- "keywords" : [
- "openlayers",
- "itowns",
- "geoportail",
- "webservice",
- "javascript"
- ],
"files" : [
"dist/",
"src/",
@@ -38,5 +27,16 @@
"README.md",
"package.json"
],
- "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries"
+ "date" : "09/05/2022",
+ "scripts" : {},
+ "bugs" : {
+ "url" : "https://github.com/IGNF/geoportal-sdk/issues"
+ },
+ "keywords" : [
+ "openlayers",
+ "itowns",
+ "geoportail",
+ "webservice",
+ "javascript"
+ ]
}