update ol3 plugins : add gpResultLayerId for measures layers

IGNF · Jun 16, 2017 · c989e1c · c989e1c
1 parent 552cc70
commit c989e1c
Show file tree

Hide file tree

Showing 12 changed files with 156 additions and 154 deletions.
diff --git a/lib/external/geoportail/plugins-mix/GpPluginOl3Vg-src.css b/lib/external/geoportail/plugins-mix/GpPluginOl3Vg-src.css
@@ -10,7 +10,7 @@
  * copyright IGN
  * @author IGN
  * @version 0.12.0-dev
- * @date 2017-06-12
+ * @date 2017-06-16
  *
  */
 /* MOUSE POSITION */
@@ -3273,36 +3273,6 @@ display: none !important;
 }
 */
 
-/* GET FEATURE INFO */
-
-div[id^=GPgetFeatureInfo-] {
-  top: 260px;
-  left: 10px;
-}
-
-span[id^=GPgetFeatureInfoActivate],
-span[id^=GPgetFeatureInfoDeactivate] {
-  width: 26px;
-  height: 26px;
-  background-image: url("img/GPactivateGfi.png");
-}
-
-span[id^=GPgetFeatureInfoDeactivate] {
-  background-position: -26px 0;
-}
-
-div[id^=GPgetFeatureInfo-] input[type="checkbox"]:not(:checked) + label[id^=GPgetFeatureInfoPicto] span[id^=GPgetFeatureInfoActivate] {
-  opacity: 0.7;
-}
-
-div[id^=GPgetFeatureInfo-] input[type="checkbox"]:not(:checked) + label[id^=GPgetFeatureInfoPicto] span[id^=GPgetFeatureInfoDeactivate] {
-  background-color: rgba(0,60,136,0.3);
-}
-
-div[id^=GPgetFeatureInfo-] input[type="checkbox"]:not(:checked) + label[id^=GPgetFeatureInfoPicto]:hover span[id^=GPgetFeatureInfoDeactivate] {
-  background-color: rgba(0,60,136,0.4);
-}
-
 /* ISOCHRON */
 
 div[id^=GPisochron-] {
@@ -3357,6 +3327,36 @@ div[id^=GPisochronReset] {
   background-image: url("img/GPisochronOptions.png");
 }
 
+/* GET FEATURE INFO */
+
+div[id^=GPgetFeatureInfo-] {
+  top: 260px;
+  left: 10px;
+}
+
+span[id^=GPgetFeatureInfoActivate],
+span[id^=GPgetFeatureInfoDeactivate] {
+  width: 26px;
+  height: 26px;
+  background-image: url("img/GPactivateGfi.png");
+}
+
+span[id^=GPgetFeatureInfoDeactivate] {
+  background-position: -26px 0;
+}
+
+div[id^=GPgetFeatureInfo-] input[type="checkbox"]:not(:checked) + label[id^=GPgetFeatureInfoPicto] span[id^=GPgetFeatureInfoActivate] {
+  opacity: 0.7;
+}
+
+div[id^=GPgetFeatureInfo-] input[type="checkbox"]:not(:checked) + label[id^=GPgetFeatureInfoPicto] span[id^=GPgetFeatureInfoDeactivate] {
+  background-color: rgba(0,60,136,0.3);
+}
+
+div[id^=GPgetFeatureInfo-] input[type="checkbox"]:not(:checked) + label[id^=GPgetFeatureInfoPicto]:hover span[id^=GPgetFeatureInfoDeactivate] {
+  background-color: rgba(0,60,136,0.4);
+}
+
 /* Layer Import */
 
 div[id^="GPimport-"] {
@@ -3809,6 +3809,62 @@ div[id^=GPreverseGeocodingReturnPicto-] {
     color: #222;
 }
 
+/* SEARCH ENGINE */
+
+[id^="GPsearchEngine-"] {
+  top: 8px;
+  left: 46px;
+}
+
+/* Showing/hiding search engine input */
+
+[id^="GPshowSearchEngineOpen"] {
+  background-image: url("img/GPsearchEngineOpen.png");
+  transition: border-radius 0.5s ease-out 0s;
+}
+
+/* Simple search input */
+
+[id^="GPsearchInput"] {
+  height: 32px;
+}
+
+[id^="GPsearchInputReset"] {
+  background-image: url("img/GPsearchEngineClose.png");
+}
+
+/* General panels */
+
+[id^="GPgeocodeResultsClose"] {
+  background-image: url("img/GPsearchEngineClose.png");
+}
+
+[id^="GPadvancedSearchClose"] {
+  background-image: url("img/GPsearchEngineOpen.png");
+  background-position: -50px 3px;
+}
+
+/* Advanced search picto */
+
+[id^="GPshowAdvancedSearchOpen"] {
+  background-image: url("img/GPsearchEngineOpen.png");
+  background-position: -26px 0;
+  transition: border-radius 0.5s ease-out 0s;
+}
+
+/* Autocomplete list / geocode results */
+
+[id^="GPautoCompleteList"],
+[id^="GPgeocodeResultsList"] {
+  margin-left: 33px;
+  box-shadow: 0 0 6px #000;
+}
+
+[id^="GPgeocodeResultsList"] {
+  top: 40px;
+  border-radius: 4px;
+}
+
 /* ROUTE */
 
 div[id^=GProute-] {
@@ -3888,62 +3944,6 @@ input[id^=GProuteResultsShowDetails] + label + label:hover {
   min-width: 230px;
 }
 
-/* SEARCH ENGINE */
-
-[id^="GPsearchEngine-"] {
-  top: 8px;
-  left: 46px;
-}
-
-/* Showing/hiding search engine input */
-
-[id^="GPshowSearchEngineOpen"] {
-  background-image: url("img/GPsearchEngineOpen.png");
-  transition: border-radius 0.5s ease-out 0s;
-}
-
-/* Simple search input */
-
-[id^="GPsearchInput"] {
-  height: 32px;
-}
-
-[id^="GPsearchInputReset"] {
-  background-image: url("img/GPsearchEngineClose.png");
-}
-
-/* General panels */
-
-[id^="GPgeocodeResultsClose"] {
-  background-image: url("img/GPsearchEngineClose.png");
-}
-
-[id^="GPadvancedSearchClose"] {
-  background-image: url("img/GPsearchEngineOpen.png");
-  background-position: -50px 3px;
-}
-
-/* Advanced search picto */
-
-[id^="GPshowAdvancedSearchOpen"] {
-  background-image: url("img/GPsearchEngineOpen.png");
-  background-position: -26px 0;
-  transition: border-radius 0.5s ease-out 0s;
-}
-
-/* Autocomplete list / geocode results */
-
-[id^="GPautoCompleteList"],
-[id^="GPgeocodeResultsList"] {
-  margin-left: 33px;
-  box-shadow: 0 0 6px #000;
-}
-
-[id^="GPgeocodeResultsList"] {
-  top: 40px;
-  border-radius: 4px;
-}
-
 /* TODO coller un peu plus à la charte
 - liseret blanc transparent 32x32 autour du pictogramme
 - pictogramme 26x26
@@ -4022,7 +4022,7 @@ div[id^=GPtoolbox-measure-main]:hover button[id^=GPtoolbox-measure-button] {
  * copyright IGN
  * @author IGN
  * @version 5.0.0
- * @date 2017-06-12
+ * @date 2017-06-16
  *
  */
 /* MOUSE POSITION */

diff --git a/lib/external/geoportail/plugins-mix/GpPluginOl3Vg-src.js b/lib/external/geoportail/plugins-mix/GpPluginOl3Vg-src.js
@@ -16505,7 +16505,7 @@ CommonUtilsCheckRightManagement = function (woodman, Config) {
             var _rightManagement = {};
             if (!_key) {
                 if (!Config.isConfigLoaded()) {
-                    console.log('WARNING : ' + 'parameter \'apiKey\' has not been parametered, ' + 'and the contract key configuration has not been loaded, ' + 'so impossible to check yours rights !');
+                    console.log('WARNING : ' + 'The \'apiKey\' parameter is missing, ' + 'and the contract key configuration has not been loaded, ' + 'so impossible to check yours rights !');
                     return;
                 } else {
                     _key = Object.keys(Config.configuration.generalOptions.apiKeys)[0];
@@ -16532,7 +16532,7 @@ CommonUtilsCheckRightManagement = function (woodman, Config) {
                             var _service = _services[l];
                             var params = Config.getServiceParams(_resource, _service, _key);
                             if (!params || Object.keys(params).length === 0) {
-                                console.log('WARNING : ' + 'contract key configuration has no rights to load this geoportal ' + 'resource (' + _resource + ') ' + 'for this service (' + _service + ') ');
+                                console.log('WARNING : ' + 'The contract key configuration has no rights to load this geoportal ' + 'resource (' + _resource + ') ' + 'for this service (' + _service + ') ');
                                 continue;
                             }
                             if (!_rightManagement[_service]) {
@@ -16542,7 +16542,7 @@ CommonUtilsCheckRightManagement = function (woodman, Config) {
                         }
                     }
                     if (!_rightManagement || Object.keys(_rightManagement).length === 0) {
-                        console.log('WARNING : ' + 'the contract key configuration has been loaded, ' + 'and the parameter \'apiKey\' has been parametered, ' + 'but, there is a problem on the mapping between the contract and the key !');
+                        console.log('WARNING : ' + 'The contract key configuration has been loaded, ' + 'and the \'apiKey\' parameter has been set, ' + 'but, there is a problem on the mapping between the contract and the key !');
                         return;
                     }
                     _rightManagement.key = _key;
@@ -27291,6 +27291,7 @@ Ol3ControlsMeasuresMeasures = function (ol, woodman, Interactions) {
                 source: this.measureSource,
                 style: this.options.styles.finish || Measures.DEFAULT_DRAW_FINISH_STYLE
             });
+            this.measureVector.gpResultLayerId = 'measure';
             map.addLayer(this.measureVector);
         }
     };
@@ -28651,7 +28652,7 @@ Ol3ControlsMeasuresMeasureAzimuth = function (ol, woodman, Utils, MeasureToolBox
 }(ol, {}, Ol3Utils, Ol3ControlsMeasureToolBox, Ol3ControlsMeasuresMeasures, CommonControlsMeasureAzimuthDOM, CommonUtilsSelectorID);
 Ol3GpPluginOl3 = function (ol, Gp, LayerUtils, Register, ProxyUtils, GfiUtils, Utils, KML, WMTS, CRS, SourceWMTS, SourceWMS, LayerWMTS, LayerWMS, LayerSwitcher, GetFeatureInfo, SearchEngine, MousePosition, Drawing, Route, Isocurve, ReverseGeocode, LayerImport, GeoportalAttribution, Markers, ElevationPath, MeasureLength, MeasureArea, MeasureAzimuth) {
     Gp.ol3extVersion = '0.12.0-dev';
-    Gp.ol3extDate = '2017-06-12';
+    Gp.ol3extDate = '2017-06-16';
     Gp.olUtils = Utils;
     Gp.LayerUtils = LayerUtils;
     Gp.ProxyUtils = ProxyUtils;

diff --git a/lib/external/geoportail/plugins-mix/GpPluginOl3Vg.css b/lib/external/geoportail/plugins-mix/GpPluginOl3Vg.css
diff --git a/lib/external/geoportail/plugins-mix/GpPluginOl3Vg.js b/lib/external/geoportail/plugins-mix/GpPluginOl3Vg.js
diff --git a/lib/external/geoportail/plugins-ol3/GpPluginOl3-src.css b/lib/external/geoportail/plugins-ol3/GpPluginOl3-src.css
@@ -10,7 +10,7 @@
  * copyright IGN
  * @author IGN
  * @version 0.12.0-dev
- * @date 2017-06-12
+ * @date 2017-06-16
  *
  */
 /* MOUSE POSITION */
@@ -3178,6 +3178,36 @@ button[id^=drawing-export-] {
   height: 24px;
 }
 
+/* GET FEATURE INFO */
+
+div[id^=GPgetFeatureInfo-] {
+  top: 260px;
+  left: 10px;
+}
+
+span[id^=GPgetFeatureInfoActivate],
+span[id^=GPgetFeatureInfoDeactivate] {
+  width: 26px;
+  height: 26px;
+  background-image: url("img/GPactivateGfi.png");
+}
+
+span[id^=GPgetFeatureInfoDeactivate] {
+  background-position: -26px 0;
+}
+
+div[id^=GPgetFeatureInfo-] input[type="checkbox"]:not(:checked) + label[id^=GPgetFeatureInfoPicto] span[id^=GPgetFeatureInfoActivate] {
+  opacity: 0.7;
+}
+
+div[id^=GPgetFeatureInfo-] input[type="checkbox"]:not(:checked) + label[id^=GPgetFeatureInfoPicto] span[id^=GPgetFeatureInfoDeactivate] {
+  background-color: rgba(0,60,136,0.3);
+}
+
+div[id^=GPgetFeatureInfo-] input[type="checkbox"]:not(:checked) + label[id^=GPgetFeatureInfoPicto]:hover span[id^=GPgetFeatureInfoDeactivate] {
+  background-color: rgba(0,60,136,0.4);
+}
+
 div[id^=GPelevationPath-] {
   bottom: 48px;
   left: 10px;
@@ -3273,36 +3303,6 @@ display: none !important;
 }
 */
 
-/* GET FEATURE INFO */
-
-div[id^=GPgetFeatureInfo-] {
-  top: 260px;
-  left: 10px;
-}
-
-span[id^=GPgetFeatureInfoActivate],
-span[id^=GPgetFeatureInfoDeactivate] {
-  width: 26px;
-  height: 26px;
-  background-image: url("img/GPactivateGfi.png");
-}
-
-span[id^=GPgetFeatureInfoDeactivate] {
-  background-position: -26px 0;
-}
-
-div[id^=GPgetFeatureInfo-] input[type="checkbox"]:not(:checked) + label[id^=GPgetFeatureInfoPicto] span[id^=GPgetFeatureInfoActivate] {
-  opacity: 0.7;
-}
-
-div[id^=GPgetFeatureInfo-] input[type="checkbox"]:not(:checked) + label[id^=GPgetFeatureInfoPicto] span[id^=GPgetFeatureInfoDeactivate] {
-  background-color: rgba(0,60,136,0.3);
-}
-
-div[id^=GPgetFeatureInfo-] input[type="checkbox"]:not(:checked) + label[id^=GPgetFeatureInfoPicto]:hover span[id^=GPgetFeatureInfoDeactivate] {
-  background-color: rgba(0,60,136,0.4);
-}
-
 /* ISOCHRON */
 
 div[id^=GPisochron-] {