Skip to content

Commit c3c940a

Browse files
authored
Merge pull request #748 from mivek/fix/cloudquantity-clr
fix: handle cloud quantity CLR the same way as SKC
2 parents c06983f + 6f54567 commit c3c940a

10 files changed

Lines changed: 41 additions & 37 deletions

File tree

metarParser-commons/src/main/resources/internationalization/messages.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
CloudQuantity.BKN=broken
2+
CloudQuantity.CLR=sky clear
23
CloudQuantity.FEW=few
34
CloudQuantity.NSC=no significant clouds.
45
CloudQuantity.OVC=overcast

metarParser-commons/src/main/resources/internationalization/messages_de.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
CloudQuantity.BKN=stark bewölkt
2+
CloudQuantity.CLR=wolkenlos
23
CloudQuantity.FEW=leicht bewölkt
34
CloudQuantity.NSC=keine signifikanten Wolken
45
CloudQuantity.OVC=bedeckt

metarParser-commons/src/main/resources/internationalization/messages_es.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
CloudQuantity.CLR=cielo despejado
12
CloudQuantity.NSC=sin nubes significativas.
23
CloudQuantity.OVC=cubierto
34
CloudQuantity.SKC=cielo despejado

metarParser-commons/src/main/resources/internationalization/messages_fr.properties

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
11
CloudQuantity.BKN=nuages fragmentés
2+
CloudQuantity.CLR=pas de nuage
23
CloudQuantity.FEW=peu
34
CloudQuantity.NSC=pas de nuages significatifs.
45
CloudQuantity.OVC=ciel couvert
56
CloudQuantity.SCT=nuages épars
67
CloudQuantity.SKC=pas de nuage
78

8-
CloudType.AC=Altocumulus
9-
CloudType.AS=Altostratus
109
CloudType.CB=Cumunolinbus
1110
CloudType.CC=Cirrocumulus
12-
CloudType.CI=Cirrus
13-
CloudType.CS=Cirrostratus
14-
CloudType.CU=Cumulus
15-
CloudType.NS=Nimbostratus
16-
CloudType.SC=Stratocumulus
17-
CloudType.ST=Stratus
1811
CloudType.TCU=Cumulus bourgeonnant
1912

2013
DepositBrakingCapacity.//=non reportée
@@ -24,7 +17,6 @@ DepositBrakingCapacity.93=moyenne
2417
DepositBrakingCapacity.94=moyenne/bonne
2518
DepositBrakingCapacity.95=bonne
2619
DepositBrakingCapacity.99=valeurs non fiables
27-
DepositBrakingCapacity.default=friction coefficient of {0}
2820

2921
DepositCoverage.NOT_REPORTED=non reportée
3022
DepositCoverage.LESS_10=moins de 10%
@@ -34,15 +26,8 @@ DepositCoverage.FROM_51_TO_100=de 51% à 100%
3426

3527
DepositThickness.//=non reportée
3628
DepositThickness.00=moins de 1 mm
37-
DepositThickness.92=10 cm
38-
DepositThickness.93=15 cm
39-
DepositThickness.94=20 cm
40-
DepositThickness.95=25 cm
41-
DepositThickness.96=30 cm
42-
DepositThickness.97=35 cm
4329
DepositThickness.98=40 cm ou plus
4430
DepositThickness.99=fermée
45-
DepositThickness.default={0} mm
4631

