From 203bbedaa9343e77e09e47fcba20fd586a4705f4 Mon Sep 17 00:00:00 2001 From: PeterLaemmle Date: Fri, 19 Oct 2018 17:45:03 +0200 Subject: [PATCH 1/2] Update Telegram.py - Remove redundant concatenation - Ensure German descriptions in maps --- plugins/Telegram/Telegram.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Telegram/Telegram.py b/plugins/Telegram/Telegram.py index dc4cc6e..451fe54 100644 --- a/plugins/Telegram/Telegram.py +++ b/plugins/Telegram/Telegram.py @@ -100,9 +100,9 @@ def run(typ,freq,data): address = "+".join(data["msg"].split(')')[0].split('/',1)[1].replace('(',' ').split()) logging.debug("Retrieve maps from Google") - url = "+".join(["http://maps.googleapis.com/maps/api/staticmap?markers=", address, "&size=480x640&maptype=roadmap&zoom=16&key=", GoogleAPIKey]) + url = "".join(["http://maps.googleapis.com/maps/api/staticmap?markers=", address, "&size=480x640&maptype=roadmap&zoom=16&language=de&key=", GoogleAPIKey]) urllib.urlretrieve(url, "overview_map.png") - url = "+".join(["http://maps.googleapis.com/maps/api/staticmap?markers=", address, "&size=240x320&scale=2&maptype=hybrid&zoom=17&key=", GoogleAPIKey]) + url = "".join(["http://maps.googleapis.com/maps/api/staticmap?markers=", address, "&size=240x320&scale=2&maptype=hybrid&zoom=17&language=de&key=", GoogleAPIKey]) urllib.urlretrieve(url, "detail_map.png") # Send message and map with Telegram From 5e978fbb2aaa4d1cf261d785c68612572af4de32 Mon Sep 17 00:00:00 2001 From: Bastian Schroll Date: Tue, 23 Oct 2018 07:47:18 +0200 Subject: [PATCH 2/2] edit changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e81d70..e063972 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ##### Added - Pushover-Plugin: Priorität für einzelne RIC und ZVEI in config einstellbar [#378](https://github.com/Schrolli91/BOSWatch/pull/378) ##### Changed +- Kleinere Anpassungen im Telegram Plugin (Karten-Generierung) [#380](https://github.com/Schrolli91/BOSWatch/pull/380) ##### Deprecated ##### Removed - Notify-my-Andoird Plugin und Logging-Handler wegen Einstellung des Service entfernt [#374](https://github.com/Schrolli91/BOSWatch/pull/374)