gavindiaz/PolyWeather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefer METAR over NMC for city observation display

Browse Source
This commit is contained in:
2569718930@qq.com
2026-04-16 15:53:00 +08:00
parent 0eee5c8948
commit 46b0e63ffd
2 changed files with 66 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/hooks/useLeafletMap.ts
+18 -4
View File
@@ -57,12 +57,26 @@ function pickMarkerTemperature(
) {
if (!snapshot) return null;
const detail = snapshot as Partial<CityDetail>;
const currentSource = String(
snapshot.current?.settlement_source ||
snapshot.current?.settlement_source_label ||
"",
)
.trim()
.toLowerCase();
const currentTemp =
currentSource === "nmc" || currentSource.includes("nmc")
? null
: snapshot.current?.temp;
const isNmcStation = (station?: { source_label?: string | null }) =>
String(station?.source_label || "")
.trim()
.toLowerCase()
.includes("nmc");
const candidates = [
snapshot.current?.temp,
detail.airport_primary?.temp,
currentTemp,
detail.airport_current?.temp,
detail.center_station_candidate?.temp,
detail.official_nearby?.[0]?.temp,
isNmcStation(detail.airport_primary) ? null : detail.airport_primary?.temp,
detail.mgm_nearby?.[0]?.temp,
];
for (const value of candidates) {
frontend/lib/dashboard-utils.ts
+48 -35
View File
@@ -2993,30 +2993,48 @@ function getOfficialObservationCandidates(detail: CityDetail) {
}
function getObservedTemperatureProfile(detail: CityDetail, locale: Locale) {
const { centerStation, officialAnchor, officialNearby, mgmNearby } =
getOfficialObservationCandidates(detail);
const observedTemp = firstFiniteNumber([
detail.current?.temp,
detail.airport_primary?.temp,
detail.airport_current?.temp,
centerStation?.temp,
officialAnchor?.temp,
officialNearby[0]?.temp,
mgmNearby[0]?.temp,
]);
const { mgmNearby } = getOfficialObservationCandidates(detail);
const currentSource = String(
detail.current?.settlement_source ||
detail.current?.settlement_source_label ||
"",
)
.trim()
.toLowerCase();
const isNmcCurrent = currentSource === "nmc" || currentSource.includes("nmc");
const isNmcAirport = String(detail.airport_primary?.source_label || "")
.trim()
.toLowerCase()
.includes("nmc");
const candidates = [
{
sourceLabel: detail.airport_current?.source_label || "METAR",
temp: detail.airport_current?.temp,
},
{
sourceLabel: detail.airport_primary?.source_label || "METAR",
temp: isNmcAirport ? null : detail.airport_primary?.temp,
},
{
sourceLabel: detail.current?.settlement_source_label,
temp: isNmcCurrent ? null : detail.current?.temp,
},
{
sourceLabel: mgmNearby[0]?.source_label,
temp: mgmNearby[0]?.temp,
},
];
const selected = candidates.find((candidate) =>
Number.isFinite(Number(candidate.temp)),
);
if (observedTemp == null) {
if (!selected) {
return isEnglish(locale) ? "Unavailable" : "未提供";
}
const observedTemp = Number(selected.temp);
const sourceLabel = firstNonEmptyString([
detail.current?.settlement_source_label,
detail.airport_primary?.source_label,
detail.airport_current?.source_label,
centerStation?.source_label,
officialAnchor?.source_label,
officialNearby[0]?.source_label,
mgmNearby[0]?.source_label,
selected.sourceLabel,
getObservationSourceTag(detail),
]);
const rounded =
@@ -3030,28 +3048,23 @@ function getObservedTemperatureProfile(detail: CityDetail, locale: Locale) {
}
function getObservationUpdateProfile(detail: CityDetail, locale: Locale) {
const { centerStation, officialAnchor, officialNearby, mgmNearby } =
getOfficialObservationCandidates(detail);
const centerRecord = asRecord(centerStation);
const officialAnchorRecord = asRecord(officialAnchor);
const officialFirstRecord = asRecord(officialNearby[0]);
const { mgmNearby } = getOfficialObservationCandidates(detail);
const mgmFirstRecord = asRecord(mgmNearby[0]);
const currentSource = String(
detail.current?.settlement_source ||
detail.current?.settlement_source_label ||
"",
)
.trim()
.toLowerCase();
const isNmcCurrent = currentSource === "nmc" || currentSource.includes("nmc");
const rawValue = firstNonEmptyString([
detail.current?.obs_time,
detail.current?.report_time,
detail.airport_primary?.obs_time,
detail.airport_primary?.report_time,
detail.airport_current?.obs_time,
detail.airport_current?.report_time,
centerRecord?.obs_time,
centerRecord?.report_time,
centerRecord?.time,
officialAnchorRecord?.obs_time,
officialAnchorRecord?.report_time,
officialAnchorRecord?.time,
officialFirstRecord?.obs_time,
officialFirstRecord?.report_time,
officialFirstRecord?.time,
isNmcCurrent ? "" : detail.current?.obs_time,
isNmcCurrent ? "" : detail.current?.report_time,
mgmFirstRecord?.obs_time,
mgmFirstRecord?.report_time,
mgmFirstRecord?.time,