Skip to content

Commit 8052835

Browse files
elric-wamuguelric-wamugu
authored
Merge branch 'main' into feat/i18n-language-toggle
2 parents 89852d9 + c91ae75 commit 8052835

1 file changed

Lines changed: 6 additions & 38 deletions

File tree

‎index.html‎

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -99,24 +99,13 @@
9999
.ramp-vals span{flex:1;text-align:center}
100100
.ramp-vals span:first-child{text-align:left}
101101
.ramp-vals span:last-child{text-align:right}
102-
.legend-row{display:flex;align-items:center;gap:9px;margin-top:13px}
103-
.legend-row .lr-l{font-size:.78rem;color:var(--muted)}
104102
.size-key{display:flex;align-items:flex-end;gap:10px;margin:6px 0 2px}
105103
.size-key .sk{display:flex;flex-direction:column;align-items:center;gap:4px}
106104
.size-key .circ{border-radius:50%;border:1.5px solid rgba(255,255,255,.6)}
107105
.size-key .skl{font-family:'IBM Plex Mono';font-size:.6rem;color:var(--muted)}
108106
.ctx-key{display:flex;flex-direction:column;gap:5px;margin-top:4px}
109107
.ctx-key-row{display:flex;align-items:center;gap:7px;font-size:.72rem;color:var(--muted)}
110108
.ctx-dot{width:10px;height:10px;border-radius:50%;flex:0 0 auto;border:1.5px dashed rgba(255,255,255,.6)}
111-
.toggle{display:flex;align-items:center;gap:9px;margin-top:13px;cursor:pointer;user-select:none}
112-
.tg{width:38px;height:21px;border-radius:11px;background:var(--line);position:relative;transition:.18s;flex:0 0 auto}
113-
.tg::after{content:"";position:absolute;top:2.5px;left:2.5px;width:16px;height:16px;border-radius:50%;background:#7d93a8;transition:.18s}
114-
.toggle.on .tg{background:rgba(61,139,255,.4)}
115-
.toggle.on .tg::after{left:19.5px;background:var(--blue)}
116-
.toggle .tl{font-size:.8rem;color:var(--text)}
117-
.seg{display:inline-flex;border:1px solid var(--line);border-radius:5px;overflow:hidden}
118-
.seg button{font-family:'IBM Plex Mono';font-size:.68rem;padding:5px 11px;background:transparent;color:var(--muted);border:0;cursor:pointer}
119-
.seg button.active{background:var(--blue);color:#fff}
120109
.legend-src{font-size:.63rem;color:var(--dim);margin-top:11px;line-height:1.5;border-top:1px solid var(--line);padding-top:9px}
121110
/* donut in response panel */
122111
.donut-wrap{position:relative;height:100px;margin:12px 0 0}
@@ -223,7 +212,6 @@
223212
html[data-theme="light"] .dlbtn{color:var(--text);background:var(--panel-2)}
224213
html[data-theme="light"] .tabs button.active{color:var(--text)}
225214
html[data-theme="light"] .tb-btn:hover{color:var(--text)}
226-
html[data-theme="light"] .seg button.active{color:#fff}
227215
</style>
228216
</head>
229217
<body>
@@ -262,10 +250,6 @@ <h3 data-i18n="legend_title">Confirmed cases</h3>
262250
<div class="leg-section" data-i18n="legend_colour">Colour · case intensity</div>
263251
<div class="ramp"><i style="background:var(--r1)"></i><i style="background:var(--r2)"></i><i style="background:var(--r3)"></i><i style="background:var(--r4)"></i><i style="background:var(--r5)"></i><i style="background:var(--r6)"></i></div>
264252
<div class="ramp-vals"><span>33</span><span>80</span><span>130</span><span>185</span></div>
265-
<div class="legend-row" style="margin-top:7px">
266-
<span class="lr-l" data-i18n="legend_scale">Scale</span>
267-
<span class="seg"><button id="scLog" class="active" data-i18n="seg_log">log</button><button id="scLin" data-i18n="seg_linear">linear</button></span>
268-
</div>
269253

270254
<div class="leg-section" data-i18n="legend_size">Size · confirmed cases</div>
271255
<div class="size-key">
@@ -283,9 +267,7 @@ <h3 data-i18n="legend_title">Confirmed cases</h3>
283267
</div>
284268
</div>
285269

286-
<div class="toggle on" id="tgMarkers"><span class="tg"></span><span class="tl" data-i18n="legend_show_markers">Show case markers</span></div>
287-
288-
<div class="leg-section" data-i18n="legend_context">Context markers</div>
270+
<div class="leg-section">Context markers</div>
289271
<div class="ctx-key">
290272
<div class="ctx-key-row"><span class="ctx-dot" style="background:rgba(43,179,163,.35);border-color:#2bb3a3"></span><span data-i18n="legend_ctx_drc">DRC province (cases not disaggregated)</span></div>
291273
<div class="ctx-key-row"><span class="ctx-dot" style="background:rgba(61,139,255,.3);border-color:#3d8bff"></span><span data-i18n="legend_ctx_uga">Uganda · Kampala metro (19 confirmed)</span></div>
@@ -375,6 +357,10 @@ <h4 data-i18n="md_h_method">Method</h4>
375357
<li data-i18n-html="md_method_3">North Kivu (9 affected health zones) and South Kivu (1) are shown as <strong>context markers</strong> — DON607 does not disaggregate their case counts. 94 DRC cases were awaiting health-zone distribution at the time of reporting.</li>
376358
<li data-i18n-html="md_method_4">Marker coordinates are <strong>approximate health-zone centroids</strong> for visual placement, not official boundaries.</li>
377359
<li data-i18n-html="md_method_5">The trend chart uses cumulative confirmed counts from successive WHO DONs (21 May, 8 June, 10 June).</li>
360+
<li>The map is a <strong>proportional-symbol layer</strong>: each circle is an Ituri health zone with WHO-published confirmed case counts (Bunia 185, Rwampara 137, Mongbwalu 132, Nyankunde 33). Circle <em>area</em> is proportional to cases; <em>color</em> follows a sequential red ramp.</li>
361+
<li>North Kivu (9 affected health zones) and South Kivu (1) are shown as <strong>context markers</strong> — DON607 does not disaggregate their case counts. 94 DRC cases were awaiting health-zone distribution at the time of reporting.</li>
362+
<li>Marker coordinates are <strong>approximate health-zone centroids</strong> for visual placement, not official boundaries.</li>
363+
<li>The trend chart uses cumulative confirmed counts from successive WHO DONs (21 May, 8 June, 10 June).</li>
378364
</ul>
379365

380366
<h4 data-i18n="md_h_figures">WHO figures (view / download at source)</h4>
@@ -705,14 +691,11 @@ <h4 data-i18n="terms_h_sensitive">Sensitive context</h4>
705691
darkTile.addTo(map);
706692

707693
const RAMP=['#fee5d9','#fcae91','#fb6a4a','#de2d26','#a50f15','#67000d'];
708-
let useLog=true, showMarkers=true;
709694
const maxCases=Math.max(...HZ.map(d=>d.cases));
710695
const minCases=Math.min(...HZ.map(d=>d.cases));
711696

712697
function colorFor(c){
713-
let t;
714-
if(useLog){t=(Math.log(c)-Math.log(minCases))/(Math.log(maxCases)-Math.log(minCases));}
715-
else{t=(c-minCases)/(maxCases-minCases);}
698+
const t=(c-minCases)/(maxCases-minCases);
716699
const idx=Math.min(RAMP.length-1,Math.max(0,Math.round(t*(RAMP.length-1))));
717700
return RAMP[idx];
718701
}
@@ -752,7 +735,6 @@ <h4 data-i18n="terms_h_sensitive">Sensitive context</h4>
752735

753736
function drawHZ(){
754737
hzLayer.clearLayers();
755-
if(!showMarkers)return;
756738
HZ.forEach(d=>{
757739
const m=L.marker([d.lat,d.lng],{icon:makeHZIcon(d)});
758740
m.bindTooltip(`<b>${d.name}</b> · ${provName(d.prov)}<br><span class="n">${d.cases}</span> ${I18N[lang].tip_confirmed_cases}`,{className:'hz-tip',sticky:true,direction:'top'});
@@ -824,20 +806,6 @@ <h4 data-i18n="terms_h_sensitive">Sensitive context</h4>
824806
if(!noPan)map.panTo([d.lat,d.lng],{animate:true});
825807
}
826808

827-
/* ============ LEGEND CONTROLS ============ */
828-
function setScale(log){
829-
useLog=log;
830-
$('#scLog').classList.toggle('active',log);
831-
$('#scLin').classList.toggle('active',!log);
832-
drawHZ();
833-
}
834-
$('#scLog').addEventListener('click',()=>setScale(true));
835-
$('#scLin').addEventListener('click',()=>setScale(false));
836-
$('#tgMarkers').addEventListener('click',function(){
837-
showMarkers=!showMarkers;this.classList.toggle('on',showMarkers);
838-
drawHZ();
839-
});
840-
841809
/* collapse panels */
842810
document.querySelectorAll('[data-toggle]').forEach(h=>{
843811
h.addEventListener('click',()=>h.closest('.panel').classList.toggle('collapsed'));

0 commit comments

Comments
 (0)