devzilla/discordBot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: отсортирован _WEATHER_MAPPING по убыванию длины ключей для корректного substring-matching

Browse Source
This commit is contained in:
deadzilla 2026-07-11 23:27:17 +05:00
parent b5cbeecb61
commit 1fa6deaf67
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
utils/pogoda.py
View File

@ -126,43 +126,46 @@ def wmo_to_russian(code: Optional[int]) -> str:
_WEATHER_MAPPING = [ _WEATHER_MAPPING = [
# Отсортировано по убыванию длины ключа для корректного substring-matching:
# более длинные фразы проверяются первыми, чтобы "Light rain" не совпал
# раньше "Light rain shower".
("Moderate or heavy freezing rain at a distance", "Ледяной дождь"), ("Moderate or heavy freezing rain at a distance", "Ледяной дождь"),
("Moderate or heavy sleet at a distance", "Слякоть"),
("Moderate or heavy freezing rain in area", "Ледяной дождь"), ("Moderate or heavy freezing rain in area", "Ледяной дождь"),
("Moderate or heavy sleet at a distance", "Слякоть"),
("Moderate or heavy sleet in area", "Слякоть"), ("Moderate or heavy sleet in area", "Слякоть"),
("Moderate or heavy rain at times", "Дождь"),
("Moderate or heavy snow at times", "Снег"),
("Moderate or heavy snow in area", "Снег"), ("Moderate or heavy snow in area", "Снег"),
("Moderate or heavy rain in area", "Дождь"), ("Moderate or heavy rain in area", "Дождь"),
("Thundery outbreaks in nearby", "Гроза вблизи"), ("Thundery outbreaks in nearby", "Гроза вблизи"),
("Moderate or heavy rain at times", "Дождь"), ("Moderate or light sleet", "Слякоть"),
("Moderate or heavy snow at times", "Снег"), ("Moderate rain at times", "Умеренный дождь"),
("Patchy light drizzle", "Местами лёгкая морось"), ("Patchy light drizzle", "Местами лёгкая морось"),
("Patchy light snow", "Местами лёгкий снег"),
("Heavy freezing rain", "Сильный ледяной дождь"), ("Heavy freezing rain", "Сильный ледяной дождь"),
("Light freezing rain", "Лёгкий ледяной дождь"), ("Light freezing rain", "Лёгкий ледяной дождь"),
("Light rain shower", "Небольшой дождь"), ("Patchy sleet nearby", "Местами слякоть"),
("Heavy rain shower", "Сильный дождь"), ("Heavy rain at times", "Сильный дождь"),
("Moderate or light sleet", "Слякоть"),
("Patchy rain nearby", "Местами дождь"), ("Patchy rain nearby", "Местами дождь"),
("Patchy snow nearby", "Местами снег"), ("Patchy snow nearby", "Местами снег"),
("Patchy sleet nearby", "Местами слякоть"), ("Patchy light snow", "Местами лёгкий снег"),
("Moderate rain at times", "Умеренный дождь"), ("Light rain shower", "Небольшой дождь"),
("Heavy rain at times", "Сильный дождь"), ("Heavy rain shower", "Сильный дождь"),
("Moderate rain", "Умеренный дождь"), ("Moderate rain", "Умеренный дождь"),
("Moderate snow", "Умеренный снег"),
("Partly cloudy", "Переменная облачность"),
("Blowing snow", "Метель"),
("Light rain", "Небольшой дождь"), ("Light rain", "Небольшой дождь"),
("Heavy rain", "Сильный дождь"), ("Heavy rain", "Сильный дождь"),
("Light snow", "Небольшой снег"), ("Light snow", "Небольшой снег"),
("Moderate snow", "Умеренный снег"),
("Heavy snow", "Сильный снег"), ("Heavy snow", "Сильный снег"),
("Blowing snow", "Метель"),
("Partly cloudy", "Переменная облачность"),
("Overcast", "Пасмурно"), ("Overcast", "Пасмурно"),
("Cloudy", "Облачно"), ("Cloudy", "Облачно"),
("Foggy", "Туманно"), ("Foggy", "Туманно"),
("Fog", "Туман"),
("Mist", "Туман"),
("Haze", "Дымка"),
("Clear", "Ясно"), ("Clear", "Ясно"),
("Sunny", "Ясно"), ("Sunny", "Ясно"),
("Mist", "Туман"),
("Haze", "Дымка"),
("Fog", "Туман"),
] ]