Html getFeatureInfo response in query panel

fixes #340
hslayers · Oct 10, 2019 · 584f62b · 584f62b
1 parent 3549305
commit 584f62b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/components/query/partials/infopanel.html b/components/query/partials/infopanel.html
@@ -21,6 +21,8 @@
                 </div>
             </div>
         </div>
+        <div ng-repeat="html in data.featureInfoHtmls" ng-bind-html="html">
+        </div>
     </div>
     <iframe id="invisible_popup" style="display:block; z-index:12122;left:-10000px; position:absolute"></iframe>
 </div>
diff --git a/components/query/query-base.service.js b/components/query/query-base.service.js
@@ -28,6 +28,7 @@ export default ['$rootScope', 'hs.map.service', 'Core', '$sce', 'config',
         this.data = {};
         this.data.attributes = [];
         this.data.features = [];
+        this.data.featureInfoHtmls = [];
         this.data.coordinates = [];
         this.queryActive = false;
         this.popupClassname = "";
@@ -74,6 +75,7 @@ export default ['$rootScope', 'hs.map.service', 'Core', '$sce', 'config',
                 me.data.attributes.length = 0;
                 me.data.features = [];
                 me.data.coordinates.length = 0;
+                me.data.featureInfoHtmls = [];
             }
             var invisiblePopup = me.getInvisiblePopup();
             invisiblePopup.contentDocument.body.innerHTML = '';
@@ -86,6 +88,11 @@ export default ['$rootScope', 'hs.map.service', 'Core', '$sce', 'config',
             return document.getElementById('invisible_popup');
         }
 
+        this.pushFeatureInfoHtml = (html) => {
+            me.data.featureInfoHtmls.push($sce.trustAsHtml(html));
+            dataCleared = false;
+        }
+
         this.fillIframeAndResize = function (iframe, response, append) {
             var iframe = me.getInvisiblePopup();
             if (append)

diff --git a/components/query/query-wms.service.js b/components/query/query-wms.service.js
@@ -77,7 +77,6 @@ export default ['$rootScope', '$http', '$sce', 'hs.query.baseService', 'hs.map.s
                     });
                 });
                 doc.querySelectorAll("featureMember").forEach(function ($this) {
-                    debugger;
                     var feature = $this.firstChild;
                     var group = {
                         name: "Feature",
@@ -128,8 +127,13 @@ export default ['$rootScope', '$http', '$sce', 'hs.query.baseService', 'hs.map.s
             }
             if (infoFormat.indexOf("html") > 0) {
                 if (response.length <= 1) return;
-                Base.fillIframeAndResize(Base.getInvisiblePopup(), response, true);
-                if (layer.get('popupClass') != undefined) Base.popupClassname = "ol-popup " + layer.get('popupClass');
+                if(layer.get('getFeatureInfoTarget') == 'info-panel'){
+                    Base.pushFeatureInfoHtml(response);
+                } else {
+                    Base.fillIframeAndResize(Base.getInvisiblePopup(), response, true);
+                    if (layer.get('popupClass') != undefined) 
+                        Base.popupClassname = "ol-popup " + layer.get('popupClass');
+                }
             }
             me.infoCounter--;
             if (me.infoCounter === 0) {