diff --git a/config.py b/config.py index 823b40b..b093e70 100755 --- a/config.py +++ b/config.py @@ -115,7 +115,8 @@ openweathersq9atk = OpenWeatherSq9atk( # meteoalarm_sq9atk # ----------------- from meteoalarm_sq9atk import MeteoalarmSq9atk -meteoalarmsq9atk = MeteoalarmSq9atk(region="PL008") +#meteoalarmsq9atk = MeteoalarmSq9atk(region="PL008") +meteoalarmsq9atk = MeteoalarmSq9atk(region="IT003") # testowo Lombardia # PL001-Mazowieckie # PL002-Lubuskie # PL003-Zachodniopomorskie @@ -134,6 +135,7 @@ meteoalarmsq9atk = MeteoalarmSq9atk(region="PL008") # PL016-Podlaskie # PL801-Pomorze Wschodnie # PL802-Pomorze Zachodnie + # IT003-Lombardia # ------------- @@ -334,7 +336,7 @@ from radioactive_sq9atk import RadioactiveSq9atk radioactivesq9atk = RadioactiveSq9atk( language=pl_google, service_url="http://radioactiveathome.org/map/", - sensor_id=6314 + sensor_id=635 #czujnik w centrum Krakowa ## więcej czujników na stronie http://radioactiveathome.org/map/ ) diff --git a/meteoalarm_sq9atk.py b/meteoalarm_sq9atk.py index 5e6148f..0d09b4a 100755 --- a/meteoalarm_sq9atk.py +++ b/meteoalarm_sq9atk.py @@ -47,7 +47,7 @@ class MeteoalarmSq9atk(SR0WXModule): 'PL011':"łódzkiego", 'PL012':"wielkopolskiego", 'PL013':"kujawsko_pomorskiego", 'PL014':"warminsko_mazurskiego", 'PL015':"lubelskiego", 'PL016':"podlaskiego", - 'IE003':"dolnoslaskiego", + 'IT003':"Lombardia", } def getDataFromUrl(self, url): @@ -67,11 +67,13 @@ class MeteoalarmSq9atk(SR0WXModule): for line in self.downloadFile(url).split('\n'): matches = r.findall(line) if len(matches) is not 0 and int(matches[0][0])!=0: - result = [ + warn = " ".join([ self.warnings[ int(matches[0][0]) ], self.warningsLevel, self.warningsLevels[ int(matches[0][1]) ], - ] + ]) + result.append(warn) + result.append("_") return " ".join(result) diff --git a/pl_google/lombardia.ogg b/pl_google/lombardia.ogg new file mode 100644 index 0000000..a6aa299 Binary files /dev/null and b/pl_google/lombardia.ogg differ