From f362fba59f35a142042e5446e68e14f554afd5c8 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 10 Dec 2019 15:02:10 +0100
Subject: [PATCH] Added data-mainmap-height to allow for custom map heights
---
.../webapp/public/nordic_septoria_map/nordic_septoria_map.css | 2 +-
.../webapp/public/nordic_septoria_map/nordic_septoria_map.js | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/public/nordic_septoria_map/nordic_septoria_map.css b/src/main/webapp/public/nordic_septoria_map/nordic_septoria_map.css
index 14724354..c3e5c630 100644
--- a/src/main/webapp/public/nordic_septoria_map/nordic_septoria_map.css
+++ b/src/main/webapp/public/nordic_septoria_map/nordic_septoria_map.css
@@ -21,7 +21,7 @@ along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>.
Author : Tor-Einar Skog <tor-einar.skog@nibio.no>
Using CSS grid layout with fallback for MS browsers
*/
-#mainMap { grid-area: mainMap; height: 450px;}
+#mainMap { grid-area: mainMap; /*height: 450px;*/}
#subMap1 { grid-area: subMap1; height: 250px;}
#subMap2 { grid-area: subMap2; height: 250px;}
#subMap3 { grid-area: subMap3; height: 250px;}
diff --git a/src/main/webapp/public/nordic_septoria_map/nordic_septoria_map.js b/src/main/webapp/public/nordic_septoria_map/nordic_septoria_map.js
index 11870081..27b8ce96 100644
--- a/src/main/webapp/public/nordic_septoria_map/nordic_septoria_map.js
+++ b/src/main/webapp/public/nordic_septoria_map/nordic_septoria_map.js
@@ -54,6 +54,7 @@ var initMap = function ()
var nordicSeptoriaMapContainer = document.getElementById("nordicSeptoriaMapContainer");
// This is being used by dict, the translation tables
language = nordicSeptoriaMapContainer.getAttribute("data-language") !== null ? nordicSeptoriaMapContainer.getAttribute("data-language") : language;
+ var mainMapHeight = nordicSeptoriaMapContainer.getAttribute("data-mainmap-height") !== null ? nordicSeptoriaMapContainer.getAttribute("data-mainmap-height") : "450px";
// Giving the user the option to choose between the different views
var viewRadioList = "";
for (var i in views)
@@ -69,7 +70,7 @@ var initMap = function ()
}
// This HTML is injected into the hosting web page. It contains all of the
// maps and the controls
- nordicSeptoriaMapContainer.innerHTML = "<div id='mainMap'>"
+ nordicSeptoriaMapContainer.innerHTML = "<div id='mainMap' style='height: " + mainMapHeight + "'>"
+ " <div id='popupTooltip_mainMap' class='ol-popup'>"
+ " <span class='ol-popup-closer' onclick='closeOverlay(this);'></span>"
+ " <div></div>"
--
GitLab