Merge branch 'release-ol-3.2.18'

IGNF · Nov 18, 2022 · f59bb88 · f59bb88
2 parents 2e27ba6 + 3fdc945
commit f59bb88
Show file tree

Hide file tree

Showing 75 changed files with 4,489 additions and 187 deletions.
diff --git a/.gitignore b/.gitignore
@@ -47,6 +47,7 @@ nb-configuration.xml
 /target/
 /tests/
 /test_rendering/node_modules/
+/types/
 
 # add other directories to ignore
 /samples-old/

diff --git a/.npmignore b/.npmignore
@@ -3,6 +3,7 @@
 /jsdoc
 /test
 /test_rendering
+/types
 /samples*
 /samples-src
 /coverage

diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md
@@ -1,11 +1,6 @@
 
 
 
-
-
-
-
-
 # Extension Geoportail OpenLayers, version __VERSION__
 
 **__DATE__**
@@ -17,6 +12,8 @@
 
 * [Added]
 
+    - Ajout des "@types declaration" pour publication
+
 * [Changed]
 
 * [Deprecated]
@@ -25,13 +22,14 @@
 
 * [Fixed]
 
+    - Ajout des evenements (map) : "render:success" / "render:failure" pour l'application du rendu des styles MapBox
+    - Ajout de l'evenement (map) : "editor:loaded" pour le chargement de l'editeur de style
+
 * [Security]
 
 ---
 
 
-
-
 # Extension Geoportail Leaflet, version __VERSION__
 
 **__DATE__**
@@ -43,23 +41,21 @@
 
 * [Added]
 
+    - Ajout des "@types declaration" pour publication
+
 * [Changed]
 
 * [Deprecated]
 
 * [Removed]
 
 * [Fixed]
-  - Calcul d'itinéraire fonctionnel
 
 * [Security]
 
 ---
 
 
-
-
-
 # Extension Geoportail Itowns, version __VERSION__
 
 **__DATE__**
@@ -71,6 +67,8 @@
 
 * [Added]
 
+    - Ajout des "@types declaration ts" pour publication
+
 * [Changed]
 
 * [Deprecated]

diff --git a/build.sh b/build.sh
@@ -45,14 +45,14 @@ function clean() {
 ##########
 # leaflet
 function leaflet() {
-  printTo "####### LEAFLET !"
+  printTo "####### LEAFLET !"
   doCmd "npm run build:leaflet"
 }
 
 ##########
 # ol
 function ol() {
-  printTo "####### OL !"
+  printTo "####### OL !"
   doCmd "npm run build:ol"
 }
 
@@ -71,25 +71,25 @@ do
    case $opts in
      o)
         printTo "#################################"
-        printTo "###### OpenLayers bundle ! ######"
+        printTo "###### OpenLayers bundle ! ######"
         clean "openlayers"
         ol
         ;;
      l)
         printTo "#################################"
-        printTo "####### Leaflet bundle ! ########"
+        printTo "####### Leaflet bundle ! ########"
         clean "leaflet"
         leaflet
         ;;
      i)
         printTo "#############################"
-        printTo "###### Itowns bundle ! ######"
+        printTo "###### Itowns bundle ! ######"
         clean "itowns"
         itowns
         ;;
      a)
         printTo "#################################"
-        printTo "########## ALL bundle ! #########"
+        printTo "########## ALL bundle ! #########"
         clean "openlayers"
         ol
         clean "leaflet"

diff --git a/build/scripts/release/build-pack.sh b/build/scripts/release/build-pack.sh
@@ -63,6 +63,9 @@ build () {
     printTo "> bin..."
     doCmd "npm run build:${run_lib_target}"
 
+    # construction des types declaration ts
+    doCmd "npm run generate-types:${run_lib_target}"
+
     # binaires
     printTo "> dist/..."
     doCmd "mkdir -p ./${main_directory}/dist/"
@@ -75,6 +78,11 @@ build () {
     doCmd "cp -r ../../../src/Common/ ./${main_directory}/src/."
     doCmd "cp -r ../../../src/${src_directory}/ ./${main_directory}/src/."
 
+    # declaration types
+    printTo "> types/..."
+    doCmd "cp -r ../../../dist/${name}/Common/* ./${main_directory}/src/Common/."
+    doCmd "cp -r ../../../dist/${name}/${src_directory}/* ./${main_directory}/src/${src_directory}/."
+
     # flag de compilation
     doCmd 'find ./${main_directory}/src/ -type f -name "*.js" -exec sed -i "s/__FLAG_PLUGIN_CSS__/false/g" {} +'
 
@@ -164,8 +172,8 @@ while true; do
             echo "Il faut au prealable construire les binaires :"
             echo "  > npm run build"
             echo ""
-            echo "Attention, la date et la version sont extraites du package.json principal."
-            echo "Par contre, les dependances ne sont pas gérées par le script..."
+            echo "/!\ Attention, la date et la version sont extraites du package.json principal."
+            echo "Les dependances ne sont pas gérées par le script..."
             echo ""
             echo "Usage :"
             echo "    `basename $0` - construction du package TGZ à publier dans NPM"
@@ -176,7 +184,7 @@ while true; do
             echo "    -a            build : All."
             echo ""
             echo "Par defaut, le repertoire n'est pas supprimé."
-            echo "Le package validé, on se place dans le répertoire pour la publication :"
+            echo "(!) Le package validé, on se place dans le répertoire pour la publication :"
             echo "  > npm login"
             echo "  > npm publish"
             exit 0

diff --git a/build/scripts/release/geoportal-extensions-itowns-2.3.9.tgz b/build/scripts/release/geoportal-extensions-itowns-2.3.9.tgz
diff --git a/build/scripts/release/geoportal-extensions-leaflet-2.2.7.tgz b/build/scripts/release/geoportal-extensions-leaflet-2.2.7.tgz
diff --git a/build/scripts/release/geoportal-extensions-openlayers-3.2.17.tgz b/build/scripts/release/geoportal-extensions-openlayers-3.2.17.tgz
diff --git a/build/scripts/release/geoportal-extensions-openlayers-3.2.18.tgz b/build/scripts/release/geoportal-extensions-openlayers-3.2.18.tgz
diff --git a/build/scripts/release/package-itowns.json b/build/scripts/release/package-itowns.json
@@ -5,40 +5,41 @@
       "javascript",
       "Itowns"
    ],
-   "main" : "dist/GpPluginItowns-src.js",
-   "directories" : {},
-   "description" : "French Geoportal Extensions for iTowns",
-   "dependencies" : {
-      "sortablejs" : "1.14.0",
-      "loglevel" : "1.6.7",
-      "geoportal-access-lib" : "3.2.0",
-      "xmldom" : "^0.1.27",
-      "node-fetch" : "^2.6.1",
-      "three" : "0.137.5",
-      "proj4" : "2.7.5",
-      "itowns" : "2.38.2"
-   },
    "name" : "geoportal-extensions-itowns",
-   "author" : "IGNF",
    "peerDependencies" : {},
+   "bugs" : {},
+   "description" : "French Geoportal Extensions for iTowns",
+   "date" : "30/10/2022",
+   "license" : "CECILL-B",
+   "bundleDependencies" : [],
+   "repository" : {
+      "url" : "https://github.com/IGNF/geoportal-extensions.git",
+      "type" : "git"
+   },
+   "main" : "dist/GpPluginItowns-src.js",
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-itowns.html",
+   "scripts" : {},
+   "module" : "src/Itowns/index.js",
+   "types" : "src/Itowns/index.d.ts",
    "files" : [
       "dist/",
       "src/",
       "LICENCE.md",
       "README.md",
       "package.json"
    ],
-   "license" : "CECILL-B",
-   "scripts" : {},
-   "module" : "src/Itowns/index.js",
-   "bundleDependencies" : [],
-   "date" : "04/10/2022",
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-itowns.html",
-   "repository" : {
-      "url" : "https://github.com/IGNF/geoportal-extensions.git",
-      "type" : "git"
+   "dependencies" : {
+      "xmldom" : "^0.1.27",
+      "proj4" : "2.7.5",
+      "loglevel" : "1.6.7",
+      "node-fetch" : "^2.6.1",
+      "itowns" : "2.38.2",
+      "geoportal-access-lib" : "3.2.0",
+      "sortablejs" : "1.14.0",
+      "three" : "0.137.5"
    },
+   "version" : "2.3.9",
+   "directories" : {},
    "devDependencies" : {},
-   "bugs" : {},
-   "version" : "2.3.8"
+   "author" : "IGNF"
 }
diff --git a/build/scripts/release/package-leaflet.json b/build/scripts/release/package-leaflet.json
@@ -1,45 +1,46 @@
 {
-   "scripts" : {},
-   "date" : "04/10/2022",
+   "bundleDependencies" : [],
+   "peerDependencies" : {},
+   "devDependencies" : {},
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-leaflet.html",
    "bugs" : {},
+   "module" : "src/Leaflet/index.js",
    "keywords" : [
       "geoportail",
       "plugin",
       "javascript",
       "leaflet",
       "publish"
    ],
-   "description" : "French Geoportal Extension for Leaflet",
-   "version" : "2.2.5",
-   "main" : "dist/GpPluginLeaflet-src.js",
-   "peerDependencies" : {},
-   "dependencies" : {
-      "sortablejs" : "1.8.4",
-      "geoportal-access-lib" : "3.2.0",
-      "leaflet-draw" : "1.0.4",
-      "loglevel" : "1.6.6",
-      "node-fetch" : "^2.6.1",
-      "proj4leaflet" : "1.0.2",
-      "xmldom" : "^0.1.27",
-      "leaflet" : "1.7.1",
-      "proj4" : "2.7.5"
-   },
-   "module" : "src/Leaflet/index.js",
+   "directories" : {},
    "files" : [
       "dist/",
       "src/",
       "LICENCE.md",
       "README.md",
       "package.json"
    ],
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-leaflet.html",
+   "types" : "src/Leaflet/index.d.ts",
+   "version" : "2.2.7",
+   "description" : "French Geoportal Extension for Leaflet",
+   "license" : "CECILL-B",
    "repository" : {
-      "type" : "git",
-      "url" : "https://github.com/IGNF/geoportal-extensions.git"
+      "url" : "https://github.com/IGNF/geoportal-extensions.git",
+      "type" : "git"
    },
-   "devDependencies" : {},
-   "directories" : {},
-   "bundleDependencies" : [],
    "name" : "geoportal-extensions-leaflet",
-   "license" : "CECILL-B"
+   "date" : "30/10/2022",
+   "dependencies" : {
+      "geoportal-access-lib" : "3.2.0",
+      "leaflet" : "1.7.1",
+      "proj4" : "2.7.5",
+      "loglevel" : "1.6.6",
+      "sortablejs" : "1.8.4",
+      "xmldom" : "^0.1.27",
+      "node-fetch" : "^2.6.1",
+      "proj4leaflet" : "1.0.2",
+      "leaflet-draw" : "1.0.4"
+   },
+   "scripts" : {},
+   "main" : "dist/GpPluginLeaflet-src.js"
 }
diff --git a/build/scripts/release/package-openlayers.json b/build/scripts/release/package-openlayers.json
@@ -1,46 +1,47 @@
 {
-   "devDependencies" : {},
-   "files" : [
-      "dist/",
-      "src/",
-      "LICENCE.md",
-      "README.md",
-      "package.json"
-   ],
-   "bundleDependencies" : [],
+   "module" : "src/OpenLayers/index.js",
+   "peerDependencies" : {},
+   "date" : "18/11/2022",
    "scripts" : {},
+   "types" : "src/OpenLayers/index.d.ts",
+   "devDependencies" : {},
    "directories" : {},
-   "dependencies" : {
-      "@mapbox/mapbox-gl-style-spec" : "13.20.1",
-      "loglevel" : "1.6.6",
-      "geoportal-access-lib" : "3.1.0",
-      "xmldom" : "^0.1.27",
-      "node-fetch" : "^2.6.1",
-      "ol-mapbox-style" : "6.7.0",
-      "eventbusjs" : "0.2.0",
-      "proj4" : "2.7.5",
-      "ol" : "6.9.0",
-      "sortablejs" : "1.14.0"
-   },
-   "description" : "French Geoportal Extensions for OpenLayers",
+   "bugs" : {},
+   "name" : "geoportal-extensions-openlayers",
    "license" : "CECILL-B",
+   "repository" : {
+      "url" : "https://github.com/IGNF/geoportal-extensions.git",
+      "type" : "git"
+   },
    "keywords" : [
       "geoportail",
       "plugin",
       "javascript",
       "OpenLayers"
    ],
    "author" : "IGNF",
-   "peerDependencies" : {},
-   "repository" : {
-      "url" : "https://github.com/IGNF/geoportal-extensions.git",
-      "type" : "git"
+   "main" : "dist/GpPluginOpenLayers-src.js",
+   "description" : "French Geoportal Extensions for OpenLayers",
+   "bundleDependencies" : [],
+   "dependencies" : {
+      "xmldom" : "^0.1.27",
+      "sortablejs" : "1.14.0",
+      "ol-mapbox-style" : "6.7.0",
+      "@mapbox/mapbox-gl-style-spec" : "13.20.1",
+      "eventbusjs" : "0.2.0",
+      "proj4" : "2.7.5",
+      "node-fetch" : "^2.6.1",
+      "ol" : "6.9.0",
+      "loglevel" : "1.6.6",
+      "geoportal-access-lib" : "3.2.0"
    },
    "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-openlayers.html",
-   "name" : "geoportal-extensions-openlayers",
-   "main" : "dist/GpPluginOpenLayers-src.js",
-   "version" : "3.2.17",
-   "module" : "src/OpenLayers/index.js",
-   "bugs" : {},
-   "date" : "04/10/2022"
+   "files" : [
+      "dist/",
+      "src/",
+      "LICENCE.md",
+      "README.md",
+      "package.json"
+   ],
+   "version" : "3.2.18"
 }