diff --git a/crawler/__pycache__/db_merge.cpython-39.pyc b/crawler/__pycache__/db_merge.cpython-39.pyc new file mode 100644 index 0000000..42746a7 Binary files /dev/null and b/crawler/__pycache__/db_merge.cpython-39.pyc differ diff --git a/src/components/WarMap.tsx b/src/components/WarMap.tsx index 3d2db1d..0ac0088 100644 --- a/src/components/WarMap.tsx +++ b/src/components/WarMap.tsx @@ -673,36 +673,15 @@ export function WarMap() { if (sourceCoords.israel) push(sourceCoords.israel) flattenPaths(israelPathsAll) break - case 'virginia_srilanka': { - const src = sourceCoords.virginia_srilanka - const paths = effectiveVirginiaSrilankaPathsDisplay - if (src && paths.length > 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, ]