Merge branch 'release-3.3.5'

IGNF · Jan 17, 2022 · 1443287 · 1443287
2 parents 90f6115 + 766368f
commit 1443287
Show file tree

Hide file tree

Showing 9 changed files with 1,465 additions and 421 deletions.
diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
@@ -1,13 +1,13 @@
-# DEPENDENCIES (26/05/2021)
+# DEPENDENCIES (17/01/2022)
 
-* geoportal-extensions-openlayers@3.1.0
-└── geoportal-access-lib@2.1.8
+* geoportal-extensions-openlayers@3.2.6
+└── geoportal-access-lib@3.0.5
 
-* geoportal-extensions-itowns@2.3.2
-└── geoportal-access-lib@2.1.8
+* geoportal-extensions-itowns@2.3.4
+└── geoportal-access-lib@3.0.5
 
 * "itowns"
-└── "itowns@2.30.0"
+└── "itowns@2.33.0"
 
 * "openlayers"
-└── "openlayers@6.3.1
+└── "openlayers@6.9.0
diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md
@@ -1,37 +1,16 @@
-# SDK Geoportail 2D/3D, version 3.3.4
+# SDK Geoportail 2D/3D, version 3.3.5
 
-**03/12/2021 : version 3.3.4**
+**17/01/2022 : version 3.3.5**
 
 > Release SDK Geoportail 2D/3D
 
 ## Summary
 
-* Possibilité de passer une liste de clés lors de l'initialisation de la carte
+* Mise à jour des extensions : ol 3.2.6
 
 ## Changelog
 
 * [Added]
-    - Possibilité de passer une liste de clés lors de l'initialisation de la carte (#86)
-    Exemple :
-    ```js
-    var map = Gp.Map.load('geoportalMap',{
-                apiKey : "jhyvi0fgmnuxvfv0zjzorvdn,administratif",
-                azimuth : 45,
-                zoom : 13,
-                center : {
-                    x : -511270,
-                    y : 6151620
-                },
-                layersOptions : {
-                    'ORTHOIMAGERY.ORTHOPHOTOS': {
-                    },
-                    'GEOGRAPHICALGRIDSYSTEMS.MAPS': {
-                    },
-                    'LIMITES_ADMINISTRATIVES_EXPRESS.LATEST': {
-                    }
-                }
-    }
-    ```
 
 * [Changed]
 

diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
     "name": "geoportal-sdk",
-    "version": "3.3.4",
-    "date": "05/01/2022",
-    "SDK2DVersion": "3.3.4",
-    "SDK3DVersion": "3.3.4",
+    "version": "3.3.5",
+    "date": "17/01/2022",
+    "SDK2DVersion": "3.3.5",
+    "SDK3DVersion": "3.3.5",
     "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",
@@ -12,23 +12,24 @@
         "clean": "echo \"Warning: target not yet implemented!\" && exit 0",
         "check": "eslint src/",
         "test:serve": "webpack-dev-server --config webpack.test.serve.js",
-        "doc:serve": "webpack-dev-server --config webpack.config.3d --content-base jsdoc/ --port 9001 --open 'google-chrome'",
-        "sample:3d:serve": "webpack-dev-server --config webpack.config.3d --mode=development --https --open-page samples/index-3d-map.html --content-base . --output-public-path '/dist/3d/' --port 9001 --open 'chromium'",
-        "sample:2d:serve": "webpack-dev-server --config webpack.config.2d --mode=development --https --open-page samples/index-2d-map.html --content-base . --output-public-path '/dist/2d/' --port 9001 --open 'chromium'",
+        "doc:serve": "webpack-dev-server --config webpack.config.3d --content-base jsdoc/ --port 9001 --open",
+        "sample:3d:serve": "webpack-dev-server --config webpack.config.3d --mode=development --https --open-page samples/index-3d-map.html --content-base . --output-public-path '/dist/3d/' --port 9001 --open",
+        "sample:2d:serve": "webpack-dev-server --config webpack.config.2d --mode=development --https --open-page samples/index-2d-map.html --content-base . --output-public-path '/dist/2d/' --port 9001 --open",
         "stat:2d": "npm run build:2d:src -- --profile --json > map-2d.json",
         "stat:3d": "npm run build:3d:src -- --profile --json > map-3d.json",
