world map

Author: michielkallenberg

cybench/runs/analysis/model_family_radar_lib.py

@@ -775,12 +775,22 @@ def build_radar_payload(
         by_horizon[hz] = by_crop
 
     crops = sorted({str(c) for c in df["crop"].dropna().unique()}) if "crop" in df.columns else []
+    benchmark_map_isos = (
+        sorted({map_iso_for_cybencH(str(c)) for c in df["country"].dropna().unique()})
+        if "country" in df.columns
+        else []
+    )
     return {
         "output_root": str(output_root.resolve()),
         "n_summary_files": len(paths),
         "n_rows": int(len(df)),
         "n_countries": int(df["country"].nunique()) if "country" in df.columns else 0,
         "countries": sorted(df["country"].unique()) if "country" in df.columns else [],
+        "benchmark_map_isos": benchmark_map_isos,
+        "map_coverage_note": (
+            "Only CY-Bench countries are colored; all other land is neutral gray. "
+            "ISO country polygons are used as-is (e.g. the United States outline includes Alaska)."
+        ),
         "crops": crops,
         "views": list(EVALUATION_VIEWS),
         "family_catalog": {

cybench/runs/viz/model_family_radar_template.html

@@ -257,6 +257,7 @@ <h2>World map</h2>
         <div class="toolbar" id="winner-aspect-toolbar"></div>
       </div>
       <p class="muted" id="map-mode-note">Colors show which model family wins in each country for the selected evaluation aspect.</p>
+      <p class="muted" id="map-coverage-note"></p>
       <div class="world-map-wrap" id="winner-map-wrap"><p class="muted">Loading map…</p></div>
       <div class="winner-legend" id="winner-legend"></div>
       <div class="benefit-legend" id="benefit-legend" style="display:none;">
@@ -290,6 +291,24 @@ <h2>World map</h2>
     const benefitLegend = document.getElementById("benefit-legend");
     const benefitLegendLabel = document.getElementById("benefit-legend-label");
     const winnerSummary = document.getElementById("winner-summary");
+    const mapCoverageNote = document.getElementById("map-coverage-note");
+
+    const MAP_FILL_OUTSIDE = "#e8eaed";
+    const MAP_FILL_NO_DATA = "#f5f5f5";
+    const benchmarkIsos = new Set(DATA.benchmark_map_isos || []);
+    if (mapCoverageNote) {
+      mapCoverageNote.textContent = DATA.map_coverage_note || (
+        "Only CY-Bench countries are colored; other land is neutral gray."
+      );
+    }
+
+    function isBenchmarkIso(iso) {
+      return benchmarkIsos.has(iso);
+    }
+
+    function mapBaseFill(iso) {
+      return isBenchmarkIso(iso) ? MAP_FILL_NO_DATA : MAP_FILL_OUTSIDE;
+    }
 
     let radarMode = "relative";
     let mapMode = "winner";
@@ -759,19 +778,25 @@ <h2>World map</h2>
         .attr("class", "country")
         .attr("d", mapPath)
         .attr("fill", d => {
-          const rec = winners.get(d.properties.ISO_A2);
-          if (!rec) return "#f0f0f0";
+          const iso = d.properties.ISO_A2;
+          if (!isBenchmarkIso(iso)) return MAP_FILL_OUTSIDE;
+          const rec = winners.get(iso);
+          if (!rec) return MAP_FILL_NO_DATA;
           return colors[rec.winner_family] || "#999";
         })
-        .attr("stroke", null)
-        .attr("stroke-width", null);
+        .attr("stroke", d => isBenchmarkIso(d.properties.ISO_A2) ? "#fff" : "#d0d7de")
+        .attr("stroke-width", d => isBenchmarkIso(d.properties.ISO_A2) ? 0.5 : 0.25);
 
       countriesSel.selectAll("title")
         .data(d => [d])
         .join("title")
         .text(d => {
-          const rec = winners.get(d.properties.ISO_A2);
-          if (!rec) return `${d.properties.NAME || d.properties.ISO_A2}: no data`;
+          const iso = d.properties.ISO_A2;
+          if (!isBenchmarkIso(iso)) {
+            return `${d.properties.NAME || iso}: not in CY-Bench`;
+          }
+          const rec = winners.get(iso);
+          if (!rec) return `${d.properties.NAME || iso}: no data for this horizon/crop`;
           return `${rec.country}: ${rec.winner_family} (${rec.winner_model}), ${byAspect.metric}=${rec.value.toFixed(3)}`;
         });
 
@@ -800,26 +825,36 @@ <h2>World map</h2>
         .attr("class", "country")
         .attr("d", mapPath)
         .attr("fill", d => {
-          const rec = byCountry.get(d.properties.ISO_A2);
-          if (!rec || rec.benefit_pct == null) return "#f0f0f0";
+          const iso = d.properties.ISO_A2;
+          if (!isBenchmarkIso(iso)) return MAP_FILL_OUTSIDE;
+          const rec = byCountry.get(iso);
+          if (!rec || rec.benefit_pct == null) return MAP_FILL_NO_DATA;
           return benefitColor(rec.benefit_pct, extent);
         })
         .attr("stroke", d => {
-          const rec = byCountry.get(d.properties.ISO_A2);
-          if (!rec || !benefitOffScale(rec.benefit_pct, extent)) return null;
-          return "#1f2328";
+          const iso = d.properties.ISO_A2;
+          if (!isBenchmarkIso(iso)) return "#d0d7de";
+          const rec = byCountry.get(iso);
+          if (rec && benefitOffScale(rec.benefit_pct, extent)) return "#1f2328";
+          return "#fff";
         })
         .attr("stroke-width", d => {
-          const rec = byCountry.get(d.properties.ISO_A2);
-          return rec && benefitOffScale(rec.benefit_pct, extent) ? 1.1 : null;
+          const iso = d.properties.ISO_A2;
+          if (!isBenchmarkIso(iso)) return 0.25;
+          const rec = byCountry.get(iso);
+          return rec && benefitOffScale(rec.benefit_pct, extent) ? 1.1 : 0.5;
         });
 
       countriesSel.selectAll("title")
         .data(d => [d])
         .join("title")
         .text(d => {
-          const rec = byCountry.get(d.properties.ISO_A2);
-          if (!rec) return `${d.properties.NAME || d.properties.ISO_A2}: no data`;
+          const iso = d.properties.ISO_A2;
+          if (!isBenchmarkIso(iso)) {
+            return `${d.properties.NAME || iso}: not in CY-Bench`;
+          }
+          const rec = byCountry.get(iso);
+          if (!rec) return `${d.properties.NAME || iso}: no data for this horizon/crop`;
           const offScale = benefitOffScale(rec.benefit_pct, extent)
             ? ` (color saturated; scale ±${extent}%)`
             : "";

tests/runs/test_model_family_radar.py

@@ -258,6 +258,8 @@ def test_build_radar_payload_structure(tmp_path: Path):
     assert RADAR_ABSOLUTE_NOTE in payload["absolute_note"]
     assert payload["radar_scales"]["absolute"]["Overall"]["lo"] == 0.1
     assert "sample_scatter" in payload
+    assert "benchmark_map_isos" in payload
+    assert "DE" in payload["benchmark_map_isos"]
     assert "winner_maps" in payload
     assert "ai_benefit_maps" in payload
     assert "all" in payload["winner_maps"]["eos"]