--- a/src/citymap.js	Sat Jan 27 17:25:56 2024 +0200
+++ b/src/citymap.js	Sat Jan 27 17:26:10 2024 +0200
@@ -75,7 +75,7 @@
 
 
 // Update the tooltip box
-function mapUpdateTooltip(ev)
+function mapTooltipUpdate(ev)
 {
   var x = document.all ? (window.event.x + document.body.scrollLeft) : ev.pageX;
   var y = document.all ? (window.event.y + document.body.scrollTop)  : ev.pageY;
@@ -103,48 +103,9 @@
 }
 
 
-// Set or unset active element style
-function mapSetActive(eid, uset)
-{
-  mapSetStyle('maploc'+eid, "locactive", uset);
-  mapSetStyle('listloc'+eid, "locactive", uset);
-}
-
-
-// Hilite map and list elements of given id
-function qh(ev)
-{
-  var eid = ev.target.dataset.id;
-
-  if (mapTipPrev != null) mapSetActive(mapTipPrev, false);
-  mapSetActive(eid, true);
-  mapTipPrev = eid;
-}
-
-
-function qn(ev)
-{
-  if (mapTipPrev != null) mapSetActive(mapTipPrev, false);
-  mapTipPrev = null;
-  htt(ev);
-}
-
-
-function sttq(ev)
+function mapTooltipShow(ev)
 {
   const eid = ev.target.dataset.id;
-  qh(ev);
-  stt(ev);
-}
-
-
-// Show tooltip
-function stt(ev)
-{
-  const eid = ev.target.dataset.id;
-
-  htt(ev);
-
   mapTipItem = document.getElementById("tt"+ eid);
 
   mapTipItem.style.left    = mapTipXC + "px";
@@ -153,8 +114,7 @@
 }
 
 
-// Hide tooltip
-function htt(ev)
+function mapTooltipHide(ev)
 {
   if (mapTipItem)
   {
@@ -163,6 +123,42 @@
 }
 
 
+function mapSetActive(eid, uset)
+{
+  mapSetStyle('maploc'+eid, "locactive", uset);
+  mapSetStyle('listloc'+eid, "locactive", uset);
+}
+
+
+function mapLocationShow2(ev)
+{
+  const eid = ev.target.dataset.id;
+
+  if (mapTipPrev != null) mapSetActive(mapTipPrev, false);
+  mapSetActive(eid, true);
+  mapTipPrev = eid;
+}
+
+
+function mapLocationHide(ev)
+{
+  if (mapTipPrev != null) mapSetActive(mapTipPrev, false);
+  mapTipPrev = null;
+  mapTooltipHide(ev);
+}
+
+
+function mapLocationShow1(ev)
+{
+  const eid = ev.target.dataset.id;
+  mapLocationShow2(ev);
+
+  mapTooltipHide(ev);
+  mapTooltipShow(ev);
+  mapTooltipUpdate(ev);
+}
+
+
 function mapSetMapPosToID(eid)
 {
   const dim = mapGetWindowSize();
@@ -186,7 +182,7 @@
 }
 
 
-function mapElemClick(ev)
+function mapLocationClick(ev)
 {
   const eid = ev.target.dataset.id;
   console.log(eid);
@@ -216,7 +212,7 @@
 
 function mapDragMoveHandler(ev)
 {
-  mapUpdateTooltip(ev);
+  mapTooltipUpdate(ev);
   if (mapDragGoing)
   {
     const dx = ev.clientX - mapDragPos.mx;
@@ -228,7 +224,7 @@
 }
 
 
-function mapStartDragPan(ev)
+function mapDragStartPan(ev)
 {
   if (mapDragEnable)
   {
@@ -259,9 +255,9 @@
   for (let i = 0; i < elems.length; i++)
   {
     var elem = elems[i];
-    elem.addEventListener("mouseover", sttq);
-    elem.addEventListener("mouseout", qn);
-    elem.addEventListener("click", mapElemClick);
+    elem.addEventListener("mouseover", mapTooltipShow);
+    elem.addEventListener("mouseout", mapTooltipHide);
+    elem.addEventListener("click", mapLocationClick);
   }
 
   // .. and location list items
@@ -269,13 +265,13 @@
   for (let i = 0; i < elems.length; i++)
   {
     var elem = elems[i];
-    elem.addEventListener("mouseover", elem.dataset.info == "true" ? sttq : qh);
-    elem.addEventListener("mouseout", qn);
-    elem.addEventListener("click", mapElemClick);
+    elem.addEventListener("mouseover", elem.dataset.info == "true" ? mapLocationShow1 : mapLocationShow2);
+    elem.addEventListener("mouseout", mapLocationHide);
+    elem.addEventListener("click", mapLocationClick);
   }
 
   // And map navigation / tooltip stuff
-  mapElem.addEventListener("mousedown", mapStartDragPan);
+  mapElem.addEventListener("mousedown", mapDragStartPan);
   document.addEventListener("mousemove", mapDragMoveHandler);
   document.addEventListener("mouseup", mapDragUpHandler);