Skip to content
Snippets Groups Projects
Commit b90131de authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Gridmap: Simplify popup hiding before (re)creating

parent a98e6524
No related branches found
No related tags found
No related merge requests found
...@@ -187,6 +187,9 @@ function switchParameter(selectedParameter) ...@@ -187,6 +187,9 @@ function switchParameter(selectedParameter)
async function displayQueryResult(evt) async function displayQueryResult(evt)
{ {
let popupElement = popup.getElement();
$(popupElement).popover('destroy');
let coordinate = proj4(map.getView().getProjection().getCode(), 'EPSG:25833', evt.coordinate) let coordinate = proj4(map.getView().getProjection().getCode(), 'EPSG:25833', evt.coordinate)
let currentWMSLayer = WMSLayersDateBucket[currentTimestamp][currentParameter]; let currentWMSLayer = WMSLayersDateBucket[currentTimestamp][currentParameter];
let currentLayer = getCurrentVisibleOLLayer(); let currentLayer = getCurrentVisibleOLLayer();
...@@ -205,8 +208,6 @@ async function displayQueryResult(evt) ...@@ -205,8 +208,6 @@ async function displayQueryResult(evt)
// User clicked outside of layer extent // User clicked outside of layer extent
if(responseXML.trim().length == 0) if(responseXML.trim().length == 0)
{ {
let popupElement = popup.getElement();
$(popupElement).popover('destroy');
return; return;
} }
...@@ -218,8 +219,6 @@ async function displayQueryResult(evt) ...@@ -218,8 +219,6 @@ async function displayQueryResult(evt)
let warningStatus = xmlDOM.getElementsByTagName("warningStatus").length == 1 ? xmlDOM.getElementsByTagName("warningStatus")[0].getAttribute("value") : null; let warningStatus = xmlDOM.getElementsByTagName("warningStatus").length == 1 ? xmlDOM.getElementsByTagName("warningStatus")[0].getAttribute("value") : null;
if(warningStatus == -1) if(warningStatus == -1)
{ {
let popupElement = popup.getElement();
$(popupElement).popover('destroy');
return; return;
} }
let parameters = {}; let parameters = {};
...@@ -247,8 +246,6 @@ async function displayQueryResult(evt) ...@@ -247,8 +246,6 @@ async function displayQueryResult(evt)
// Render results // Render results
// TODO: Handle click outside layer // TODO: Handle click outside layer
let popupElement = popup.getElement();
$(popupElement).popover('destroy');
popup.setPosition(evt.coordinate); popup.setPosition(evt.coordinate);
$(popupElement).popover({ $(popupElement).popover({
'placement': 'top', 'placement': 'top',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment