diff --git a/src/components/GlobeMap.ts b/src/components/GlobeMap.ts index b7c1ca927..7a59bee7f 100644 --- a/src/components/GlobeMap.ts +++ b/src/components/GlobeMap.ts @@ -31,9 +31,10 @@ import { getCountryBbox, getCountriesGeoJson, getCountryAtCoordinates, getCountr import { escapeHtml } from '@/utils/sanitize'; import { showLayerWarning } from '@/utils/layer-warning'; import type { FeatureCollection, Geometry } from 'geojson'; -import type { MapLayers, Hotspot, MilitaryFlight, MilitaryVessel, NaturalEvent, InternetOutage, CyberThreat, SocialUnrestEvent, UcdpGeoEvent, MilitaryBase, GammaIrradiator, Spaceport, EconomicCenter, StrategicWaterway, CriticalMineralProject, AIDataCenter, UnderseaCable, Pipeline, CableAdvisory, RepairShip, AisDisruptionEvent, AisDensityZone, AisDisruptionType } from '@/types'; +import type { MapLayers, Hotspot, MilitaryFlight, MilitaryVessel, MilitaryVesselCluster, NaturalEvent, InternetOutage, CyberThreat, SocialUnrestEvent, UcdpGeoEvent, MilitaryBase, GammaIrradiator, Spaceport, EconomicCenter, StrategicWaterway, CriticalMineralProject, AIDataCenter, UnderseaCable, Pipeline, CableAdvisory, RepairShip, AisDisruptionEvent, AisDensityZone, AisDisruptionType } from '@/types'; import type { Earthquake } from '@/services/earthquakes'; import type { AirportDelayAlert } from '@/services/aviation'; +import { MapPopup } from './MapPopup'; import type { MapContainerState, MapView, TimeRange } from './MapContainer'; import type { CountryClickPayload } from './DeckGLMap'; import type { WeatherAlert } from '@/services/weather'; @@ -80,7 +81,27 @@ interface VesselMarker extends BaseMarker { _kind: 'vessel'; id: string; name: string; - type: string; + type: string; // raw enum key: 'carrier'|'destroyer' etc — color/icon lookup + typeLabel: string; // human-readable: 'Aircraft Carrier' etc — display only + hullNumber?: string; + operator?: string; + operatorCountry?: string; + isDark?: boolean; + usniStrikeGroup?: string; + usniRegion?: string; + usniDeploymentStatus?: string; + usniHomePort?: string; + usniActivityDescription?: string; + usniArticleDate?: string; + usniSource?: boolean; +} +interface ClusterMarker extends BaseMarker { + _kind: 'cluster'; + id: string; + name: string; + vesselCount: number; + activityType?: string; + region?: string; } interface WeatherMarker extends BaseMarker { _kind: 'weather'; @@ -339,7 +360,7 @@ interface GlobePolygon { previewUrl?: string; } type GlobeMarker = - | ConflictMarker | HotspotMarker | FlightMarker | VesselMarker + | ConflictMarker | HotspotMarker | FlightMarker | VesselMarker | ClusterMarker | WeatherMarker | NaturalMarker | IranMarker | OutageMarker | CyberMarker | FireMarker | ProtestMarker | UcdpMarker | DisplacementMarker | ClimateMarker | GpsJamMarker | TechMarker @@ -396,6 +417,10 @@ export class GlobeMap { private hotspots: HotspotMarker[] = []; private flights: FlightMarker[] = []; private vessels: VesselMarker[] = []; + private vesselData: Map = new Map(); + private clusterMarkers: ClusterMarker[] = []; + private clusterData: Map = new Map(); + private popup: MapPopup | null = null; private weatherMarkers: WeatherMarker[] = []; private naturalMarkers: NaturalMarker[] = []; private iranMarkers: IranMarker[] = []; @@ -477,6 +502,7 @@ export class GlobeMap { constructor(container: HTMLElement, initialState: MapContainerState) { this.container = container; + this.popup = new MapPopup(this.container); this.layers = { ...initialState.layers }; this.timeRange = initialState.timeRange; this.currentView = initialState.view; @@ -644,7 +670,7 @@ export class GlobeMap { const m = d as GlobeMarker; if (m._kind === 'satFootprint') return 0; if (m._kind === 'satellite') return (m as SatelliteMarker).alt / 6371; - if (m._kind === 'flight' || m._kind === 'vessel') return 0.012; + if (m._kind === 'flight' || m._kind === 'vessel' || m._kind === 'cluster') return 0.012; if (m._kind === 'hotspot') return 0.005; return 0.003; }) @@ -883,25 +909,42 @@ export class GlobeMap { el.title = d.name; } else if (d._kind === 'flight') { const heading = d.heading ?? 0; - const typeColors: Record = { - fighter: '#ff4444', bomber: '#ff8800', recon: '#44aaff', - tanker: '#88ff44', transport: '#aaaaff', helicopter: '#ffff44', - drone: '#ff44ff', maritime: '#44ffff', - }; - const color = typeColors[d.type] ?? '#cccccc'; + const color = GlobeMap.FLIGHT_TYPE_COLORS[d.type] ?? '#cccccc'; el.innerHTML = GlobeMap.wrapHit(`
✈
`); el.title = `${d.callsign} (${d.type})`; } else if (d._kind === 'vessel') { - const typeColors: Record = { - carrier: '#ff4444', destroyer: '#ff8800', submarine: '#8844ff', - frigate: '#44aaff', amphibious: '#88ff44', support: '#aaaaaa', - }; - const c = typeColors[d.type] ?? '#44aaff'; - el.innerHTML = GlobeMap.wrapHit(`
⛴
`); - el.title = `${d.name} (${d.type})`; + const c = GlobeMap.VESSEL_TYPE_COLORS[d.type] ?? '#44aaff'; + const icon = GlobeMap.VESSEL_TYPE_ICONS[d.type] ?? '\u26f4'; + const isCarrier = d.type === 'carrier'; + const sz = isCarrier ? 15 : 10; + const glow = isCarrier ? `0 0 10px 4px ${c}bb` : `0 0 4px ${c}88`; + const darkRing = d.isDark + ? `
` + : ''; + const usniRing = d.usniSource + ? `
` + : ''; + el.innerHTML = GlobeMap.wrapHit( + `
` + + darkRing + + usniRing + + `
${icon}
` + + `
` + ); + el.title = `${d.name}${d.hullNumber ? ` (${d.hullNumber})` : ''} \u00b7 ${d.typeLabel} \u00b7 ${d.usniSource ? 'EST. POSITION' : 'AIS LIVE'}`; + } else if (d._kind === 'cluster') { + const cc = GlobeMap.CLUSTER_ACTIVITY_COLORS[d.activityType ?? 'unknown'] ?? '#6688aa'; + const sz = Math.max(14, Math.min(26, 12 + d.vesselCount * 2)); + el.innerHTML = GlobeMap.wrapHit( + `
` + + `
` + + `${d.vesselCount}` + + `
` + ); + el.title = `${d.name} \u00b7 ${d.vesselCount} vessel${d.vesselCount !== 1 ? 's' : ''}`; } else if (d._kind === 'weather') { const severityColors: Record = { Extreme: '#ff0044', Severe: '#ff6600', Moderate: '#ffaa00', Minor: '#88aaff', @@ -1098,6 +1141,33 @@ export class GlobeMap { escalationScore: d.escalationScore as Hotspot['escalationScore'], }); } + + if (d._kind === 'vessel' && this.popup) { + const vessel = this.vesselData.get(d.id); + if (vessel) { + const aRect = anchor.getBoundingClientRect(); + const cRect = this.container.getBoundingClientRect(); + const x = aRect.left - cRect.left + aRect.width / 2; + const y = aRect.top - cRect.top; + this.hideTooltip(); + this.popup.show({ type: 'militaryVessel', data: vessel, x, y }); + return; + } + } + + if (d._kind === 'cluster' && this.popup) { + const cluster = this.clusterData.get(d.id); + if (cluster) { + const aRect = anchor.getBoundingClientRect(); + const cRect = this.container.getBoundingClientRect(); + const x = aRect.left - cRect.left + aRect.width / 2; + const y = aRect.top - cRect.top; + this.hideTooltip(); + this.popup.show({ type: 'militaryVesselCluster', data: cluster, x, y }); + return; + } + } + this.showMarkerTooltip(d, anchor); } @@ -1134,7 +1204,44 @@ export class GlobeMap { } else if (d._kind === 'flight') { html = `✈ ${esc(d.callsign)}
${esc(d.type)}`; } else if (d._kind === 'vessel') { - html = `⛴ ${esc(d.name)}
${esc(d.type)}`; + const deployStatus = d.usniDeploymentStatus && d.usniDeploymentStatus !== 'unknown' + ? ` [${esc(d.usniDeploymentStatus.toUpperCase().replace('-', ' '))}]` + : ''; + const darkWarning = d.isDark + ? `
⚠ AIS DARK` + : ''; + const operatorLine = d.operatorCountry || d.operator + ? `
${esc(d.operatorCountry || d.operator || '')}` + : ''; + const hullLine = d.hullNumber + ? ` (${esc(d.hullNumber)})` + : ''; + const articleDate = d.usniArticleDate + ? ` · ${new Date(d.usniArticleDate).toLocaleDateString()}` + : ''; + const inPort = d.usniDeploymentStatus === 'in-port'; + const portLine = inPort && d.usniHomePort + ? `
🏠 ${esc(d.usniHomePort)}` + : ''; + html = `⛴ ${esc(d.name)}${hullLine}${deployStatus}` + + darkWarning + + `
${esc(d.typeLabel)}` + + operatorLine + + portLine + + (!inPort && d.usniStrikeGroup ? `
⚓ ${esc(d.usniStrikeGroup)}` : '') + + (d.usniRegion ? `
${esc(d.usniRegion)}` : '') + + (d.usniActivityDescription ? `
${esc(d.usniActivityDescription.slice(0, 120))}` : '') + + (d.usniSource + ? `
⚠ EST. POSITION — ${inPort ? 'In-port' : 'Approx.'} via USNI${articleDate}` + : `
● AIS LIVE`); + } else if (d._kind === 'cluster') { + const cc = GlobeMap.CLUSTER_ACTIVITY_COLORS[d.activityType ?? 'unknown'] ?? '#6688aa'; + const actLabel = d.activityType && d.activityType !== 'unknown' + ? d.activityType.charAt(0).toUpperCase() + d.activityType.slice(1) : ''; + html = `⚓ ${esc(d.name)}` + + `
${d.vesselCount} vessel${d.vesselCount !== 1 ? 's' : ''}` + + (actLabel ? `
Activity: ${esc(actLabel)}` : '') + + (d.region ? `
${esc(d.region)}` : ''); } else if (d._kind === 'weather') { const wc = d.severity === 'Extreme' ? '#ff0044' : d.severity === 'Severe' ? '#ff6600' : '#88aaff'; html = `⚡ ${esc(d.severity)}` + @@ -1327,6 +1434,7 @@ export class GlobeMap { if (this.tooltipHideTimer) { clearTimeout(this.tooltipHideTimer); this.tooltipHideTimer = null; } this.tooltipEl?.remove(); this.tooltipEl = null; + this.popup?.hide(); } // ─── Overlay UI: zoom controls & layer panel ───────────────────────────── @@ -1476,6 +1584,7 @@ export class GlobeMap { if (this.layers.military) { markers.push(...this.flights); markers.push(...this.vessels); + markers.push(...this.clusterMarkers); } if (this.layers.weather) markers.push(...this.weatherMarkers); if (this.layers.natural) { @@ -1767,14 +1876,91 @@ export class GlobeMap { this.flushMarkers(); } - public setMilitaryVessels(vessels: MilitaryVessel[]): void { + private static readonly FLIGHT_TYPE_COLORS: Record = { + fighter: '#ff4444', bomber: '#ff8800', recon: '#44aaff', + tanker: '#88ff44', transport: '#aaaaff', helicopter: '#ffff44', + drone: '#ff44ff', maritime: '#44ffff', + }; + + private static readonly VESSEL_TYPE_COLORS: Record = { + carrier: '#ff4444', + destroyer: '#ff8800', + frigate: '#ffcc00', + submarine: '#8844ff', + amphibious: '#44cc88', + patrol: '#44aaff', + auxiliary: '#aaaaaa', + research: '#44ffff', + icebreaker: '#88ccff', + special: '#ff44ff', + }; + + private static readonly VESSEL_TYPE_ICONS: Record = { + carrier: '\u26f4', + destroyer: '\u25b2', + frigate: '\u25b2', + submarine: '\u25c6', + amphibious: '\u2b21', + patrol: '\u25b6', + auxiliary: '\u25cf', + research: '\u25ce', + icebreaker: '\u2745', + special: '\u2605', + }; + + private static readonly CLUSTER_ACTIVITY_COLORS: Record = { + deployment: '#ff4444', exercise: '#ff8800', transit: '#ffcc00', unknown: '#6688aa', + }; + + private static readonly VESSEL_TYPE_LABELS: Record = { + carrier: 'Aircraft Carrier', + destroyer: 'Destroyer', + frigate: 'Frigate', + submarine: 'Submarine', + amphibious: 'Amphibious', + patrol: 'Patrol', + auxiliary: 'Auxiliary', + research: 'Research', + icebreaker: 'Icebreaker', + special: 'Special Mission', + unknown: 'Unknown', + }; + + public setMilitaryVessels(vessels: MilitaryVessel[], clusters: MilitaryVesselCluster[] = []): void { + this.vesselData.clear(); + for (const v of vessels) this.vesselData.set(v.id, v); + this.clusterData.clear(); + for (const c of clusters) this.clusterData.set(c.id, c); + this.vessels = vessels.map(v => ({ _kind: 'vessel' as const, _lat: v.lat, _lng: v.lon, id: v.id, - name: (v as any).name ?? 'vessel', - type: (v as any).vesselType ?? 'destroyer', + name: v.name ?? 'vessel', + type: v.vesselType, // raw enum — color/icon key + typeLabel: GlobeMap.VESSEL_TYPE_LABELS[v.vesselType] ?? v.vesselType, // display string + hullNumber: v.hullNumber, + operator: v.operator !== 'other' ? v.operator : undefined, + operatorCountry: v.operatorCountry, + isDark: v.isDark, + usniStrikeGroup: v.usniStrikeGroup, + usniRegion: v.usniRegion, + usniDeploymentStatus: v.usniDeploymentStatus, + usniHomePort: v.usniHomePort, + usniActivityDescription: v.usniActivityDescription, + usniArticleDate: v.usniArticleDate, + usniSource: v.usniSource, + })); + this.clusterMarkers = clusters.map(c => ({ + _kind: 'cluster' as const, + _lat: c.lat, + _lng: c.lon, + id: c.id, + name: c.name, + vesselCount: c.vesselCount, + activityType: c.activityType, + region: c.region, })); this.flushMarkers(); } @@ -2783,6 +2969,10 @@ export class GlobeMap { // ─── Destroy ────────────────────────────────────────────────────────────── public destroy(): void { + this.popup?.hide(); + this.popup = null; + this.vesselData.clear(); + this.clusterData.clear(); this.container.removeEventListener('contextmenu', this.handleContextMenu); this.unsubscribeGlobeQuality?.(); this.unsubscribeGlobeQuality = null; diff --git a/src/components/MapContainer.ts b/src/components/MapContainer.ts index bee9b5129..42f2a4338 100644 --- a/src/components/MapContainer.ts +++ b/src/components/MapContainer.ts @@ -483,7 +483,7 @@ export class MapContainer { public setMilitaryVessels(vessels: MilitaryVessel[], clusters: MilitaryVesselCluster[] = []): void { this.cachedMilitaryVessels = vessels; this.cachedMilitaryVesselClusters = clusters; - if (this.useGlobe) { this.globeMap?.setMilitaryVessels(vessels); return; } + if (this.useGlobe) { this.globeMap?.setMilitaryVessels(vessels, clusters); return; } if (this.useDeckGL) { this.deckGLMap?.setMilitaryVessels(vessels, clusters); } else { this.svgMap?.setMilitaryVessels(vessels, clusters); } } diff --git a/src/components/MapPopup.ts b/src/components/MapPopup.ts index 99ad0446b..a945fe48d 100644 --- a/src/components/MapPopup.ts +++ b/src/components/MapPopup.ts @@ -2177,6 +2177,10 @@ export class MapPopup { ? `${t('popups.militaryVessel.aisDark')}` : ''; + const dataSourceBadge = vessel.usniSource + ? `${t('popups.militaryVessel.estPosition')}` + : `${t('popups.militaryVessel.aisLive')}`; + // USNI deployment status badge const deploymentBadge = vessel.usniDeploymentStatus && vessel.usniDeploymentStatus !== 'unknown' ? `${vessel.usniDeploymentStatus.toUpperCase().replace('-', ' ')}` @@ -2201,6 +2205,7 @@ export class MapPopup {
${vesselName} ${darkWarning} + ${dataSourceBadge} ${deploymentBadge} ${vesselBadgeType} diff --git a/src/config/military.ts b/src/config/military.ts index 909e668a5..2e9584f91 100644 --- a/src/config/military.ts +++ b/src/config/military.ts @@ -526,6 +526,53 @@ export const USNI_REGION_COORDINATES: Record = { + // Aircraft Carriers + 'CVN-68': 'Bremerton', // USS Nimitz — Naval Station Kitsap / PSNS RCOH + 'CVN-69': 'Norfolk', // USS Dwight D. Eisenhower + 'CVN-70': 'San Diego', // USS Carl Vinson + 'CVN-71': 'San Diego', // USS Theodore Roosevelt + 'CVN-72': 'Everett', // USS Abraham Lincoln — Naval Station Everett + 'CVN-73': 'Norfolk', // USS George Washington — returned from Newport News RCOH + 'CVN-74': 'Bremerton', // USS John C. Stennis — PSNS RCOH + 'CVN-75': 'Norfolk', // USS Harry S. Truman + 'CVN-76': 'San Diego', // USS Ronald Reagan — returning from Yokosuka + 'CVN-77': 'Norfolk', // USS George H.W. Bush + 'CVN-78': 'Norfolk', // USS Gerald R. Ford + 'CVN-79': 'Norfolk', // USS John F. Kennedy — commissioning + // Amphibious Assault + 'LHD-1': 'Norfolk', // USS Wasp + 'LHD-2': 'Sasebo', // USS Essex — forward deployed Japan + 'LHD-3': 'Norfolk', // USS Kearsarge + 'LHD-4': 'San Diego', // USS Boxer + 'LHD-5': 'Norfolk', // USS Bataan + 'LHD-7': 'Norfolk', // USS Iwo Jima + 'LHD-8': 'San Diego', // USS Makin Island + 'LHA-6': 'San Diego', // USS America + 'LHA-7': 'San Diego', // USS Tripoli }; export function normalizeUSNIRegion(regionText: string): string { diff --git a/src/locales/en.json b/src/locales/en.json index 372b0965d..6d43256f1 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -2101,7 +2101,9 @@ "usniIntel": "USNI Intel", "usniSource": "Source: USNI News Fleet Tracker", "approximatePosition": "Position approximate — based on USNI weekly report, not real-time AIS.", - "darkDescription": "⚠ Vessel has gone dark - AIS signal lost. May indicate sensitive operations." + "darkDescription": "⚠ Vessel has gone dark - AIS signal lost. May indicate sensitive operations.", + "estPosition": "EST. POSITION", + "aisLive": "AIS LIVE" }, "militaryCluster": { "flightActivity": { diff --git a/src/services/usni-fleet.ts b/src/services/usni-fleet.ts index 3fb29bb41..11b80a1d8 100644 --- a/src/services/usni-fleet.ts +++ b/src/services/usni-fleet.ts @@ -1,7 +1,7 @@ import type { MilitaryVessel, MilitaryVesselCluster, USNIFleetReport, USNIVesselEntry } from '@/types'; import { getRpcBaseUrl } from '@/services/rpc-client'; import { createCircuitBreaker } from '@/utils'; -import { getUSNIRegionApproxCoords, getUSNIRegionCoords } from '@/config/military'; +import { getUSNIRegionApproxCoords, getUSNIRegionCoords, HULL_HOMEPORT } from '@/config/military'; import { MilitaryServiceClient, type GetUSNIFleetReportResponse, @@ -88,6 +88,44 @@ function scatterOffset(hullNumber: string, index: number): { lat: number; lon: n return { lat: Math.sin(angle) * dist, lon: Math.cos(angle) * dist }; } +/** Tighter scatter for in-port ships — just enough to separate icons at the same pier. */ +function portScatterOffset(hullNumber: string, index: number): { lat: number; lon: number } { + let hash = 0; + const str = hullNumber || String(index); + for (let i = 0; i < str.length; i++) { + hash = ((hash << 5) - hash) + str.charCodeAt(i); + hash |= 0; + } + const angle = (hash % 360) * (Math.PI / 180); + const dist = 0.01 + (Math.abs(hash) % 10) * 0.003; // 0.01–0.04 deg ≈ 1–4 km + return { lat: Math.sin(angle) * dist, lon: Math.cos(angle) * dist }; +} + +/** Resolve homeport coordinates for an in-port vessel. + * Option A: USNI text supplied an explicit homePort string. + * Option B: Fall back to hull-number lookup table. + * Returns undefined if neither resolves. */ +function resolvePortCoords( + homePort: string | undefined, + hullNumber: string | undefined, +): { lat: number; lon: number; portName: string } | undefined { + // Option A — use what USNI actually told us + if (homePort) { + const coords = getUSNIRegionCoords(homePort); + if (coords) return { ...coords, portName: homePort }; + } + // Option B — hull number fallback table + if (hullNumber) { + const normalized = hullNumber.toUpperCase().replace(/\s+/g, '').replace(/[–—]/g, '-'); + const portName = HULL_HOMEPORT[normalized]; + if (portName) { + const coords = getUSNIRegionCoords(portName); + if (coords) return { ...coords, portName }; + } + } + return undefined; +} + export function mergeUSNIWithAIS( aisVessels: MilitaryVessel[], usniReport: USNIFleetReport, @@ -110,6 +148,10 @@ export function mergeUSNIWithAIS( vessel.usniActivityDescription = usniVessel.activityDescription; vessel.usniArticleUrl = usniVessel.usniArticleUrl; vessel.usniArticleDate = usniVessel.usniArticleDate; + const portRes = usniVessel.deploymentStatus === 'in-port' + ? resolvePortCoords(usniVessel.homePort, usniVessel.hullNumber) + : undefined; + vessel.usniHomePort = portRes?.portName ?? usniVessel.homePort; matchedHulls.add(normalizeHull(usniVessel.hullNumber)); break; } @@ -132,6 +174,10 @@ export function mergeUSNIWithAIS( vessel.usniActivityDescription = usniVessel.activityDescription; vessel.usniArticleUrl = usniVessel.usniArticleUrl; vessel.usniArticleDate = usniVessel.usniArticleDate; + const portRes = usniVessel.deploymentStatus === 'in-port' + ? resolvePortCoords(usniVessel.homePort, usniVessel.hullNumber) + : undefined; + vessel.usniHomePort = portRes?.portName ?? usniVessel.homePort; matchedHulls.add(normalizeHull(usniVessel.hullNumber)); break; } @@ -143,14 +189,33 @@ export function mergeUSNIWithAIS( for (const usniVessel of usniReport.vessels) { if (matchedHulls.has(normalizeHull(usniVessel.hullNumber))) continue; - const coords = getUSNIRegionCoords(usniVessel.region); + // Resolve position: in-port ships use port coords (Option A + B), + // deployed/underway ships use deployment theater coords. + const inPort = usniVessel.deploymentStatus === 'in-port'; + const portResolution = inPort + ? resolvePortCoords(usniVessel.homePort, usniVessel.hullNumber) + : undefined; + + const regionCoords = getUSNIRegionCoords(usniVessel.region); const hasParsedCoords = Number.isFinite(usniVessel.regionLat) && Number.isFinite(usniVessel.regionLon) && !(usniVessel.regionLat === 0 && usniVessel.regionLon === 0); const fallbackCoords = getUSNIRegionApproxCoords(usniVessel.region); - const baseLat = coords?.lat ?? (hasParsedCoords ? usniVessel.regionLat : fallbackCoords.lat); - const baseLon = coords?.lon ?? (hasParsedCoords ? usniVessel.regionLon : fallbackCoords.lon); - const offset = scatterOffset(usniVessel.hullNumber, syntheticIndex++); + + const baseLat = portResolution?.lat + ?? regionCoords?.lat + ?? (hasParsedCoords ? usniVessel.regionLat : fallbackCoords.lat); + const baseLon = portResolution?.lon + ?? regionCoords?.lon + ?? (hasParsedCoords ? usniVessel.regionLon : fallbackCoords.lon); + + const offset = portResolution + ? portScatterOffset(usniVessel.hullNumber, syntheticIndex++) + : scatterOffset(usniVessel.hullNumber, syntheticIndex++); + + const noteBase = portResolution + ? `In port — ${portResolution.portName} (USNI)` + : `USNI position — ${usniVessel.region} (approximate)`; merged.push({ id: `usni-${usniVessel.hullNumber || usniVessel.name}`, @@ -167,9 +232,10 @@ export function mergeUSNIWithAIS( lastAisUpdate: new Date(usniVessel.usniArticleDate), confidence: 'low', isInteresting: usniVessel.vesselType === 'carrier' || usniVessel.vesselType === 'amphibious', - note: `USNI position — ${usniVessel.region} (approximate)`, + note: noteBase, usniRegion: usniVessel.region, usniDeploymentStatus: usniVessel.deploymentStatus, + usniHomePort: portResolution?.portName ?? usniVessel.homePort, usniStrikeGroup: usniVessel.strikeGroup, usniActivityDescription: usniVessel.activityDescription, usniArticleUrl: usniVessel.usniArticleUrl, diff --git a/src/types/index.ts b/src/types/index.ts index 30ed81771..5c922ceed 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -819,6 +819,7 @@ export interface MilitaryVessel { note?: string; usniRegion?: string; usniDeploymentStatus?: USNIDeploymentStatus; + usniHomePort?: string; usniStrikeGroup?: string; usniActivityDescription?: string; usniArticleUrl?: string; diff --git a/src/utils/distance.ts b/src/utils/distance.ts new file mode 100644 index 000000000..155c07846 --- /dev/null +++ b/src/utils/distance.ts @@ -0,0 +1,14 @@ +export function haversineKm( + lat1: number, lon1: number, + lat2: number, lon2: number, +): number { + const R = 6371; + const dLat = ((lat2 - lat1) * Math.PI) / 180; + const dLon = ((lon2 - lon1) * Math.PI) / 180; + const a = + Math.sin(dLat / 2) ** 2 + + Math.cos((lat1 * Math.PI) / 180) * + Math.cos((lat2 * Math.PI) / 180) * + Math.sin(dLon / 2) ** 2; + return R * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); +}