From 2ee77d666bc52a2b5d73789300164210aa019159 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 6 Mar 2026 17:59:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=B7=B3=E8=BD=ACbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crawler/__pycache__/db_merge.cpython-39.pyc | Bin 0 -> 12670 bytes src/components/WarMap.tsx | 39 +++++--------------- 2 files changed, 9 insertions(+), 30 deletions(-) create mode 100644 crawler/__pycache__/db_merge.cpython-39.pyc diff --git a/crawler/__pycache__/db_merge.cpython-39.pyc b/crawler/__pycache__/db_merge.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..42746a7fb476b889104aac2a07133f0fd5fe4464 GIT binary patch literal 12670 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 a8E6&PW2SmR!JPVozk%j2W<{{= 0) { - const tgt = paths[0][paths[0].length - 1] - const padLine = 1.2 - return [ - Math.min(src[0], tgt[0]) - padLine, - Math.min(src[1], tgt[1]) - padLine, - Math.max(src[0], tgt[0]) + padLine, - Math.max(src[1], tgt[1]) + padLine, - ] - } + case 'virginia_srilanka': + if (sourceCoords.virginia_srilanka) push(sourceCoords.virginia_srilanka) + flattenPaths(virginiaSrilankaPaths) break - } case 'tomahawk_arabian': { const src = sourceCoords.tomahawk_arabian ?? sourceCoords.arabian_sea_sub_torpedo - const paths = [...effectiveTomahawkArabianPathsDisplay, ...effectiveArabianSubTorpedoPathsDisplay] - if (src && paths.length > 0) { - const allCoords = paths.flatMap((p) => p) - const lngs = allCoords.map((c) => c[0]) - const lats = allCoords.map((c) => c[1]) - const padLine = 1.2 - return [ - Math.min(...lngs) - padLine, - Math.min(...lats) - padLine, - Math.max(...lngs) + padLine, - Math.max(...lats) + padLine, - ] - } + if (src) push(src) + flattenPaths(tomahawkArabianPaths) + flattenPaths(arabianSubTorpedoPaths) break } case 'hezbollah': @@ -755,9 +734,9 @@ export function WarMap() { lincolnPathsAll, fordPathsAll, israelPathsAll, - effectiveVirginiaSrilankaPathsDisplay, - effectiveTomahawkArabianPathsDisplay, - effectiveArabianSubTorpedoPathsDisplay, + virginiaSrilankaPaths, + tomahawkArabianPaths, + arabianSubTorpedoPaths, hezbollahPaths, attackPathsAll, ]