From a84a17b724e280f8f06da04d7248e471d0c49122 Mon Sep 17 00:00:00 2001 From: Ihor Bobalo Date: Tue, 1 Sep 2020 11:51:07 +0300 Subject: [PATCH 1/4] Fixed mbtiles source lazy map invocation under python 3 --- kivy_garden/mapview/mbtsource.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kivy_garden/mapview/mbtsource.py b/kivy_garden/mapview/mbtsource.py index e90f87a..d46e7aa 100644 --- a/kivy_garden/mapview/mbtsource.py +++ b/kivy_garden/mapview/mbtsource.py @@ -39,9 +39,9 @@ def __init__(self, filename, **kwargs): cx = cy = 0.0 cz = 5 if "bounds" in metadata: - self.bounds = bounds = map(float, metadata["bounds"].split(",")) + self.bounds = bounds = list(map(float, metadata["bounds"].split(","))) if "center" in metadata: - cx, cy, cz = map(float, metadata["center"].split(",")) + cx, cy, cz = list(map(float, metadata["center"].split(","))) elif self.bounds: cx = (bounds[2] + bounds[0]) / 2.0 cy = (bounds[3] + bounds[1]) / 2.0 From c04f42258c36e55222e4e3902c3593cdd7449aad Mon Sep 17 00:00:00 2001 From: Ihor Bobalo Date: Tue, 1 Sep 2020 11:52:42 +0300 Subject: [PATCH 2/4] Fixed mapview input processing when widget is disabled --- kivy_garden/mapview/view.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kivy_garden/mapview/view.py b/kivy_garden/mapview/view.py index 48b5457..603c16f 100644 --- a/kivy_garden/mapview/view.py +++ b/kivy_garden/mapview/view.py @@ -642,7 +642,7 @@ def scale_at(self, scale, x, y): ) def on_touch_down(self, touch): - if not self.collide_point(*touch.pos): + if not self.collide_point(*touch.pos) or self.disabled: return if self.pause_on_action: self._pause = True From 2e4789129c6900ebd82770d0d90e7c52bddd2c74 Mon Sep 17 00:00:00 2001 From: Ihor Bobalo Date: Tue, 1 Sep 2020 11:55:53 +0300 Subject: [PATCH 3/4] Fixed map view zoom direction is inverted for scroll and multitouch pinch gestures --- kivy_garden/mapview/view.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kivy_garden/mapview/view.py b/kivy_garden/mapview/view.py index 603c16f..74f1095 100644 --- a/kivy_garden/mapview/view.py +++ b/kivy_garden/mapview/view.py @@ -647,7 +647,7 @@ def on_touch_down(self, touch): if self.pause_on_action: self._pause = True if "button" in touch.profile and touch.button in ("scrolldown", "scrollup"): - d = 1 if touch.button == "scrollup" else -1 + d = 1 if touch.button == "scrolldown" else -1 self.animated_diff_scale_at(d, *touch.pos) return True elif touch.is_double_tap and self.double_tap_zoom: From c18cf1fdf3d8d3014c16de8115001e2169accddb Mon Sep 17 00:00:00 2001 From: Ihor Bobalo Date: Tue, 1 Sep 2020 11:55:53 +0300 Subject: [PATCH 4/4] Fixed map view zoom direction is inverted for scroll and multitouch pinch gestures --- kivy_garden/mapview/view.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kivy_garden/mapview/view.py b/kivy_garden/mapview/view.py index 48b5457..aefa834 100644 --- a/kivy_garden/mapview/view.py +++ b/kivy_garden/mapview/view.py @@ -647,7 +647,7 @@ def on_touch_down(self, touch): if self.pause_on_action: self._pause = True if "button" in touch.profile and touch.button in ("scrolldown", "scrollup"): - d = 1 if touch.button == "scrollup" else -1 + d = 1 if touch.button == "scrolldown" else -1 self.animated_diff_scale_at(d, *touch.pos) return True elif touch.is_double_tap and self.double_tap_zoom: