release openlayers, leaflet & itowns

IGNF · Sep 24, 2019 · 6f06422 · 6f06422
1 parent 02d2184
commit 6f06422
Show file tree

Hide file tree

Showing 23 changed files with 166 additions and 167 deletions.
diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md
@@ -1,6 +1,6 @@
 # Extension Geoportail OpenLayers, version 3.0.3
 
-**12/09/2019 : version 3.0.3**
+**24/09/2019 : version 3.0.3**
 > Release Extension Geoportail OpenLayers
 
 ## Summary
@@ -20,7 +20,6 @@
 
 * [Fixed]
 
-    - Ajout de contraintes sur le mode Draggable sur les fenêtres des extensions
     - [dev-workflow] correctifs sur les fichiers Webpack
 
 * [Security]
@@ -30,7 +29,7 @@
 
 # Extension Geoportail Itowns, version 2.2.3
 
-**12/09/2019**
+**24/09/2019**
 > Release Extension Geoportail Itowns
 
 ## Summary
@@ -51,7 +50,7 @@
 
 # Extension Geoportail Leaflet, version 2.1.3
 
-**12/09/2019**
+**24/09/2019**
 > Release Extension Geoportail Leaflet
 
 ## Summary
@@ -67,4 +66,4 @@
 * [Fixed]
 
     - [dev-workflow] correctifs sur les fichiers Webpack