4732
DepositType.NOT_REPORTED=non reportée
4833
DepositType.CLEAR_DRY=clair et sec
@@ -108,7 +93,6 @@ Phenomenon.HZ=brume sèche
10893
Phenomenon.IC=cristaux de glace
10994
Phenomenon.PL=granules de glace
11095
Phenomenon.PO=tourbillon de poussières sable
111-
Phenomenon.PY=spray
11296
Phenomenon.RA=pluie
11397
Phenomenon.SA=sable
11498
Phenomenon.SG=neige en grains
@@ -181,7 +165,6 @@ Remark.Tower.Visibility=visibility de la tour de contrôle de {0} miles
181165
Remark.Variable.Prevailing.Visibility=variation de la visibilité dominante entre {0} et {1} SM
182166
Remark.Variable.Sky.Condition=couche de nuages variant entre {0} et {1}
183167
Remark.Variable.Sky.Condition.Height=couche de nuages à {0} pieds variant entre {1} et {2}
184-
Remark.VIRGA=virga
185168
Remark.Virga.Direction=virga au {0} de la station
186169
Remark.WATERSPOUT=trombe
187170
Remark.Water.Equivalent.Snow.Ground=équivalent d''eau de {0} pouces de neige
@@ -207,7 +190,6 @@ Converter.SSE=Sud Sud Est
207190
Converter.SSW=Sud Sud Ouest
208191
Converter.SW=Sud Ouest
209192
Converter.U=accroissement
210-
Converter.VRB=Variable
211193
Converter.W=Ouest
212194
Converter.WNW=Ouest Nord Ouest
213195
Converter.WSW=Ouest Sud Ouest
@@ -224,9 +206,7 @@ TimeIndicator.TL=jusqu'à
224206
ToString.airport=aéroport
225207
ToString.altimeter=altimètre (hPa)
226208
ToString.amendment=amendement
227-
ToString.auto=auto
228209
ToString.baseHeight=Base de la couche en pied
229-
ToString.cavok=cavok
230210
ToString.clouds=nuages
231211
ToString.day.month=jour du mois
232212
ToString.day.hour=heure du jour
@@ -246,7 +226,6 @@ ToString.intensity=intensité
246226
ToString.indicator=indicateur
247227
ToString.message=message original
248228
ToString.name=nom
249-
ToString.nosig=nosig
250229
ToString.phenomenons=phénomènes
251230
ToString.probability=probabilité
252231
ToString.quantity=quantité
@@ -261,14 +240,12 @@ ToString.temperature.max=température maximale (°C)
261240
ToString.temperature.min=température minimale (°C)
262241
ToString.trend=tendance
263242
ToString.trends=tendances
264-
ToString.type=type
265243
ToString.visibility.main=visibilité principale
266244
ToString.visibility.min=visibilité minimale
267245
ToString.visibility.min.direction=direction de la visibilité minimale
268246
ToString.visibility.max=visibilité maximale
269247
ToString.vertical.visibility=visibilité verticale (pieds)
270248
ToString.weather.conditions=conditions météorologique
271-
ToString.wind.direction=direction
272249
ToString.wind.direction.degrees=direction (degrés)
273250
ToString.wind.gusts=rafales
274251
ToString.wind.min.variation=variation minimale du vent

metarParser-commons/src/main/resources/internationalization/messages_it.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
CloudQuantity.BKN=molto nuvoloso
2+
CloudQuantity.CLR=cielo sereno
23
CloudQuantity.FEW=leggermente nuvoloso
34
CloudQuantity.NSC=Nessuna nuvola significativa
45
CloudQuantity.OVC=coperto

metarParser-commons/src/main/resources/internationalization/messages_pl_PL.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
CloudQuantity.BKN=Od 5/8 do 7/8
2+
CloudQuantity.CLR=czyste niebo
23
CloudQuantity.FEW=Od 1/8 do 2/8
34
CloudQuantity.NSC=Nieznaczne zachmurzenie.
45
CloudQuantity.OVC=8/8
@@ -36,6 +37,7 @@ ErrorCode.InvalidMessage=Wprowadzona depesza jest nieprawidłowa.
3637

3738

3839

40+
3941
Intensity.-=Słaby
4042
Intensity.+=Silny
4143
Intensity.VC=W pobliżu
@@ -88,3 +90,4 @@ WeatherChangeType.PROB=Prawdopodobieństwo
8890
TimeIndicator.AT=o
8991
TimeIndicator.FM=od
9092
TimeIndicator.TL=do
93+

metarParser-commons/src/main/resources/internationalization/messages_ru_RU.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
CloudQuantity.BKN=разорванная
2+
CloudQuantity.CLR=ясное небо
23
CloudQuantity.FEW=незначительная
34
CloudQuantity.NSC=нет значительной облачности
45
CloudQuantity.OVC=сплошная

metarParser-commons/src/main/resources/internationalization/messages_tr_TR.properties

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
CloudQuantity.BKN=parçalı çok bulutlu
2+
CloudQuantity.CLR=gökyüzü açık
23
CloudQuantity.FEW=az bulutlu
34
CloudQuantity.NSC=önemli bulut yok.
45
CloudQuantity.OVC=tamamen kapalı
@@ -33,12 +34,6 @@ DepositCoverage.FROM_51_TO_100=%51 ila %100 arası
3334
3435
DepositThickness.//=rapor edilmedi
3536
DepositThickness.00=1 mm'den daha az
36-
DepositThickness.THICKNESS_10=10 cm
37-
DepositThickness.THICKNESS_15=15 cm
38-
DepositThickness.THICKNESS_20=20 cm
39-
DepositThickness.THICKNESS_25=25 cm
40-
DepositThickness.THICKNESS_30=30 cm
41-
DepositThickness.THICKNESS_35=35 cm
4237
DepositThickness.98=40 cm veya daha fazla
4338
DepositThickness.99=kullanılmaz
4439

