From 3a38a571061d0854914547d648cdcfc36459318d Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Sun, 23 Dec 2018 12:32:59 +0100 Subject: [PATCH 1/3] [weather dataengine] envcan: support also "Mainly cloudy" forecast --- dataengines/weather/ions/data/envcan_i18n.dat | 1 + dataengines/weather/ions/envcan/ion_envcan.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/dataengines/weather/ions/data/envcan_i18n.dat b/dataengines/weather/ions/data/envcan_i18n.dat index 365d29ef2..ca1e229ec 100644 --- a/dataengines/weather/ions/data/envcan_i18n.dat +++ b/dataengines/weather/ions/data/envcan_i18n.dat @@ -161,6 +161,7 @@ weather forecast|Chance of wet snow or rain weather forecast|Clear weather forecast|Clearing weather forecast|Cloudy +weather forecast|Mainly cloudy weather forecast|Cloudy periods weather forecast|Cloudy with sunny periods weather forecast|Drizzle diff --git a/dataengines/weather/ions/envcan/ion_envcan.cpp b/dataengines/weather/ions/envcan/ion_envcan.cpp index ce4772f1f..1d6aa1ceb 100644 --- a/dataengines/weather/ions/envcan/ion_envcan.cpp +++ b/dataengines/weather/ions/envcan/ion_envcan.cpp @@ -213,6 +213,7 @@ QMap EnvCanadaIon::setupForecastIconMappi { QStringLiteral("a mix of sun and cloud"), PartlyCloudyDay }, { QStringLiteral("cloudy with sunny periods"), PartlyCloudyDay }, { QStringLiteral("partly cloudy"), PartlyCloudyDay }, + { QStringLiteral("mainly cloudy"), PartlyCloudyDay }, { QStringLiteral("mainly sunny"), FewCloudsDay }, { QStringLiteral("sunny"), ClearDay }, { QStringLiteral("blizzard"), Snow }, From ad0f6834a29afd34d1432788a771f72d6d40cf90 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Sun, 23 Dec 2018 12:37:29 +0100 Subject: [PATCH 2/3] [weather dataengine] Remove duplicated condition/forecast strings --- dataengines/weather/ions/data/envcan_i18n.dat | 2 -- dataengines/weather/ions/data/noaa_i18n.dat | 8 -------- 2 files changed, 10 deletions(-) diff --git a/dataengines/weather/ions/data/envcan_i18n.dat b/dataengines/weather/ions/data/envcan_i18n.dat index 365d29ef2..2bd343b2c 100644 --- a/dataengines/weather/ions/data/envcan_i18n.dat +++ b/dataengines/weather/ions/data/envcan_i18n.dat @@ -78,8 +78,6 @@ weather condition|Snow Crystals weather condition|Snow Grains weather condition|Squalls weather condition|Sunny -weather condition|Mainly Sunny -weather condition|Partly Cloudy weather condition|Thunderstorm with Hail weather condition|Thunderstorm with Rain weather condition|Thunderstorm with Sand or Dust Storm diff --git a/dataengines/weather/ions/data/noaa_i18n.dat b/dataengines/weather/ions/data/noaa_i18n.dat index 65ad37b84..1c74af14e 100644 --- a/dataengines/weather/ions/data/noaa_i18n.dat +++ b/dataengines/weather/ions/data/noaa_i18n.dat @@ -48,7 +48,6 @@ weather condition|Heavy Drizzle Fog weather condition|Heavy Drizzle Fog/Mist weather condition|Heavy Drizzle Ice Pellets weather condition|Heavy Drizzle Snow -weather condition|Heavy Drizzle Snow weather condition|Heavy Dust Storm weather condition|Heavy Freezing Drizzle weather condition|Heavy Freezing Drizzle Rain @@ -300,9 +299,6 @@ weather forecast|Flurries weather forecast|Chance Snow Showers weather forecast|Snow Showers Likely weather forecast|Snow Showers -weather forecast|Chance Snow Showers -weather forecast|Snow Showers Likely -weather forecast|Snow Showers weather forecast|Chance Drizzle weather forecast|Drizzle Likely weather forecast|Drizzle @@ -313,9 +309,6 @@ weather forecast|Heavy Rain weather forecast|Chance Rain Showers weather forecast|Rain Showers Likely weather forecast|Rain Showers -weather forecast|Chance Rain Showers -weather forecast|Rain Showers Likely -weather forecast|Rain Showers weather forecast|Sleet weather forecast|Smoke weather forecast|Freezing Fog @@ -345,5 +338,4 @@ weather forecast|Decreasing Clouds weather forecast|Becoming Sunny weather forecast|Clear weather forecast|Mostly Clear -weather forecast|Chance Thunderstorms weather forecast|Slight Chance Thunderstorms From 419097542fef18b285927202e3a1fe2fd004d2b9 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Tue, 1 Jan 2019 01:38:21 +0100 Subject: [PATCH 3/3] [weather dataengine] noaa: add more forecast strings found in use --- dataengines/weather/ions/data/noaa_i18n.dat | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dataengines/weather/ions/data/noaa_i18n.dat b/dataengines/weather/ions/data/noaa_i18n.dat index 65ad37b84..54d2588a5 100644 --- a/dataengines/weather/ions/data/noaa_i18n.dat +++ b/dataengines/weather/ions/data/noaa_i18n.dat @@ -290,6 +290,7 @@ weather forecast|Freezing Rain weather forecast|Chance Rain/Snow weather forecast|Rain/Snow Likely weather forecast|Rain/Snow +weather forecast|Slight Chance Snow weather forecast|Chance Snow weather forecast|Snow Likely weather forecast|Snow @@ -297,6 +298,7 @@ weather forecast|Heavy Snow weather forecast|Chance Flurries weather forecast|Flurries Likely weather forecast|Flurries +weather forecast|Slight Chance Snow Showers weather forecast|Chance Snow Showers weather forecast|Snow Showers Likely weather forecast|Snow Showers @@ -306,6 +308,7 @@ weather forecast|Snow Showers weather forecast|Chance Drizzle weather forecast|Drizzle Likely weather forecast|Drizzle +weather forecast|Slight Chance Rain weather forecast|Chance Rain weather forecast|Rain Likely weather forecast|Rain @@ -335,6 +338,7 @@ weather forecast|Cloudy weather forecast|Mostly Cloudy weather forecast|Partly Cloudy weather forecast|Mostly Sunny +weather forecast|Partly Sunny weather forecast|Sunny weather forecast|Increasing Clouds weather forecast|Becoming Cloudy