+        "clean:chunk": "rm dist/*/chunk*",
         "build": "npm-run-all --print-label --print-name build:*:*",
         "build:dev": "npm-run-all --print-label --print-name build:*:dev",
         "build:prod": "npm-run-all --print-label --print-name build:*:prod",
         "build:src": "npm-run-all --print-label --print-name build:*:src",
         "build:3d": "npm-run-all --print-label --print-name build:3d:*",
-        "build:3d:src": "webpack --config webpack.config.3d --mode=none",
-        "build:3d:dev": "webpack --config webpack.config.3d --mode=development",
-        "build:3d:prod": "webpack --config webpack.config.3d --mode=production",
+        "build:3d:src": "webpack --config webpack.config.3d --mode=none && npm run clean:chunk",
+        "build:3d:dev": "webpack --config webpack.config.3d --mode=development && npm run clean:chunk",
+        "build:3d:prod": "webpack --config webpack.config.3d --mode=production && npm run clean:chunk",
         "build:2d": "npm-run-all --print-label --print-name build:2d:*",
-        "build:2d:src": "webpack --config webpack.config.2d --mode=none",
-        "build:2d:dev": "webpack --config webpack.config.2d --mode=development",
-        "build:2d:prod": "webpack --config webpack.config.2d --mode=production"
+        "build:2d:src": "webpack --config webpack.config.2d --mode=none && npm run clean:chunk",
+        "build:2d:dev": "webpack --config webpack.config.2d --mode=development && npm run clean:chunk",
+        "build:2d:prod": "webpack --config webpack.config.2d --mode=production && npm run clean:chunk"
     },
     "repository": {
         "type": "git",
@@ -54,7 +55,7 @@
         "@babel/core": "^7.8.3",
         "@babel/plugin-transform-runtime": "^7.8.3",
         "@babel/preset-env": "^7.8.3",
-        "@mapbox/mapbox-gl-style-spec": "13.14.0",
+        "@mapbox/mapbox-gl-style-spec": "13.20.1",
         "babel-loader": "^8.0.5",
         "chai": "^4.2.0",
         "chalk": "^4.0.0",
@@ -71,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-accessibilite/build/scripts/release/geoportal-extensions-itowns-2.3.4.tgz",
-        "geoportal-extensions-openlayers": "https://raw.githubusercontent.com/IGNF/geoportal-extensions/feature-accessibilite/build/scripts/release/geoportal-extensions-openlayers-3.2.4.tgz",
+        "geoportal-extensions-itowns": "2.3.4",
+        "geoportal-extensions-openlayers": "3.2.6",
         "handlebars": "^4.7.5",
         "handlebars-layouts": "^3.1.4",
         "html-webpack-plugin": "^4.0.4",
@@ -83,8 +84,8 @@
         "mocha": "^7.1.1",
         "mocha-loader": "^5.0.0",
         "npm-run-all": "^4.1.5",
-        "ol": "6.3.1",
-        "ol-mapbox-style": "6.3.1",
+        "ol": "6.9.0",
+        "ol-mapbox-style": "6.7.0",
         "optimize-css-assets-webpack-plugin": "^5.0.1",
         "path": "^0.12.7",
         "proj4": "2.7.2",

diff --git a/scripts/release/package-SDK2D.json b/scripts/release/package-SDK2D.json
@@ -1,39 +1,39 @@
 {
-   "description" : "French Geoportal SDK based on OpenLayers (2D)",
+   "name" : "@ignf-geoportal/sdk-2d",
+   "main" : "dist/GpSDK2D-src.js",
+   "license" : "CECILL-B",
    "directories" : {},
+   "module" : "src/SDK2D.js",
+   "repository" : {
+      "url" : "https://github.com/IGNF/geoportal-sdk.git",
+      "type" : "git"
+   },
+   "version" : "3.3.5",
    "author" : "IGNF",
-   "license" : "CECILL-B",
+   "scripts" : {},
+   "description" : "French Geoportal SDK based on OpenLayers (2D)",
    "dependencies" : {
-      "geoportal-extensions-openlayers" : "3.2.1",
-      "xmldom" : "^0.1.27",
       "node-fetch" : "^2.6.1",
-      "ol" : "6.3.1"
+      "geoportal-extensions-openlayers" : "3.2.6",
+      "ol" : "6.9.0",
+      "xmldom" : "^0.1.27"
    },
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html",
    "bugs" : {
       "url" : "https://github.com/IGNF/geoportal-sdk/issues"
    },
-   "version" : "3.3.2",
    "files" : [
       "dist/",
       "src/",
       "LICENCE.md",
       "README.md",
       "package.json"
    ],
+   "date" : "17/01/2022",
    "keywords" : [
       "openlayers",
       "geoportail",
       "webservice",
       "javascript"
-   ],
-   "repository" : {
-      "url" : "https://github.com/IGNF/geoportal-sdk.git",
-      "type" : "git"
-   },
-   "main" : "dist/GpSDK2D-src.js",
-   "date" : "11/08/2021",
-   "scripts" : {},
-   "name" : "@ignf-geoportal/sdk-2d",
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html",
-   "module" : "src/SDK2D.js"
+   ]
 }
