From e4e50cc771c7c4bc0a51dbee36452159263cbe36 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Mon, 14 Apr 2025 10:42:26 -0400
Subject: [PATCH] Map: Draw larger circles before smaller ones,

so the tooltips for the smaller ones are visible
---
 .../java/src/net/i2p/router/web/helpers/MapMaker.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/MapMaker.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/MapMaker.java
index 5ba95b749..61bb52444 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/MapMaker.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/MapMaker.java
@@ -8,6 +8,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -203,11 +204,14 @@ public class MapMaker {
             g.drawText("TEST MODE", 25, 825, TEXT_COLOR, large, null, hints);
 
         if ((mode & (MODE_ROUTERS | MODE_FF | MODE_TEST)) != 0) {
-            Set<String> cset;
+            Collection<String> cset;
             if (test) {
                 cset = _context.commSystem().getCountries().keySet();
             } else {
-                cset = countries.objects();
+                // we draw larger circles first, so smaller ones are on top
+                // and tooltips will be visible, at least at first.
+                // XHR will thwart this later.
+                cset = countries.sortedObjects();
             }
             for (String c : cset) {
                 Mercator m = _mercator.get(c);