From a75f712f5a153dee548fc878cec6e16faedf4967 Mon Sep 17 00:00:00 2001 From: KingsDev <63374258+KingsMMA@users.noreply.github.com> Date: Tue, 5 Mar 2024 19:37:33 +1000 Subject: [PATCH 1/2] Added support for http proxies --- tkintermapview/map_widget.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tkintermapview/map_widget.py b/tkintermapview/map_widget.py index e98616f..9bc6b55 100644 --- a/tkintermapview/map_widget.py +++ b/tkintermapview/map_widget.py @@ -32,6 +32,7 @@ def __init__(self, *args, database_path: str = None, use_database_only: bool = False, max_zoom: int = 19, + proxies: dict = {} **kwargs): super().__init__(*args, **kwargs) @@ -41,6 +42,7 @@ def __init__(self, *args, self.height = height self.corner_radius = corner_radius if corner_radius <= 30 else 30 # corner_radius can't be greater than 30 self.configure(width=self.width, height=self.height) + self.proxies = proxies # detect color of master widget for rounded corners if bg_color is None: @@ -493,11 +495,11 @@ def request_image(self, zoom: int, x: int, y: int, db_cursor=None) -> ImageTk.Ph # try to get the tile from the server try: url = self.tile_server.replace("{x}", str(x)).replace("{y}", str(y)).replace("{z}", str(zoom)) - image = Image.open(requests.get(url, stream=True, headers={"User-Agent": "TkinterMapView"}).raw) + image = Image.open(requests.get(url, stream=True, headers={"User-Agent": "TkinterMapView"}, proxies=self.proxies).raw) if self.overlay_tile_server is not None: url = self.overlay_tile_server.replace("{x}", str(x)).replace("{y}", str(y)).replace("{z}", str(zoom)) - image_overlay = Image.open(requests.get(url, stream=True, headers={"User-Agent": "TkinterMapView"}).raw) + image_overlay = Image.open(requests.get(url, stream=True, headers={"User-Agent": "TkinterMapView"}, proxies=self.proxies).raw) image = image.convert("RGBA") image_overlay = image_overlay.convert("RGBA") From d71d4325a30b15b89f9b0d70891e6faa561daaad Mon Sep 17 00:00:00 2001 From: KingsDev <63374258+KingsMMA@users.noreply.github.com> Date: Tue, 5 Mar 2024 19:38:25 +1000 Subject: [PATCH 2/2] Added missing comma MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 😭 --- tkintermapview/map_widget.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tkintermapview/map_widget.py b/tkintermapview/map_widget.py index 9bc6b55..f396fc8 100644 --- a/tkintermapview/map_widget.py +++ b/tkintermapview/map_widget.py @@ -32,7 +32,7 @@ def __init__(self, *args, database_path: str = None, use_database_only: bool = False, max_zoom: int = 19, - proxies: dict = {} + proxies: dict = {}, **kwargs): super().__init__(*args, **kwargs)