diff --git a/scripts/release/package-SDK3D.json b/scripts/release/package-SDK3D.json
@@ -1,42 +1,42 @@
 {
-   "name" : "@ignf-geoportal/sdk-3d",
-   "files" : [
-      "dist/",
-      "src/",
-      "LICENCE.md",
-      "README.md",
-      "package.json"
-   ],
-   "dependencies" : {
-      "geoportal-extensions-itowns" : "2.3.3",
-      "xmldom" : "^0.1.27",
-      "node-fetch" : "^2.6.1",
-      "itowns" : "2.33.0",
-      "geoportal-extensions-openlayers" : "3.2.1",
-      "ol" : "6.3.1"
-   },
-   "module" : "src/SDK3D.js",
+   "main" : "dist/GpSDK3D-src.js",
+   "version" : "3.3.5",
    "keywords" : [
       "openlayers",
       "itowns",
       "geoportail",
       "webservice",
       "javascript"
    ],
-   "bugs" : {
-      "url" : "https://github.com/IGNF/geoportal-sdk/issues"
-   },
    "repository" : {
       "type" : "git",
       "url" : "https://github.com/IGNF/geoportal-sdk.git"
    },
-   "date" : "08/11/2021",
-   "version" : "3.3.2",
-   "main" : "dist/GpSDK3D-src.js",
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html",
-   "license" : "CECILL-B",
-   "scripts" : {},
+   "date" : "17/01/2022",
+   "directories" : {},
+   "module" : "src/SDK3D.js",
+   "bugs" : {
+      "url" : "https://github.com/IGNF/geoportal-sdk/issues"
+   },
    "author" : "IGNF",
+   "dependencies" : {
+      "geoportal-extensions-openlayers" : "3.2.6",
+      "itowns" : "2.33.0",
+      "geoportal-extensions-itowns" : "2.3.4",
+      "node-fetch" : "^2.6.1",
+      "ol" : "6.9.0",
+      "xmldom" : "^0.1.27"
+   },
    "description" : "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries",
-   "directories" : {}
+   "files" : [
+      "dist/",
+      "src/",
+      "LICENCE.md",
+      "README.md",
+      "package.json"
+   ],
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/sdk.html",
+   "license" : "CECILL-B",
+   "name" : "@ignf-geoportal/sdk-3d",
+   "scripts" : {}
 }