✨ Add weather report parsing for METAR, SPECI, and TAF
Implement comprehensive weather parsing capabilities following Clean Architecture principles with composite parser pattern for routing between aviation and weather messages. ## Features Added - Weather report parsing (METAR, SPECI, TAF) - Composite parser pattern for message routing - Lenient parsing with warnings for unrecognized tokens - Support for PROB and RMK sections in TAF - Rich domain modeling with typed weather elements ## Architecture **Domain Layer** (internal/domain/weather/): - WeatherMessage interface with Metar and Taf implementations - Weather elements: Wind, Visibility, Cloud, Temperature, Altimeter, Phenomenon - Domain errors: ErrInvalidFormat, ErrMissingStation, ErrMissingTime **Port Layer** (internal/port/weather_parser.go): - WeatherParser interface with CanParse and Parse methods **Adapter Layer** (internal/adapter/parser/weather/): - WeatherParserImpl with classification and parsing logic - Comprehensive regex patterns for weather elements - METAR/SPECI parser with element extraction - TAF parser with period handling (FM, TEMPO, BECMG, PROB) - Helper functions for time parsing and unit conversions **Composite Parser** (internal/adapter/parser/composite.go): - Routes weather reports to weather parser - Falls back to aviation parser for telegrams - Converts WeatherMessage to ParsedTelegram format ## Integration - Updated ProvideParser to create composite parser with weather parser - Added weather parser to Wire DI configuration - Updated processor_bench_test.go for weather parser integration - Documentation added in docs/weather-parser.md ## Testing - 29 comprehensive tests for weather parsing (all passing) - Tests for classification, METAR, SPECI, TAF, and composite routing - Benchmark compatibility maintained ## Fixes Applied - TAF PROB parsing: Include PROB/RMK in special section detection - Composite test: Updated to use properly formatted AFTN telegram - Linter issues: Switch statement refactor, removed unused patterns - Ineffective break statement fixed in TAF parser ## Coverage ~1,743 lines of new code with: - Complete METAR/SPECI parsing - TAF parsing with period support - Lenient error handling with warnings - Unit conversions and time utilities 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
windyboy
co-authored by
Claude Sonnet 4.5
Claude Sonnet 4.5
parent
c1808c0523
commit
d0fd461e38
@@ -0,0 +1,305 @@
|
||||
package weather
|
||||
|
||||
import (
|
||||
"caatsm/internal/domain/weather"
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// parseMetar parses a METAR or SPECI report
|
||||
func parseMetar(raw string, reportType string) (*weather.Metar, error) {
|
||||
tokens := Tokenize(raw)
|
||||
if len(tokens) < 3 {
|
||||
return nil, weather.ErrInvalidFormat
|
||||
}
|
||||
|
||||
metar := &weather.Metar{
|
||||
ReportType: weather.ReportType(reportType),
|
||||
RawTextVal: raw,
|
||||
Warnings: []string{},
|
||||
Clouds: []weather.Cloud{},
|
||||
Phenomena: []weather.Phenomenon{},
|
||||
}
|
||||
|
||||
// Track current position in tokens
|
||||
pos := 0
|
||||
|
||||
// Skip report type (METAR/SPECI) - first token
|
||||
if pos >= len(tokens) {
|
||||
return nil, weather.ErrMissingStation
|
||||
}
|
||||
pos++
|
||||
|
||||
// Parse station (second token)
|
||||
if pos >= len(tokens) {
|
||||
return nil, weather.ErrMissingStation
|
||||
}
|
||||
metar.StationID = tokens[pos]
|
||||
pos++
|
||||
|
||||
// Parse issue time (DDHHmmZ) - third token
|
||||
if pos >= len(tokens) {
|
||||
return nil, weather.ErrMissingTime
|
||||
}
|
||||
issueTime, err := ParseTime(tokens[pos])
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to parse issue time: %w", err)
|
||||
}
|
||||
metar.IssueTimeVal = issueTime
|
||||
metar.ObsTime = issueTime
|
||||
pos++
|
||||
|
||||
// Check for modifier (AUTO, COR)
|
||||
if pos < len(tokens) {
|
||||
if match := modifierPattern.FindStringSubmatch(tokens[pos]); match != nil {
|
||||
metar.Modifier = match[1]
|
||||
pos++
|
||||
}
|
||||
}
|
||||
|
||||
// Parse wind
|
||||
if pos < len(tokens) {
|
||||
if wind := parseWind(tokens[pos]); wind != nil {
|
||||
metar.Wind = wind
|
||||
pos++
|
||||
|
||||
// Check for variable wind (e.g., 180V240)
|
||||
if pos < len(tokens) {
|
||||
if match := variableWindPattern.FindStringSubmatch(tokens[pos]); match != nil {
|
||||
from, _ := strconv.Atoi(match[1])
|
||||
to, _ := strconv.Atoi(match[2])
|
||||
metar.Wind.Variable = true
|
||||
metar.Wind.VariableFrom = from
|
||||
metar.Wind.VariableTo = to
|
||||
pos++
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Parse visibility
|
||||
if pos < len(tokens) {
|
||||
if vis := parseVisibility(tokens[pos]); vis != nil {
|
||||
metar.Visibility = vis
|
||||
pos++
|
||||
|
||||
// Check for directional visibility (e.g., 2000NE)
|
||||
if pos < len(tokens) {
|
||||
if match := directionalVisibilityPattern.FindStringSubmatch(tokens[pos]); match != nil {
|
||||
dist, _ := strconv.ParseFloat(match[1], 64)
|
||||
metar.Visibility.Distance = dist
|
||||
metar.Visibility.Direction = match[2]
|
||||
metar.Visibility.Unit = "M"
|
||||
pos++
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Parse runway visual range (RVR) - skip for now, add to warnings
|
||||
for pos < len(tokens) && strings.HasPrefix(tokens[pos], "R") {
|
||||
metar.Warnings = append(metar.Warnings, fmt.Sprintf("RVR not parsed: %s", tokens[pos]))
|
||||
pos++
|
||||
}
|
||||
|
||||
// Parse weather phenomena
|
||||
for pos < len(tokens) {
|
||||
if match := phenomenonPattern.FindStringSubmatch(tokens[pos]); match != nil {
|
||||
phenom := weather.Phenomenon{
|
||||
Intensity: match[1],
|
||||
Descriptor: match[2],
|
||||
Weather: match[3],
|
||||
}
|
||||
metar.Phenomena = append(metar.Phenomena, phenom)
|
||||
pos++
|
||||
} else {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
// Parse clouds
|
||||
for pos < len(tokens) {
|
||||
// Check for special cloud codes first
|
||||
if match := skyClearPattern.FindStringSubmatch(tokens[pos]); match != nil {
|
||||
// SKC, CLR, NSC - no clouds
|
||||
pos++
|
||||
break
|
||||
}
|
||||
|
||||
if match := cloudPattern.FindStringSubmatch(tokens[pos]); match != nil {
|
||||
alt, _ := strconv.Atoi(match[2])
|
||||
cloud := weather.Cloud{
|
||||
Type: match[1],
|
||||
Altitude: alt * 100, // Convert to feet
|
||||
Modifier: match[3],
|
||||
}
|
||||
metar.Clouds = append(metar.Clouds, cloud)
|
||||
pos++
|
||||
} else {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
// Parse temperature/dewpoint
|
||||
if pos < len(tokens) {
|
||||
if match := tempPattern.FindStringSubmatch(tokens[pos]); match != nil {
|
||||
tempVal, _ := strconv.ParseFloat(match[2], 64)
|
||||
if match[1] == "M" {
|
||||
tempVal = -tempVal
|
||||
}
|
||||
|
||||
dewVal, _ := strconv.ParseFloat(match[4], 64)
|
||||
if match[3] == "M" {
|
||||
dewVal = -dewVal
|
||||
}
|
||||
|
||||
metar.Temperature = &weather.Temperature{
|
||||
Value: tempVal,
|
||||
Unit: "C",
|
||||
}
|
||||
metar.Dewpoint = &weather.Temperature{
|
||||
Value: dewVal,
|
||||
Unit: "C",
|
||||
}
|
||||
pos++
|
||||
}
|
||||
}
|
||||
|
||||
// Parse altimeter
|
||||
if pos < len(tokens) {
|
||||
if match := altimeterPattern.FindStringSubmatch(tokens[pos]); match != nil {
|
||||
value, _ := strconv.ParseFloat(match[2], 64)
|
||||
unit := match[1]
|
||||
|
||||
switch unit {
|
||||
case "Q":
|
||||
// QNH in hPa
|
||||
metar.Altimeter = &weather.Altimeter{
|
||||
Value: value,
|
||||
Unit: "QNH",
|
||||
}
|
||||
case "A":
|
||||
// Altimeter in inHg
|
||||
metar.Altimeter = &weather.Altimeter{
|
||||
Value: value / 100.0, // A2992 means 29.92 inHg
|
||||
Unit: "A",
|
||||
}
|
||||
}
|
||||
pos++
|
||||
}
|
||||
}
|
||||
|
||||
// Parse remarks (everything after RMK)
|
||||
remarksStart := -1
|
||||
for i := pos; i < len(tokens); i++ {
|
||||
if strings.HasPrefix(strings.ToUpper(tokens[i]), "RMK") {
|
||||
remarksStart = i
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if remarksStart >= 0 {
|
||||
metar.Remarks = strings.Join(tokens[remarksStart:], " ")
|
||||
pos = len(tokens) // Skip remaining tokens
|
||||
}
|
||||
|
||||
// Collect any remaining unrecognized tokens as warnings
|
||||
for pos < len(tokens) {
|
||||
metar.Warnings = append(metar.Warnings, fmt.Sprintf("unrecognized token: %s", tokens[pos]))
|
||||
pos++
|
||||
}
|
||||
|
||||
return metar, nil
|
||||
}
|
||||
|
||||
// parseWind parses wind information
|
||||
func parseWind(token string) *weather.Wind {
|
||||
match := windPattern.FindStringSubmatch(token)
|
||||
if len(match) == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
wind := &weather.Wind{}
|
||||
|
||||
// Parse direction
|
||||
if match[1] == "VRB" {
|
||||
wind.Variable = true
|
||||
wind.Direction = 0
|
||||
} else {
|
||||
dir, _ := strconv.Atoi(match[1])
|
||||
wind.Direction = dir
|
||||
}
|
||||
|
||||
// Parse speed
|
||||
speed, _ := strconv.Atoi(match[2])
|
||||
wind.Speed = speed
|
||||
|
||||
// Parse gust
|
||||
if match[3] != "" {
|
||||
gust, _ := strconv.Atoi(match[4])
|
||||
wind.Gust = gust
|
||||
}
|
||||
|
||||
// Parse unit
|
||||
wind.Unit = match[5]
|
||||
if wind.Unit == "" {
|
||||
wind.Unit = "KT" // Default to knots
|
||||
}
|
||||
|
||||
return wind
|
||||
}
|
||||
|
||||
// parseVisibility parses visibility information
|
||||
func parseVisibility(token string) *weather.Visibility {
|
||||
// Try directional visibility first
|
||||
if match := directionalVisibilityPattern.FindStringSubmatch(token); match != nil {
|
||||
dist, _ := strconv.ParseFloat(match[1], 64)
|
||||
return &weather.Visibility{
|
||||
Distance: dist,
|
||||
Unit: "M",
|
||||
Direction: match[2],
|
||||
}
|
||||
}
|
||||
|
||||
// Try standard visibility pattern
|
||||
match := visibilityPattern.FindStringSubmatch(token)
|
||||
if len(match) == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
vis := &weather.Visibility{
|
||||
Modifier: match[1],
|
||||
Unit: match[3],
|
||||
}
|
||||
|
||||
// Parse distance
|
||||
distStr := match[2]
|
||||
if strings.Contains(distStr, "/") {
|
||||
// Fractional visibility (e.g., "1/4SM")
|
||||
dist, err := ParseFraction(distStr)
|
||||
if err == nil {
|
||||
vis.Distance = dist
|
||||
} else {
|
||||
return nil
|
||||
}
|
||||
} else {
|
||||
dist, err := strconv.ParseFloat(distStr, 64)
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
vis.Distance = dist
|
||||
}
|
||||
|
||||
// Default unit
|
||||
if vis.Unit == "" {
|
||||
if vis.Distance >= 10 {
|
||||
vis.Unit = "M" // Meters (e.g., 9999)
|
||||
} else {
|
||||
vis.Unit = "SM" // Statute miles
|
||||
}
|
||||
}
|
||||
|
||||
return vis
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user