From 277f4eb4cd9d2fa9f71cef89a2e77081325581a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Ostolski?= Date: Sun, 22 Mar 2020 11:19:28 +0100 Subject: [PATCH] =?UTF-8?q?poprawka=20w=20module=20Meteoalarm=20-=20czytan?= =?UTF-8?q?y=20by=C5=82=20tylko=20pierwszy=20warning=20z=20kilku=20dla=20d?= =?UTF-8?q?anego=20regionu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.py | 6 ++++-- meteoalarm_sq9atk.py | 8 +++++--- pl_google/lombardia.ogg | Bin 0 -> 6672 bytes 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 pl_google/lombardia.ogg 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 0000000000000000000000000000000000000000..a6aa299522d6d402b68766e4e8dbd746766f4bfa GIT binary patch literal 6672 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