diff --git a/coverage.txt b/coverage.txt index 6647c5f..d7807c9 100644 --- a/coverage.txt +++ b/coverage.txt @@ -165,68 +165,72 @@ github.com/vasya4k/metar/taf.go:176.51,177.125 1 33 github.com/vasya4k/metar/taf.go:177.125,178.46 1 4 github.com/vasya4k/metar/taf.go:178.46,180.5 1 1 github.com/vasya4k/metar/taf.go:181.4,182.19 2 4 -github.com/vasya4k/metar/taf.go:185.2,185.34 1 9 -github.com/vasya4k/metar/taf.go:185.34,186.54 1 4 -github.com/vasya4k/metar/taf.go:186.54,188.4 1 4 -github.com/vasya4k/metar/taf.go:190.2,190.8 1 9 +github.com/vasya4k/metar/taf.go:184.3,184.25 1 33 +github.com/vasya4k/metar/taf.go:184.25,186.4 1 0 +github.com/vasya4k/metar/taf.go:188.2,188.34 1 9 +github.com/vasya4k/metar/taf.go:188.34,189.54 1 4 +github.com/vasya4k/metar/taf.go:189.54,191.4 1 4 +github.com/vasya4k/metar/taf.go:193.2,193.8 1 9 github.com/vasya4k/metar/trend.go:49.53,51.47 2 13 github.com/vasya4k/metar/trend.go:51.47,53.42 1 17 github.com/vasya4k/metar/trend.go:53.42,55.4 1 3 github.com/vasya4k/metar/trend.go:57.3,57.42 1 17 github.com/vasya4k/metar/trend.go:57.42,59.4 1 11 github.com/vasya4k/metar/trend.go:61.3,61.47 1 17 -github.com/vasya4k/metar/trend.go:61.47,63.4 1 4 -github.com/vasya4k/metar/trend.go:65.3,65.39 1 17 -github.com/vasya4k/metar/trend.go:65.39,67.4 1 5 -github.com/vasya4k/metar/trend.go:69.3,71.54 2 17 -github.com/vasya4k/metar/trend.go:71.54,75.4 2 2 -github.com/vasya4k/metar/trend.go:76.3,76.55 1 15 -github.com/vasya4k/metar/trend.go:78.2,78.14 1 11 -github.com/vasya4k/metar/trend.go:82.57,86.43 3 17 -github.com/vasya4k/metar/trend.go:86.43,89.17 3 6 -github.com/vasya4k/metar/trend.go:89.17,91.4 1 5 -github.com/vasya4k/metar/trend.go:91.9,94.4 2 1 -github.com/vasya4k/metar/trend.go:95.3,96.17 2 6 -github.com/vasya4k/metar/trend.go:96.17,98.4 1 5 -github.com/vasya4k/metar/trend.go:98.9,101.4 2 1 -github.com/vasya4k/metar/trend.go:103.2,103.8 1 17 -github.com/vasya4k/metar/trend.go:107.55,109.23 2 12 -github.com/vasya4k/metar/trend.go:109.23,113.3 3 2 -github.com/vasya4k/metar/trend.go:113.8,115.3 1 10 -github.com/vasya4k/metar/trend.go:116.2,116.15 1 12 -github.com/vasya4k/metar/trend.go:119.55,121.23 1 17 -github.com/vasya4k/metar/trend.go:121.23,125.3 3 1 -github.com/vasya4k/metar/trend.go:125.8,125.30 1 16 -github.com/vasya4k/metar/trend.go:125.30,129.3 3 2 -github.com/vasya4k/metar/trend.go:130.2,130.14 1 14 -github.com/vasya4k/metar/trend.go:133.59,134.36 1 21 -github.com/vasya4k/metar/trend.go:134.36,136.17 2 2 -github.com/vasya4k/metar/trend.go:136.17,139.4 2 1 -github.com/vasya4k/metar/trend.go:139.9,141.4 1 1 -github.com/vasya4k/metar/trend.go:143.2,143.36 1 20 -github.com/vasya4k/metar/trend.go:143.36,145.17 2 2 -github.com/vasya4k/metar/trend.go:145.17,148.4 2 1 -github.com/vasya4k/metar/trend.go:148.9,150.4 1 1 -github.com/vasya4k/metar/trend.go:152.2,152.36 1 19 -github.com/vasya4k/metar/trend.go:152.36,155.26 3 3 -github.com/vasya4k/metar/trend.go:155.26,158.4 2 1 -github.com/vasya4k/metar/trend.go:158.9,158.28 1 2 -github.com/vasya4k/metar/trend.go:158.28,160.4 1 0 -github.com/vasya4k/metar/trend.go:160.9,162.4 1 2 -github.com/vasya4k/metar/trend.go:163.3,163.17 1 3 -github.com/vasya4k/metar/trend.go:163.17,166.4 2 2 -github.com/vasya4k/metar/trend.go:166.9,168.4 1 1 -github.com/vasya4k/metar/trend.go:170.2,170.14 1 17 -github.com/vasya4k/metar/trend.go:173.55,175.38 2 17 -github.com/vasya4k/metar/trend.go:175.38,178.3 2 9 -github.com/vasya4k/metar/trend.go:178.8,178.43 1 8 -github.com/vasya4k/metar/trend.go:178.43,181.17 3 2 -github.com/vasya4k/metar/trend.go:181.17,183.4 1 0 -github.com/vasya4k/metar/trend.go:184.3,184.14 1 2 -github.com/vasya4k/metar/trend.go:186.2,186.14 1 6 -github.com/vasya4k/metar/trend.go:189.62,191.54 1 10 -github.com/vasya4k/metar/trend.go:191.54,195.3 3 2 -github.com/vasya4k/metar/trend.go:196.2,196.14 1 8 +github.com/vasya4k/metar/trend.go:61.47,62.30 1 4 +github.com/vasya4k/metar/trend.go:62.30,63.10 1 0 +github.com/vasya4k/metar/trend.go:65.4,65.11 1 4 +github.com/vasya4k/metar/trend.go:68.3,68.39 1 17 +github.com/vasya4k/metar/trend.go:68.39,70.4 1 5 +github.com/vasya4k/metar/trend.go:72.3,74.54 2 17 +github.com/vasya4k/metar/trend.go:74.54,78.4 2 2 +github.com/vasya4k/metar/trend.go:79.3,79.55 1 15 +github.com/vasya4k/metar/trend.go:81.2,81.14 1 11 +github.com/vasya4k/metar/trend.go:85.57,89.43 3 17 +github.com/vasya4k/metar/trend.go:89.43,92.17 3 6 +github.com/vasya4k/metar/trend.go:92.17,94.4 1 5 +github.com/vasya4k/metar/trend.go:94.9,97.4 2 1 +github.com/vasya4k/metar/trend.go:98.3,99.17 2 6 +github.com/vasya4k/metar/trend.go:99.17,101.4 1 5 +github.com/vasya4k/metar/trend.go:101.9,104.4 2 1 +github.com/vasya4k/metar/trend.go:106.2,106.8 1 17 +github.com/vasya4k/metar/trend.go:110.55,112.23 2 12 +github.com/vasya4k/metar/trend.go:112.23,116.3 3 2 +github.com/vasya4k/metar/trend.go:116.8,118.3 1 10 +github.com/vasya4k/metar/trend.go:119.2,119.15 1 12 +github.com/vasya4k/metar/trend.go:122.55,124.23 1 17 +github.com/vasya4k/metar/trend.go:124.23,128.3 3 1 +github.com/vasya4k/metar/trend.go:128.8,128.30 1 16 +github.com/vasya4k/metar/trend.go:128.30,132.3 3 2 +github.com/vasya4k/metar/trend.go:133.2,133.14 1 14 +github.com/vasya4k/metar/trend.go:136.59,137.36 1 21 +github.com/vasya4k/metar/trend.go:137.36,139.17 2 2 +github.com/vasya4k/metar/trend.go:139.17,142.4 2 1 +github.com/vasya4k/metar/trend.go:142.9,144.4 1 1 +github.com/vasya4k/metar/trend.go:146.2,146.36 1 20 +github.com/vasya4k/metar/trend.go:146.36,148.17 2 2 +github.com/vasya4k/metar/trend.go:148.17,151.4 2 1 +github.com/vasya4k/metar/trend.go:151.9,153.4 1 1 +github.com/vasya4k/metar/trend.go:155.2,155.36 1 19 +github.com/vasya4k/metar/trend.go:155.36,158.26 3 3 +github.com/vasya4k/metar/trend.go:158.26,161.4 2 1 +github.com/vasya4k/metar/trend.go:161.9,161.28 1 2 +github.com/vasya4k/metar/trend.go:161.28,163.4 1 0 +github.com/vasya4k/metar/trend.go:163.9,165.4 1 2 +github.com/vasya4k/metar/trend.go:166.3,166.17 1 3 +github.com/vasya4k/metar/trend.go:166.17,169.4 2 2 +github.com/vasya4k/metar/trend.go:169.9,171.4 1 1 +github.com/vasya4k/metar/trend.go:173.2,173.14 1 17 +github.com/vasya4k/metar/trend.go:176.55,178.38 2 17 +github.com/vasya4k/metar/trend.go:178.38,181.3 2 9 +github.com/vasya4k/metar/trend.go:181.8,181.43 1 8 +github.com/vasya4k/metar/trend.go:181.43,184.17 3 2 +github.com/vasya4k/metar/trend.go:184.17,186.4 1 0 +github.com/vasya4k/metar/trend.go:187.3,187.14 1 2 +github.com/vasya4k/metar/trend.go:189.2,189.14 1 6 +github.com/vasya4k/metar/trend.go:192.62,194.54 1 10 +github.com/vasya4k/metar/trend.go:194.54,198.3 3 2 +github.com/vasya4k/metar/trend.go:199.2,199.14 1 8 mode: atomic github.com/vasya4k/metar/clouds/clouds.go:26.49,28.37 1 11 github.com/vasya4k/metar/clouds/clouds.go:28.37,31.3 2 10 diff --git a/taf.go b/taf.go index 8958628..4a0dcf0 100644 --- a/taf.go +++ b/taf.go @@ -181,6 +181,9 @@ func (t *TAFMessage) findTrendsInMessage(tokens []string, startposition int) (en trends = append([][]string{tokens[i:endposition]}, trends[0:]...) endposition = i } + if tokens[i] == "RMK" { + trends = nil + } } for _, trendstr := range trends { if trend := parseTrendData(trendstr); trend != nil { diff --git a/trend.go b/trend.go index 0f3b807..2d424e8 100644 --- a/trend.go +++ b/trend.go @@ -59,6 +59,9 @@ func parseTrendData(tokens []string) (trend *Trend) { } // AT, FM, TL used in METAR trends for trend.setPeriodOfChanges(tokens[count]) { + if count == len(tokens)-1 { + break + } count++ } // date/time for TAF