-    - **TODO** [#243](https://github.com/IGNF/geoportal-extensions/issues/243) - gestion de l'import CSS du plugin 'leaflet-draw' en mode module ES6 sous Angular
+    - [#243](https://github.com/IGNF/geoportal-extensions/issues/243) - gestion de l'import CSS du plugin 'leaflet-draw' en mode module ES6 sous Angular
diff --git a/build/scripts/release/geoportal-extensions-itowns-2.2.3.tgz b/build/scripts/release/geoportal-extensions-itowns-2.2.3.tgz
diff --git a/build/scripts/release/geoportal-extensions-leaflet-2.1.3.tgz b/build/scripts/release/geoportal-extensions-leaflet-2.1.3.tgz
diff --git a/build/scripts/release/geoportal-extensions-openlayers-3.0.3.tgz b/build/scripts/release/geoportal-extensions-openlayers-3.0.3.tgz
diff --git a/build/scripts/release/package-itowns.json b/build/scripts/release/package-itowns.json
@@ -1,45 +1,45 @@
 {
-   "files" : [
-      "dist/",
-      "src/",
-      "LICENCE.md",
-      "README.md",
-      "package.json"
-   ],
+   "date" : "24/09/2019",
+   "repository" : {
+      "url" : "https://github.com/IGNF/geoportal-extensions.git",
+      "type" : "git"
+   },
    "dependencies" : {
-      "loglevel" : "~1.6.1",
       "three" : "~0.107.0",
-      "proj4" : "2.5.0",
+      "three.meshline" : "~1.2.0",
+      "loglevel" : "~1.6.1",
       "itowns" : "2.13.1",
+      "geoportal-access-lib" : "^2.1.5",
+      "proj4" : "2.5.0",
       "xmldom" : "^0.1.27",
-      "three.meshline" : "~1.2.0",
       "request" : "^2.83.0",
-      "sortablejs" : "1.8.4",
-      "geoportal-access-lib" : "2.1.4"
+      "sortablejs" : "1.8.4"
    },
    "scripts" : {},
-   "description" : "French Geoportal Extensions for iTowns",
-   "repository" : {
-      "url" : "https://github.com/IGNF/geoportal-extensions.git",
-      "type" : "git"
-   },
-   "date" : "12/09/2019",
-   "version" : "2.2.3",
+   "main" : "dist/GpPluginItowns-src.js",
+   "author" : "IGNF",
    "bundleDependencies" : [],
-   "bugs" : {},
    "devDependencies" : {},
+   "peerDependencies" : {},
+   "files" : [
+      "dist/",
+      "src/",
+      "LICENCE.md",
+      "README.md",
+      "package.json"
+   ],
    "keywords" : [
       "geoportail",
       "plugin",
       "javascript",
       "Itowns"
    ],
-   "peerDependencies" : {},
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-itowns.html",
+   "directories" : {},
+   "version" : "2.2.3",
+   "description" : "French Geoportal Extensions for iTowns",
    "module" : "src/Itowns/index.js",
-   "main" : "dist/GpPluginItowns-src.js",
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-itowns.html",
    "name" : "geoportal-extensions-itowns",
-   "license" : "CECILL-B",
-   "author" : "IGNF",
-   "directories" : {}
+   "bugs" : {},
+   "license" : "CECILL-B"
 }
diff --git a/build/scripts/release/package-leaflet.json b/build/scripts/release/package-leaflet.json
@@ -1,44 +1,44 @@
 {
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-leaflet.html",
+   "author" : "IGNF",
    "directories" : {},
    "version" : "2.1.3",
+   "peerDependencies" : {},
+   "bundleDependencies" : [],
+   "date" : "24/09/2019",
    "license" : "CECILL-B",
-   "scripts" : {},
-   "dependencies" : {
-      "leaflet" : "1.3.1",
-      "geoportal-access-lib" : "2.1.5",
-      "proj4" : "2.5.0",
-      "leaflet-draw" : "1.0.2",
-      "loglevel" : "~1.6.1",
-      "sortablejs" : "1.8.4",
-      "proj4leaflet" : "~1.0.2"
-   },
-   "author" : "IGNF",
+   "files" : [
+      "dist/",
+      "src/",
+      "LICENCE.md",
+      "README.md",
+      "package.json"
+   ],
+   "description" : "French Geoportal Extension for Leaflet",
+   "bugs" : {},
    "module" : "src/Leaflet/index.js",
+   "devDependencies" : {},
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-leaflet.html",
    "repository" : {
       "url" : "https://github.com/IGNF/geoportal-extensions.git",
       "type" : "git"
    },
-   "main" : "dist/GpPluginLeaflet-src.js",
-   "date" : "12/09/2019",
-   "name" : "geoportal-extensions-leaflet",
-   "bugs" : {},
    "keywords" : [
       "geoportail",
       "plugin",
       "javascript",
       "leaflet",
       "publish"
    ],
-   "files" : [
-      "dist/",
-      "src/",
-      "LICENCE.md",
-      "README.md",
-      "package.json"
-   ],
-   "description" : "French Geoportal Extension for Leaflet",
-   "bundleDependencies" : [],
-   "devDependencies" : {},
-   "peerDependencies" : {}
+   "name" : "geoportal-extensions-leaflet",
+   "scripts" : {},
+   "main" : "dist/GpPluginLeaflet-src.js",
+   "dependencies" : {
+      "geoportal-access-lib" : "^2.1.5",
+      "proj4" : "2.5.0",
+      "leaflet-draw" : "1.0.2",
+      "loglevel" : "~1.6.1",
+      "leaflet" : "1.3.1",
+      "sortablejs" : "1.8.4",
+      "proj4leaflet" : "~1.0.2"
+   }
 }
diff --git a/build/scripts/release/package-openlayers.json b/build/scripts/release/package-openlayers.json
@@ -1,45 +1,45 @@
 {
-   "repository" : {
-      "type" : "git",
-      "url" : "https://github.com/IGNF/geoportal-extensions.git"
-   },
-   "bugs" : {},
-   "author" : "IGNF",
-   "main" : "dist/GpPluginOpenLayers-src.js",
    "files" : [
       "dist/",
       "src/",
       "LICENCE.md",
       "README.md",
       "package.json"
    ],
-   "name" : "geoportal-extensions-openlayers",
-   "description" : "French Geoportal Extensions for OpenLayers",
-   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-openlayers.html",
-   "bundleDependencies" : [],
+   "bugs" : {},
    "keywords" : [
       "geoportail",
       "plugin",
       "javascript",
       "OpenLayers"
    ],
    "scripts" : {},
+   "directories" : {},
+   "homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-openlayers.html",
+   "license" : "CECILL-B",
+   "module" : "src/OpenLayers/index.js",
+   "date" : "24/09/2019",
+   "peerDependencies" : {},
+   "author" : "IGNF",
+   "name" : "geoportal-extensions-openlayers",
+   "description" : "French Geoportal Extensions for OpenLayers",
+   "repository" : {
+      "type" : "git",
+      "url" : "https://github.com/IGNF/geoportal-extensions.git"
+   },
+   "version" : "3.0.3",
+   "devDependencies" : {},
+   "main" : "dist/GpPluginOpenLayers-src.js",
+   "bundleDependencies" : [],
    "dependencies" : {
-      "ol" : "^5.3.0",
+      "geoportal-access-lib" : "^2.1.5",
       "xmldom" : "^0.1.27",
       "sortablejs" : "1.8.4",
-      "request" : "^2.83.0",
-      "geoportal-access-lib" : "2.1.5",
       "ol-mapbox-style" : "^4.2.1",
-      "loglevel" : "~1.6.1",
+      "request" : "^2.83.0",
+      "proj4" : "2.5.0",
       "eventbusjs" : "^0.2.0",
-      "proj4" : "2.5.0"
-   },
-   "directories" : {},
-   "license" : "CECILL-B",
-   "peerDependencies" : {},
-   "devDependencies" : {},
-   "module" : "src/OpenLayers/index.js",
-   "version" : "3.0.3",
-   "date" : "12/09/2019"
+      "ol" : "^5.3.0",
+      "loglevel" : "~1.6.1"
+   }
 }
diff --git a/build/webpack/webpack.config.leaflet.js b/build/webpack/webpack.config.leaflet.js
@@ -215,13 +215,12 @@ module.exports = (env, argv) => {
             /** REPLACEMENT DE VALEURS */
             new ReplaceWebpackPlugin(
                 [
-                    // {
-                    //     partten : /__GPLEAFLETEXTVERSION__/g,
-                    //     /** replacement de la clef __VERSION__ par la version du package */
-                    //     replacement : function () {
-                    //         return pkg.leafletExtVersion;
-                    //     }
-                    // },
+                    {
+                        partten : /__COMPILATION__/g,
+                        replacement : function () {
+                            return true;
+                        }
+                    },
                     {
                         partten : /__DATE__/g,
                         /** replacement de la clef __DATE__ par la date du build */

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "geoportal-extensions",
   "description": "French Geoportal Extensions for OpenLayers, Leaflet and iTowns libraries",
   "version": "2.2.3",
-  "date": "12/09/2019",
+  "date": "24/09/2019",
   "leafletExtName": "French Geoportal Extension for Leaflet",
   "leafletExtVersion": "2.1.3",
   "olExtName": "French Geoportal Extension for OpenLayers",
@@ -72,7 +72,7 @@
   "homepage": "https://github.com/IGNF/geoportal-extensions#readme",
   "dependencies": {
     "eventbusjs": "^0.2.0",
-    "geoportal-access-lib": "2.1.5",
+    "geoportal-access-lib": "^2.1.5",
     "itowns": "2.13.1",
     "leaflet": "1.3.1",
     "leaflet-draw": "1.0.2",

diff --git a/src/Common/Controls/DrawingDOM.js b/src/Common/Controls/DrawingDOM.js
@@ -140,9 +140,10 @@ var DrawingDOM = {
 
     /**
      * Creates drawing tools section.
+     *
+     * @returns {DOMElement} DOM element
      */
     _createDrawingToolsSections : function () {
-
         var tools = [];
 
         this.dtOptions = {};

diff --git a/src/Common/Controls/MousePositionDOM.js b/src/Common/Controls/MousePositionDOM.js
@@ -94,18 +94,10 @@ var MousePositionDOM = {
 
     /**
      * mouse position panel
-     * @param {Boolean} [displayAltitude=true] - specifies if the altitude panel must be displayed
-     * @param {Boolean} [displayCoordinates=true] - specifies if the coordinates panel must be displayed
-     * @param {Boolean} [editCoordinates=false] - specifies if the coordinates edition is allowed
-     * @param {Boolean} [currentProjectionUnits] - specifies if the current projection units
-     *
-     * FIXME
-     * don't call this._createMousePositionSettingsElement
      *
      * @returns {DOMElement} DOM element
      */
-    _createMousePositionPanelElement : function (displayAltitude, displayCoordinates, editCoordinates, currentProjectionUnits) {
-
+    _createMousePositionPanelElement : function () {
         var panel = document.createElement("div");
         panel.id = this._addUID("GPmousePositionPanel");
         panel.className = "GPpanel";
@@ -188,7 +180,7 @@ var MousePositionDOM = {
         displayAltitude = (typeof displayAltitude === "undefined") ? true : displayAltitude;
         displayCoordinates = (typeof displayCoordinates === "undefined") ? true : displayCoordinates;
         editCoordinates = (typeof editCoordinates === "undefined") ? false : editCoordinates;
-        
+
         var container = document.createElement("div");
         container.id = this._addUID("GPmousePositionBasicPanel");