metarParser-commons/src/main/resources/internationalization/messages_zh_CN.properties

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
CloudQuantity.BKN=5-7分云
2+
CloudQuantity.CLR=天空晴朗
23
CloudQuantity.FEW=少云
34
CloudQuantity.NSC=没有明显的云。
45
CloudQuantity.OVC=满天云
@@ -21,9 +22,10 @@ DepositBrakingCapacity.//=未报告
2122
DepositBrakingCapacity.91=差
2223
DepositBrakingCapacity.92=中差
2324
DepositBrakingCapacity.93=中
24-
DepositBrakingCapacity.MEDIUM_GOOD=良好
25+
DepositBrakingCapacity.94=良好
2526
DepositBrakingCapacity.95=好
2627
DepositBrakingCapacity.99=数字不可靠
28+
DepositBrakingCapacity.default=摩擦系数为 {0}
2729

2830
DepositCoverage.NOT_REPORTED=未报告
2931
DepositCoverage.LESS_10=低于10%
@@ -33,14 +35,15 @@ DepositCoverage.FROM_51_TO_100=从51%到100%
3335

3436
DepositThickness.//=未报告
3537
DepositThickness.00=小于 1 毫米
36-
DepositThickness.THICKNESS_10=10 厘米
37-
DepositThickness.THICKNESS_15=15 厘米
38-
DepositThickness.THICKNESS_20=20 厘米
39-
DepositThickness.THICKNESS_25=25 厘米
40-
DepositThickness.THICKNESS_30=30 厘米
41-
DepositThickness.THICKNESS_35=35 厘米
38+
DepositThickness.92=10 厘米
39+
DepositThickness.93=15 厘米
40+
DepositThickness.94=20 厘米
41+
DepositThickness.95=25 厘米
42+
DepositThickness.96=30 厘米
43+
DepositThickness.97=35 厘米
4244
DepositThickness.98=40厘米或以上
4345
DepositThickness.99=已关闭
46+
DepositThickness.default={0} 毫米
4447

4548
DepositType.NOT_REPORTED=未报告
4649
DepositType.CLEAR_DRY=干净
@@ -67,6 +70,16 @@ Error.prefix=发生错误。 错误代码 n°
6770
ErrorCode.AirportNotFound=找不到此消息的机场。
6871
ErrorCode.InvalidMessage=输入的消息无效。
6972

73+
Flag.AMD=修正后的TAF
74+
Flag.AUTO=自动生成的METAR
75+
Flag.CNL=已取消的TAF
76+
Flag.COR=已更正的METAR/TAF
77+
Flag.NIL=暂无数据
78+
79+
IcingIntensity.0=微量结冰
80+
IcingIntensity.1=轻度混合结冰
81+
IcingIntensity.2=云中轻度霜冻结冰
82+
IcingIntensity.7=重度混合结冰
7083

7184
Indicator.M=小于
7285
Indicator.P=大于
@@ -133,6 +146,9 @@ Remark.Obscuration={0} 层位于 {1} 英尺,由 {2} 组成
133146
Remark.ON=在
134147
Remark.NXT=下一个
135148
Remark.PeakWind=在 {2}\:{3} 有位于 {0} 度,风速 {1} 节的峰值风
149+
Remark.PRESFR=气压骤降
150+
Remark.PRESRR=气压骤升
151+
Remark.Sea.Level.Pressure=海平面气压{0} 百帕
136152
Remark.TORNADO=龙卷风
137153
Remark.VIRGA=幡状云
138154
Remark.WATERSPOUT=水龙卷
@@ -188,6 +204,7 @@ ToString.descriptive=描述
188204
ToString.dew.point=露点
189205
ToString.end.day.month=当月的结束日
190206
ToString.end.hour.day=当日的结束小时
207+
ToString.flags=旗子
191208
ToString.height.feet=高度(英尺)
192209
ToString.height.meter=高度(米)
193210
ToString.intensity=强度
@@ -223,3 +240,8 @@ ToString.wind.min.variation=最小风力变化量
223240
ToString.wind.max.variation=最大风力变化量
224241
ToString.wind.speed=速度
225242
ToString.wind.unit=单位
243+
244+
TurbulenceIntensity.0=无
245+
TurbulenceIntensity.1=轻度乱流
246+
TurbulenceIntensity.8=云中偶发重度颠簸
247+
TurbulenceIntensity.X=极端乱流

metarParser-entities/src/main/java/io/github/mivek/enums/CloudQuantity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
* @author mivek
1111
*/
1212
public enum CloudQuantity {
13+
/** Clear. */
14+
CLR,
1315
/** Sky clear. */
1416
SKC,
1517
/** Few clouds. */

0 commit comments

Comments
 (0)