Correctif sur le format des GFI

cf. issue n°20 sur le projet geoportal-sdk (IGNF/geoportal-sdk#20)
IGNF · Sep 21, 2017 · dc96bc6 · dc96bc6
1 parent 5d1e66b
commit dc96bc6
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 625 deletions.
diff --git a/samples/ol3/GetFeatureInfo/amd.html b/samples/ol3/GetFeatureInfo/amd.html
@@ -132,6 +132,7 @@ <h3>
                                 },
                                 {
                                     obj : gpRoad,
+                                    infoFormat : "text/plain"
                                 },
                                 // {
                                 //     obj : gpMaps //pour test : non interrogeable

diff --git a/src/Ol3/GfiUtils.js b/src/Ol3/GfiUtils.js
@@ -326,7 +326,7 @@ define([
                 var p = positions[k];
                 for ( var h = 0 ; h < layersOrdered[p].length ; ++h ) {
                     var l = layersOrdered[p][h].obj;
-                    var infoFormat = layersOrdered[p].infoFormat || "text/html";
+                    var infoFormat = layersOrdered[p][h].infoFormat || "text/html";
                     var minMaxResolutionOk = true ;
                     if (  l.minResolution  &&
                           l.minResolution > map.getResolution()) {

diff --git a/test/spec_rendering/README b/test/spec_rendering/README
diff --git a/test/spec_rendering/leaflet/IsoChrone-options.html b/test/spec_rendering/leaflet/IsoChrone-options.html
diff --git a/test/spec_rendering/leaflet/IsoChrone.html b/test/spec_rendering/leaflet/IsoChrone.html
diff --git a/test/spec_rendering/leaflet/LayerSwitcher.html b/test/spec_rendering/leaflet/LayerSwitcher.html
diff --git a/test/spec_rendering/leaflet/MousePosition-options.html b/test/spec_rendering/leaflet/MousePosition-options.html
-Original file line number
+Diff line change
@@ Expand Up / @@ -132,6 +132,7 @@ <h3> @@
                                     },
                                     {
                                         obj : gpRoad,
+                                        infoFormat : "text/plain"
                                     },
                                     // {
                                     //     obj : gpMaps //pour test : non interrogeable
@@ Expand Down @@