Daniel/usa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修复常见问题，用于更新

Browse Source
This commit is contained in:
Daniel
2026-03-06 10:43:50 +08:00
parent 9f2442f2e3
commit b7ff505dea
3 changed files with 27 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
run.sh
View File

@@ -1,3 +1,6 @@
#!/usr/bin/env bash
cd /www/wwwroot/www.airtep.com2/usa
git fetch origin && git reset --hard origin/master && npm run build && pm2 restart 4
# 同步更新爬虫 Docker 容器（使用最新代码重新构建镜像并重启）
docker build -t usa-dashboard-crawler:latest -f Dockerfile.crawler . && ./scripts/run-crawler-docker-standalone.sh

54
src/components/WarMap.tsx
View File

@@ -1761,38 +1761,7 @@ export function WarMap() {
/>
</Source>
{/* 苏丹武装势力范围（支持伊朗，伊朗色标轮廓） */}
<Source
id="sudan-area"
type="geojson"
data={EXTENDED_WAR_ZONES.sudanZone}
>
<Layer
id="sudan-fill"
type="fill"
paint={{
'fill-color': 'rgba(239, 68, 68, 0.2)',
'fill-outline-color': 'transparent',
'fill-opacity': 0.4,
}}
/>
</Source>
{/* 苏丹国境线（独立线图层，伊朗红） */}
<Source
id="sudan-border"
type="geojson"
data={EXTENDED_WAR_ZONES.sudanBorderLine}
>
<Layer
id="sudan-border-line"
type="line"
paint={{
'line-color': '#EF4444',
'line-width': 2,
'line-opacity': 1,
}}
/>
</Source>
{/* 苏丹：使用 Mapbox/countries 源绘制国境线（伊朗色标） */}
<Source
id="sudan-label"
type="geojson"
@@ -1933,6 +1902,27 @@ export function WarMap() {
'line-opacity': 0.8,
}}
/>
{/* 苏丹区域填充 + 国境线（Mapbox/countries 源，伊朗色） */}
<Layer
id="sudan-fill"
type="fill"
filter={['==', ['get', 'ADMIN'], 'Sudan']}
paint={{
'fill-color': 'rgba(239, 68, 68, 0.2)',
'fill-outline-color': 'transparent',
'fill-opacity': 0.4,
}}
/>
<Layer
id="sudan-outline"
type="line"
filter={['==', ['get', 'ADMIN'], 'Sudan']}
paint={{
'line-color': '#EF4444',
'line-width': 2,
'line-opacity': 1,
}}
/>
</Source>
{/* 霍尔木兹海峡交战区 - 金黄色 mesh 区域 */}

69
src/data/extendedWarData.ts
View File

@@ -91,76 +91,9 @@ export const EXTENDED_WAR_ZONES = {
// 真主党区域标注点（用于显示文字）
hezbollahLabelCenter: [35.7, 33.7] as [number, number],
// 苏丹武装势力范围（公开支持伊朗，轮廓用伊朗色标绘制整个苏丹国家）
sudanZone: {
type: 'Feature' as const,
properties: {
name: '苏丹武装',
status: 'IRAN-ALIGNED',
color: '#EF4444',
},
geometry: {
type: 'Polygon' as const,
coordinates: [
[
[31.0, 22.0],
[33.0, 22.0],
[34.5, 22.0],
[36.8, 22.0],
[37.3, 20.8],
[38.5, 18.0],
[37.9, 17.0],
[36.5, 14.3],
[35.0, 13.5],
[34.0, 11.5],
[32.5, 12.0],
[29.5, 9.5],
[27.0, 9.0],
[24.0, 8.5],
[23.5, 10.0],
[22.5, 13.5],
[22.5, 16.0],
[24.0, 20.0],
[25.0, 22.0],
[31.0, 22.0],
],
],
},
},
/** 苏丹武装标注点（地图上「苏丹武装」文字位置；国境由 countries 源 filter Sudan 绘制） */
sudanLabelCenter: [30.5, 15.25] as [number, number],
/** 苏丹国境线（与 sudanZone 同轮廓，LineString 供线图层绘制） */
sudanBorderLine: {
type: 'Feature' as const,
properties: { name: '苏丹国境线' },
geometry: {
type: 'LineString' as const,
coordinates: [
[31.0, 22.0],
[33.0, 22.0],
[34.5, 22.0],
[36.8, 22.0],
[37.3, 20.8],
[38.5, 18.0],
[37.9, 17.0],
[36.5, 14.3],
[35.0, 13.5],
[34.0, 11.5],
[32.5, 12.0],
[29.5, 9.5],
[27.0, 9.0],
[24.0, 8.5],
[23.5, 10.0],
[22.5, 13.5],
[22.5, 16.0],
[24.0, 20.0],
[25.0, 22.0],
[31.0, 22.0],
],
},
},
// 库尔德武装势力区域标注点（叙/土/伊三区紫色带中心附近）
kurdishLabelCenter: [43.5, 36.3] as [number, number],