Author: duncan
Date: Fri Dec 21 06:07:16 2007
New Revision: 10229
Log:
White space changes
Modified:
branches/rel-1/freevo/src/util/pymetar.py
Modified: branches/rel-1/freevo/src/util/pymetar.py
==============================================================================
--- branches/rel-1/freevo/src/util/pymetar.py (original)
+++ branches/rel-1/freevo/src/util/pymetar.py Fri Dec 21 06:07:16 2007
@@ -100,291 +100,291 @@
# format of their response, this is not to save bandwidth :-)
#
_WeatherConditions = {
- "DZ" : ("Drizzle", "rain", {
- "" : "Moderate drizzle",
- "-" : "Light drizzle",
- "+" : "Heavy drizzle",
- "VC" : "Drizzle in the vicinity",
- "MI" : "Shallow drizzle",
- "BC" : "Patches of drizzle",
- "PR" : "Partial drizzle",
- "TS" : ("Thunderstorm", "storm"),
- "BL" : "Windy drizzle",
- "SH" : "Showers",
- "DR" : "Drifting drizzle",
- "FZ" : "Freezing drizzle",
- }),
- "RA" : ("Rain", "rain", {
- "" : "Moderate rain",
- "-" : "Light rain",
- "+" : "Heavy rain",
- "VC" : "Rain in the vicinity",
- "MI" : "Shallow rain",
- "BC" : "Patches of rain",
- "PR" : "Partial rainfall",
- "TS" : ("Thunderstorm", "storm"),
- "BL" : "Blowing rainfall",
- "SH" : "Rain showers",
- "DR" : "Drifting rain",
- "FZ" : "Freezing rain",
- }),
- "SN" : ("Snow", "snow", {
- "" : "Moderate snow",
- "-" : "Light snow",
- "+" : "Heavy snow",
- "VC" : "Snow in the vicinity",
- "MI" : "Shallow snow",
- "BC" : "Patches of snow",
- "PR" : "Partial snowfall",
- "TS" : ("Snowstorm", "storm"),
- "BL" : "Blowing snowfall",
- "SH" : "Snowfall showers",
- "DR" : "Drifting snow",
- "FZ" : "Freezing snow",
- }),
- "SG" : ("Snow grains", "snow", {
- "" : "Moderate snow grains",
- "-" : "Light snow grains",
- "+" : "Heavy snow grains",
- "VC" : "Snow grains in the vicinity",
- "MI" : "Shallow snow grains",
- "BC" : "Patches of snow grains",
- "PR" : "Partial snow grains",
- "TS" : ("Snowstorm", "storm"),
- "BL" : "Blowing snow grains",
- "SH" : "Snow grain showers",
- "DR" : "Drifting snow grains",
- "FZ" : "Freezing snow grains",
- }),
- "IC" : ("Ice crystals", "snow", {
- "" : "Moderate ice crystals",
- "-" : "Few ice crystals",
- "+" : "Heavy ice crystals",
- "VC" : "Ice crystals in the vicinity",
- "BC" : "Patches of ice crystals",
- "PR" : "Partial ice crystals",
- "TS" : ("Ice crystal storm", "storm"),
- "BL" : "Blowing ice crystals",
- "SH" : "Showers of ice crystals",
- "DR" : "Drifting ice crystals",
- "FZ" : "Freezing ice crystals",
- }),
- "PE" : ("Ice pellets", "snow", {
- "" : "Moderate ice pellets",
- "-" : "Few ice pellets",
- "+" : "Heavy ice pellets",
- "VC" : "Ice pellets in the vicinity",
- "MI" : "Shallow ice pellets",
- "BC" : "Patches of ice pellets",
- "PR" : "Partial ice pellets",
- "TS" : ("Ice pellets storm", "storm"),
- "BL" : "Blowing ice pellets",
- "SH" : "Showers of ice pellets",
- "DR" : "Drifting ice pellets",
- "FZ" : "Freezing ice pellets",
- }),
- "GR" : ("Hail", "rain", {
- "" : "Moderate hail",
- "-" : "Light hail",
- "+" : "Heavy hail",
- "VC" : "Hail in the vicinity",
- "MI" : "Shallow hail",
- "BC" : "Patches of hail",
- "PR" : "Partial hail",
- "TS" : ("Hailstorm", "storm"),
- "BL" : "Blowing hail",
- "SH" : "Hail showers",
- "DR" : "Drifting hail",
- "FZ" : "Freezing hail",
- }),
- "GS" : ("Small hail", "rain", {
- "" : "Moderate small hail",
- "-" : "Light small hail",
- "+" : "Heavy small hail",
- "VC" : "Small hail in the vicinity",
- "MI" : "Shallow small hail",
- "BC" : "Patches of small hail",
- "PR" : "Partial small hail",
- "TS" : ("Small hailstorm", "storm"),
- "BL" : "Blowing small hail",
- "SH" : "Showers of small hail",
- "DR" : "Drifting small hail",
- "FZ" : "Freezing small hail",
- }),
- "UP" : ("Precipitation", "rain", {
- "" : "Moderate precipitation",
- "-" : "Light precipitation",
- "+" : "Heavy precipitation",
- "VC" : "Precipitation in the vicinity",
- "MI" : "Shallow precipitation",
- "BC" : "Patches of precipitation",
- "PR" : "Partial precipitation",
- "TS" : ("Unknown thunderstorm", "storm"),
- "BL" : "Blowing precipitation",
- "SH" : "Showers, type unknown",
- "DR" : "Drifting precipitation",
- "FZ" : "Freezing precipitation",
- }),
- "BR" : ("Mist", "fog", {
- "" : "Moderate mist",
- "-" : "Light mist",
- "+" : "Thick mist",
- "VC" : "Mist in the vicinity",
- "MI" : "Shallow mist",
- "BC" : "Patches of mist",
- "PR" : "Partial mist",
- "BL" : "Mist with wind",
- "DR" : "Drifting mist",
- "FZ" : "Freezing mist",
- }),
- "FG" : ("Fog", "fog", {
- "" : "Moderate fog",
- "-" : "Light fog",
- "+" : "Thick fog",
- "VC" : "Fog in the vicinity",
- "MI" : "Shallow fog",
- "BC" : "Patches of fog",
- "PR" : "Partial fog",
- "BL" : "Fog with wind",
- "DR" : "Drifting fog",
- "FZ" : "Freezing fog",
- }),
- "FU" : ("Smoke", "fog", {
- "" : "Moderate smoke",
- "-" : "Thin smoke",
- "+" : "Thick smoke",
- "VC" : "Smoke in the vicinity",
- "MI" : "Shallow smoke",
- "BC" : "Patches of smoke",
- "PR" : "Partial smoke",
- "TS" : ("Smoke w/ thunders", "storm"),
- "BL" : "Smoke with wind",
- "DR" : "Drifting smoke",
- }),
- "VA" : ("Volcanic ash", "fog", {
- "" : "Moderate volcanic ash",
- "+" : "Thick volcanic ash",
- "VC" : "Volcanic ash in the vicinity",
- "MI" : "Shallow volcanic ash",
- "BC" : "Patches of volcanic ash",
- "PR" : "Partial volcanic ash",
- "TS" : ("Volcanic ash w/ thunders", "storm"),
- "BL" : "Blowing volcanic ash",
- "SH" : "Showers of volcanic ash",
- "DR" : "Drifting volcanic ash",
- "FZ" : "Freezing volcanic ash",
- }),
- "SA" : ("Sand", "fog", {
- "" : "Moderate sand",
- "-" : "Light sand",
- "+" : "Heavy sand",
- "VC" : "Sand in the vicinity",
- "BC" : "Patches of sand",
- "PR" : "Partial sand",
- "BL" : "Blowing sand",
- "DR" : "Drifting sand",
- }),
- "HZ" : ("Haze", "fog", {
- "" : "Moderate haze",
- "-" : "Light haze",
- "+" : "Thick haze",
- "VC" : "Haze in the vicinity",
- "MI" : "Shallow haze",
- "BC" : "Patches of haze",
- "PR" : "Partial haze",
- "BL" : "Haze with wind",
- "DR" : "Drifting haze",
- "FZ" : "Freezing haze",
- }),
- "PY" : ("Sprays", "fog", {
- "" : "Moderate sprays",
- "-" : "Light sprays",
- "+" : "Heavy sprays",
- "VC" : "Sprays in the vicinity",
- "MI" : "Shallow sprays",
- "BC" : "Patches of sprays",
- "PR" : "Partial sprays",
- "BL" : "Blowing sprays",
- "DR" : "Drifting sprays",
- "FZ" : "Freezing sprays",
- }),
- "DU" : ("Dust", "fog", {
- "" : "Moderate dust",
- "-" : "Light dust",
- "+" : "Heavy dust",
- "VC" : "Dust in the vicinity",
- "BC" : "Patches of dust",
- "PR" : "Partial dust",
- "BL" : "Blowing dust",
- "DR" : "Drifting dust",
- }),
- "SQ" : ("Squall", "storm", {
- "" : "Moderate squall",
- "-" : "Light squall",
- "+" : "Heavy squall",
- "VC" : "Squall in the vicinity",
- "PR" : "Partial squall",
- "TS" : "Thunderous squall",
- "BL" : "Blowing squall",
- "DR" : "Drifting squall",
- "FZ" : "Freezing squall",
- }),
- "SS" : ("Sandstorm", "fog", {
- "" : "Moderate sandstorm",
- "-" : "Light sandstorm",
- "+" : "Heavy sandstorm",
- "VC" : "Sandstorm in the vicinity",
- "MI" : "Shallow sandstorm",
- "PR" : "Partial sandstorm",
- "TS" : ("Thunderous sandstorm", "storm"),
- "BL" : "Blowing sandstorm",
- "DR" : "Drifting sandstorm",
- "FZ" : "Freezing sandstorm",
- }),
- "DS" : ("Duststorm", "fog", {
- "" : "Moderate duststorm",
- "-" : "Light duststorm",
- "+" : "Heavy duststorm",
- "VC" : "Duststorm in the vicinity",
- "MI" : "Shallow duststorm",
- "PR" : "Partial duststorm",
- "TS" : ("Thunderous duststorm", "storm"),
- "BL" : "Blowing duststorm",
- "DR" : "Drifting duststorm",
- "FZ" : "Freezing duststorm",
- }),
- "PO" : ("Dustwhirls", "fog", {
- "" : "Moderate dustwhirls",
- "-" : "Light dustwhirls",
- "+" : "Heavy dustwhirls",
- "VC" : "Dustwhirls in the vicinity",
- "MI" : "Shallow dustwhirls",
- "BC" : "Patches of dustwhirls",
- "PR" : "Partial dustwhirls",
- "BL" : "Blowing dustwhirls",
- "DR" : "Drifting dustwhirls",
- }),
- "+FC" : ("Tornado", "storm", {
- "" : "Moderate tornado",
- "+" : "Raging tornado",
- "VC" : "Tornado in the vicinity",
- "PR" : "Partial tornado",
- "TS" : "Thunderous tornado",
- "BL" : "Tornado",
- "DR" : "Drifting tornado",
- "FZ" : "Freezing tornado",
- }),
- "FC" : ("Funnel cloud", "fog", {
- "" : "Moderate funnel cloud",
- "-" : "Light funnel cloud",
- "+" : "Thick funnel cloud",
- "VC" : "Funnel cloud in the vicinity",
- "MI" : "Shallow funnel cloud",
- "BC" : "Patches of funnel cloud",
- "PR" : "Partial funnel cloud",
- "BL" : "Funnel cloud w/ wind",
- "DR" : "Drifting funnel cloud",
- }),
+ "DZ" : ("Drizzle", "rain", {
+ "" : "Moderate drizzle",
+ "-" : "Light drizzle",
+ "+" : "Heavy drizzle",
+ "VC" : "Drizzle in the vicinity",
+ "MI" : "Shallow drizzle",
+ "BC" : "Patches of drizzle",
+ "PR" : "Partial drizzle",
+ "TS" : ("Thunderstorm", "storm"),
+ "BL" : "Windy drizzle",
+ "SH" : "Showers",
+ "DR" : "Drifting drizzle",
+ "FZ" : "Freezing drizzle",
+ }),
+ "RA" : ("Rain", "rain", {
+ "" : "Moderate rain",
+ "-" : "Light rain",
+ "+" : "Heavy rain",
+ "VC" : "Rain in the vicinity",
+ "MI" : "Shallow rain",
+ "BC" : "Patches of rain",
+ "PR" : "Partial rainfall",
+ "TS" : ("Thunderstorm", "storm"),
+ "BL" : "Blowing rainfall",
+ "SH" : "Rain showers",
+ "DR" : "Drifting rain",
+ "FZ" : "Freezing rain",
+ }),
+ "SN" : ("Snow", "snow", {
+ "" : "Moderate snow",
+ "-" : "Light snow",
+ "+" : "Heavy snow",
+ "VC" : "Snow in the vicinity",
+ "MI" : "Shallow snow",
+ "BC" : "Patches of snow",
+ "PR" : "Partial snowfall",
+ "TS" : ("Snowstorm", "storm"),
+ "BL" : "Blowing snowfall",
+ "SH" : "Snowfall showers",
+ "DR" : "Drifting snow",
+ "FZ" : "Freezing snow",
+ }),
+ "SG" : ("Snow grains", "snow", {
+ "" : "Moderate snow grains",
+ "-" : "Light snow grains",
+ "+" : "Heavy snow grains",
+ "VC" : "Snow grains in the vicinity",
+ "MI" : "Shallow snow grains",
+ "BC" : "Patches of snow grains",
+ "PR" : "Partial snow grains",
+ "TS" : ("Snowstorm", "storm"),
+ "BL" : "Blowing snow grains",
+ "SH" : "Snow grain showers",
+ "DR" : "Drifting snow grains",
+ "FZ" : "Freezing snow grains",
+ }),
+ "IC" : ("Ice crystals", "snow", {
+ "" : "Moderate ice crystals",
+ "-" : "Few ice crystals",
+ "+" : "Heavy ice crystals",
+ "VC" : "Ice crystals in the vicinity",
+ "BC" : "Patches of ice crystals",
+ "PR" : "Partial ice crystals",
+ "TS" : ("Ice crystal storm", "storm"),
+ "BL" : "Blowing ice crystals",
+ "SH" : "Showers of ice crystals",
+ "DR" : "Drifting ice crystals",
+ "FZ" : "Freezing ice crystals",
+ }),
+ "PE" : ("Ice pellets", "snow", {
+ "" : "Moderate ice pellets",
+ "-" : "Few ice pellets",
+ "+" : "Heavy ice pellets",
+ "VC" : "Ice pellets in the vicinity",
+ "MI" : "Shallow ice pellets",
+ "BC" : "Patches of ice pellets",
+ "PR" : "Partial ice pellets",
+ "TS" : ("Ice pellets storm", "storm"),
+ "BL" : "Blowing ice pellets",
+ "SH" : "Showers of ice pellets",
+ "DR" : "Drifting ice pellets",
+ "FZ" : "Freezing ice pellets",
+ }),
+ "GR" : ("Hail", "rain", {
+ "" : "Moderate hail",
+ "-" : "Light hail",
+ "+" : "Heavy hail",
+ "VC" : "Hail in the vicinity",
+ "MI" : "Shallow hail",
+ "BC" : "Patches of hail",
+ "PR" : "Partial hail",
+ "TS" : ("Hailstorm", "storm"),
+ "BL" : "Blowing hail",
+ "SH" : "Hail showers",
+ "DR" : "Drifting hail",
+ "FZ" : "Freezing hail",
+ }),
+ "GS" : ("Small hail", "rain", {
+ "" : "Moderate small hail",
+ "-" : "Light small hail",
+ "+" : "Heavy small hail",
+ "VC" : "Small hail in the vicinity",
+ "MI" : "Shallow small hail",
+ "BC" : "Patches of small hail",
+ "PR" : "Partial small hail",
+ "TS" : ("Small hailstorm", "storm"),
+ "BL" : "Blowing small hail",
+ "SH" : "Showers of small hail",
+ "DR" : "Drifting small hail",
+ "FZ" : "Freezing small hail",
+ }),
+ "UP" : ("Precipitation", "rain", {
+ "" : "Moderate precipitation",
+ "-" : "Light precipitation",
+ "+" : "Heavy precipitation",
+ "VC" : "Precipitation in the vicinity",
+ "MI" : "Shallow precipitation",
+ "BC" : "Patches of precipitation",
+ "PR" : "Partial precipitation",
+ "TS" : ("Unknown thunderstorm", "storm"),
+ "BL" : "Blowing precipitation",
+ "SH" : "Showers, type unknown",
+ "DR" : "Drifting precipitation",
+ "FZ" : "Freezing precipitation",
+ }),
+ "BR" : ("Mist", "fog", {
+ "" : "Moderate mist",
+ "-" : "Light mist",
+ "+" : "Thick mist",
+ "VC" : "Mist in the vicinity",
+ "MI" : "Shallow mist",
+ "BC" : "Patches of mist",
+ "PR" : "Partial mist",
+ "BL" : "Mist with wind",
+ "DR" : "Drifting mist",
+ "FZ" : "Freezing mist",
+ }),
+ "FG" : ("Fog", "fog", {
+ "" : "Moderate fog",
+ "-" : "Light fog",
+ "+" : "Thick fog",
+ "VC" : "Fog in the vicinity",
+ "MI" : "Shallow fog",
+ "BC" : "Patches of fog",
+ "PR" : "Partial fog",
+ "BL" : "Fog with wind",
+ "DR" : "Drifting fog",
+ "FZ" : "Freezing fog",
+ }),
+ "FU" : ("Smoke", "fog", {
+ "" : "Moderate smoke",
+ "-" : "Thin smoke",
+ "+" : "Thick smoke",
+ "VC" : "Smoke in the vicinity",
+ "MI" : "Shallow smoke",
+ "BC" : "Patches of smoke",
+ "PR" : "Partial smoke",
+ "TS" : ("Smoke w/ thunders", "storm"),
+ "BL" : "Smoke with wind",
+ "DR" : "Drifting smoke",
+ }),
+ "VA" : ("Volcanic ash", "fog", {
+ "" : "Moderate volcanic ash",
+ "+" : "Thick volcanic ash",
+ "VC" : "Volcanic ash in the vicinity",
+ "MI" : "Shallow volcanic ash",
+ "BC" : "Patches of volcanic ash",
+ "PR" : "Partial volcanic ash",
+ "TS" : ("Volcanic ash w/ thunders", "storm"),
+ "BL" : "Blowing volcanic ash",
+ "SH" : "Showers of volcanic ash",
+ "DR" : "Drifting volcanic ash",
+ "FZ" : "Freezing volcanic ash",
+ }),
+ "SA" : ("Sand", "fog", {
+ "" : "Moderate sand",
+ "-" : "Light sand",
+ "+" : "Heavy sand",
+ "VC" : "Sand in the vicinity",
+ "BC" : "Patches of sand",
+ "PR" : "Partial sand",
+ "BL" : "Blowing sand",
+ "DR" : "Drifting sand",
+ }),
+ "HZ" : ("Haze", "fog", {
+ "" : "Moderate haze",
+ "-" : "Light haze",
+ "+" : "Thick haze",
+ "VC" : "Haze in the vicinity",
+ "MI" : "Shallow haze",
+ "BC" : "Patches of haze",
+ "PR" : "Partial haze",
+ "BL" : "Haze with wind",
+ "DR" : "Drifting haze",
+ "FZ" : "Freezing haze",
+ }),
+ "PY" : ("Sprays", "fog", {
+ "" : "Moderate sprays",
+ "-" : "Light sprays",
+ "+" : "Heavy sprays",
+ "VC" : "Sprays in the vicinity",
+ "MI" : "Shallow sprays",
+ "BC" : "Patches of sprays",
+ "PR" : "Partial sprays",
+ "BL" : "Blowing sprays",
+ "DR" : "Drifting sprays",
+ "FZ" : "Freezing sprays",
+ }),
+ "DU" : ("Dust", "fog", {
+ "" : "Moderate dust",
+ "-" : "Light dust",
+ "+" : "Heavy dust",
+ "VC" : "Dust in the vicinity",
+ "BC" : "Patches of dust",
+ "PR" : "Partial dust",
+ "BL" : "Blowing dust",
+ "DR" : "Drifting dust",
+ }),
+ "SQ" : ("Squall", "storm", {
+ "" : "Moderate squall",
+ "-" : "Light squall",
+ "+" : "Heavy squall",
+ "VC" : "Squall in the vicinity",
+ "PR" : "Partial squall",
+ "TS" : "Thunderous squall",
+ "BL" : "Blowing squall",
+ "DR" : "Drifting squall",
+ "FZ" : "Freezing squall",
+ }),
+ "SS" : ("Sandstorm", "fog", {
+ "" : "Moderate sandstorm",
+ "-" : "Light sandstorm",
+ "+" : "Heavy sandstorm",
+ "VC" : "Sandstorm in the vicinity",
+ "MI" : "Shallow sandstorm",
+ "PR" : "Partial sandstorm",
+ "TS" : ("Thunderous sandstorm", "storm"),
+ "BL" : "Blowing sandstorm",
+ "DR" : "Drifting sandstorm",
+ "FZ" : "Freezing sandstorm",
+ }),
+ "DS" : ("Duststorm", "fog", {
+ "" : "Moderate duststorm",
+ "-" : "Light duststorm",
+ "+" : "Heavy duststorm",
+ "VC" : "Duststorm in the vicinity",
+ "MI" : "Shallow duststorm",
+ "PR" : "Partial duststorm",
+ "TS" : ("Thunderous duststorm", "storm"),
+ "BL" : "Blowing duststorm",
+ "DR" : "Drifting duststorm",
+ "FZ" : "Freezing duststorm",
+ }),
+ "PO" : ("Dustwhirls", "fog", {
+ "" : "Moderate dustwhirls",
+ "-" : "Light dustwhirls",
+ "+" : "Heavy dustwhirls",
+ "VC" : "Dustwhirls in the vicinity",
+ "MI" : "Shallow dustwhirls",
+ "BC" : "Patches of dustwhirls",
+ "PR" : "Partial dustwhirls",
+ "BL" : "Blowing dustwhirls",
+ "DR" : "Drifting dustwhirls",
+ }),
+ "+FC" : ("Tornado", "storm", {
+ "" : "Moderate tornado",
+ "+" : "Raging tornado",
+ "VC" : "Tornado in the vicinity",
+ "PR" : "Partial tornado",
+ "TS" : "Thunderous tornado",
+ "BL" : "Tornado",
+ "DR" : "Drifting tornado",
+ "FZ" : "Freezing tornado",
+ }),
+ "FC" : ("Funnel cloud", "fog", {
+ "" : "Moderate funnel cloud",
+ "-" : "Light funnel cloud",
+ "+" : "Thick funnel cloud",
+ "VC" : "Funnel cloud in the vicinity",
+ "MI" : "Shallow funnel cloud",
+ "BC" : "Patches of funnel cloud",
+ "PR" : "Partial funnel cloud",
+ "BL" : "Funnel cloud w/ wind",
+ "DR" : "Drifting funnel cloud",
+ }),
}
class WeatherReport:
@@ -425,7 +425,7 @@
self.latf=None
self.longf=None
- def __init__(self, MetarStationCode = None):
+ def __init__(self, MetarStationCode=None):
"""Clear all fields and fill in wanted station id."""
self._ClearAllFields()
self.givenstationid=MetarStationCode
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
