From c0bf850611b828c1d47582f36fc9e7a8cf863b05 Mon Sep 17 00:00:00 2001 From: Florian Pigorsch Date: Tue, 9 Apr 2024 20:45:47 +0200 Subject: [PATCH] fix typing issues --- examples/custom_objects.py | 4 ++-- examples/draw_gpx.py | 4 ++-- examples/frankfurt_newyork.py | 4 ++-- examples/freiburg_area.py | 4 ++-- examples/geodesic_circles.py | 4 ++-- examples/tile_providers.py | 4 ++-- examples/us_capitals.py | 4 ++-- staticmaps/context.py | 2 +- staticmaps/pillow_renderer.py | 6 +++--- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/custom_objects.py b/examples/custom_objects.py index e1da4b7..9c04098 100644 --- a/examples/custom_objects.py +++ b/examples/custom_objects.py @@ -157,8 +157,8 @@ def render_svg(self, renderer: staticmaps.SvgRenderer) -> None: # render png via cairo if staticmaps.cairo_is_supported(): - image = context.render_cairo(800, 500) - image.write_to_png("custom_objects.cairo.png") + cairo_image = context.render_cairo(800, 500) + cairo_image.write_to_png("custom_objects.cairo.png") # render svg svg_image = context.render_svg(800, 500) diff --git a/examples/draw_gpx.py b/examples/draw_gpx.py index f7e71e6..85a64ab 100644 --- a/examples/draw_gpx.py +++ b/examples/draw_gpx.py @@ -32,8 +32,8 @@ # render png via cairo if staticmaps.cairo_is_supported(): - image = context.render_cairo(800, 500) - image.write_to_png("running.cairo.png") + cairo_image = context.render_cairo(800, 500) + cairo_image.write_to_png("running.cairo.png") # render svg svg_image = context.render_svg(800, 500) diff --git a/examples/frankfurt_newyork.py b/examples/frankfurt_newyork.py index 5bae610..f9e41ad 100644 --- a/examples/frankfurt_newyork.py +++ b/examples/frankfurt_newyork.py @@ -21,8 +21,8 @@ # render png via cairo if staticmaps.cairo_is_supported(): - image = context.render_cairo(800, 500) - image.write_to_png("frankfurt_newyork.cairo.png") + cairo_image = context.render_cairo(800, 500) + cairo_image.write_to_png("frankfurt_newyork.cairo.png") # render svg svg_image = context.render_svg(800, 500) diff --git a/examples/freiburg_area.py b/examples/freiburg_area.py index 11558e2..e2e1a64 100644 --- a/examples/freiburg_area.py +++ b/examples/freiburg_area.py @@ -450,8 +450,8 @@ # render png via cairo if staticmaps.cairo_is_supported(): - image = context.render_cairo(800, 500) - image.write_to_png("freiburg_area.cairo.png") + cairo_image = context.render_cairo(800, 500) + cairo_image.write_to_png("freiburg_area.cairo.png") # render svg svg_image = context.render_svg(800, 500) diff --git a/examples/geodesic_circles.py b/examples/geodesic_circles.py index 805a867..51e63bc 100644 --- a/examples/geodesic_circles.py +++ b/examples/geodesic_circles.py @@ -22,8 +22,8 @@ # render png via cairo if staticmaps.cairo_is_supported(): - image = context.render_cairo(800, 600) - image.write_to_png("geodesic_circles.cairo.png") + cairo_image = context.render_cairo(800, 600) + cairo_image.write_to_png("geodesic_circles.cairo.png") # render svg svg_image = context.render_svg(800, 600) diff --git a/examples/tile_providers.py b/examples/tile_providers.py index 3977430..ea443b0 100644 --- a/examples/tile_providers.py +++ b/examples/tile_providers.py @@ -25,8 +25,8 @@ # render png via cairo if staticmaps.cairo_is_supported(): - image = context.render_cairo(800, 500) - image.write_to_png(f"provider_{name}.cairo.png") + cairo_image = context.render_cairo(800, 500) + cairo_image.write_to_png(f"provider_{name}.cairo.png") # render svg svg_image = context.render_svg(800, 500) diff --git a/examples/us_capitals.py b/examples/us_capitals.py index b9a357c..9e16ecb 100644 --- a/examples/us_capitals.py +++ b/examples/us_capitals.py @@ -25,8 +25,8 @@ # render png via cairo if staticmaps.cairo_is_supported(): - image = context.render_cairo(800, 500) - image.write_to_png("us_capitals.cairo.png") + cairo_image = context.render_cairo(800, 500) + cairo_image.write_to_png("us_capitals.cairo.png") # render svg svg_image = context.render_svg(800, 500) diff --git a/staticmaps/context.py b/staticmaps/context.py index 694af08..525c27d 100644 --- a/staticmaps/context.py +++ b/staticmaps/context.py @@ -150,7 +150,7 @@ def render_cairo(self, width: int, height: int) -> typing.Any: return renderer.image_surface() - def render_pillow(self, width: int, height: int) -> PIL_Image: + def render_pillow(self, width: int, height: int) -> PIL_Image.Image: """Render context using PILLOW :param width: width of static map diff --git a/staticmaps/pillow_renderer.py b/staticmaps/pillow_renderer.py index 76dee27..7d422f0 100644 --- a/staticmaps/pillow_renderer.py +++ b/staticmaps/pillow_renderer.py @@ -26,7 +26,7 @@ def __init__(self, transformer: Transformer) -> None: self._draw = PIL_ImageDraw.Draw(self._image) self._offset_x = 0 - def draw(self) -> PIL_ImageDraw.Draw: + def draw(self) -> PIL_ImageDraw.ImageDraw: return self._draw def image(self) -> PIL_Image.Image: @@ -99,7 +99,7 @@ def render_attribution(self, attribution: typing.Optional[str]) -> None: margin = 2 w = self._trans.image_width() h = self._trans.image_height() - left, top, right, bottom = self.draw().textbbox((margin, h - margin), attribution) + _, top, _, bottom = self.draw().textbbox((margin, h - margin), attribution) th = bottom - top overlay = PIL_Image.new("RGBA", self._image.size, (255, 255, 255, 0)) draw = PIL_ImageDraw.Draw(overlay) @@ -128,7 +128,7 @@ def fetch_tile( return PIL_Image.open(io.BytesIO(image_data)) @staticmethod - def create_image(image_data: bytes) -> PIL_Image: + def create_image(image_data: bytes) -> PIL_Image.Image: """Create a pillow image :param image_data: Image data