Skip to content

Optional tile caching #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
teotomic wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Optional tile caching #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d0267e
Add optional CacheControl-based caching for faster re-rendering
teotomic Jun 19, 2020
4e3a47d
Cleaner implementation
teotomic Jun 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
setup(
name='staticmap',
packages=['staticmap'],
version='0.5.4',
version='0.5.5',
description='A small, python-based library for creating map images with lines and markers.',
author='Christoph Lingg',
author_email='christoph@komoot.de',
Expand Down
15 changes: 14 additions & 1 deletion staticmap/staticmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
import requests
from PIL import Image, ImageDraw

try:
from cachecontrol import CacheControl
except:
CacheControl = None


class Line:
def __init__(self, coords, color, width, simplify=True):
Expand Down Expand Up @@ -215,6 +220,13 @@ def __init__(self, width, height, padding_x=0, padding_y=0, url_template="http:/
self.reverse_y = reverse_y
self.background_color = background_color

# Optional cached session
if CacheControl is not None:
self.requests_sess = requests.session()
self.cached_sess = CacheControl(self.requests_sess)
else:
self.cached_sess = None

# features
self.markers = []
self.lines = []
Expand Down Expand Up @@ -412,7 +424,8 @@ def _draw_base_layer(self, image):
raise RuntimeError("could not download {} tiles: {}".format(len(tiles), tiles))

failed_tiles = []
futures = [thread_pool.submit(requests.get, tile[2], timeout=self.request_timeout, headers=self.headers) for tile in tiles]
request_fn = requests.get if self.cached_sess is None else self.cached_sess.get
futures = [thread_pool.submit(request_fn, tile[2], timeout=self.request_timeout, headers=self.headers) for tile in tiles]

for tile, future in zip(tiles, futures):
x, y, url = tile
Expand Down