From 2c6dcdf53f2bdc71ed417f6ded1195bf12b752af Mon Sep 17 00:00:00 2001 From: hamster1963 <1410514192@qq.com> Date: Tue, 26 Nov 2024 17:50:49 +0800 Subject: [PATCH] fix(global): use iso_a3_eh --- app/(main)/ClientComponents/Global.tsx | 12 ++++++------ app/(main)/ClientComponents/InteractiveMap.tsx | 6 ++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/(main)/ClientComponents/Global.tsx b/app/(main)/ClientComponents/Global.tsx index 1982db0..5fe711f 100644 --- a/app/(main)/ClientComponents/Global.tsx +++ b/app/(main)/ClientComponents/Global.tsx @@ -7,14 +7,14 @@ import { InteractiveMap } from "./InteractiveMap"; export default async function ServerGlobal() { const nezhaServerList = await GetNezhaData(); - const countrytList: string[] = []; + const countryList: string[] = []; const serverCounts: { [key: string]: number } = {}; nezhaServerList.result.forEach((server) => { if (server.host.CountryCode) { const countryCode = server.host.CountryCode.toUpperCase(); - if (!countrytList.includes(countryCode)) { - countrytList.push(countryCode); + if (!countryList.includes(countryCode)) { + countryList.push(countryCode); } serverCounts[countryCode] = (serverCounts[countryCode] || 0) + 1; } @@ -25,15 +25,15 @@ export default async function ServerGlobal() { const geoJson = JSON.parse(geoJsonString); const filteredFeatures = geoJson.features.filter( - (feature: any) => feature.properties.iso_a3 !== "", + (feature: any) => feature.properties.iso_a3_eh !== "", ); return (
- +
{filteredFeatures.map((feature, index) => { const isHighlighted = countries_alpha3.includes( - feature.properties.iso_a3, + feature.properties.iso_a3_eh, ); + const countryCode = Object.entries(countryCodeMapping).find( - ([, alpha3]) => alpha3 === feature.properties.iso_a3, + ([, alpha3]) => alpha3 === feature.properties.iso_a3_eh, )?.[0]; + const serverCount = countryCode ? serverCounts[countryCode] || 0 : 0;