diff --git a/src/main/main.py b/src/main/main.py index 5410b3f3..b7753e56 100755 --- a/src/main/main.py +++ b/src/main/main.py @@ -10,6 +10,8 @@ from kivy.config import Config MeileConfig = MeileGuiConfig() Config.set('kivy','window_icon',MeileConfig.resource_path("imgs/icon.png")) +Config.set('input', 'mouse', 'mouse,disable_multitouch') + #import tkinter as tk diff --git a/src/ui/screens.py b/src/ui/screens.py index 274b0844..3eae9efc 100755 --- a/src/ui/screens.py +++ b/src/ui/screens.py @@ -794,7 +794,8 @@ def build_meile_map(self): tile_size=256, image_ext="png", attribution="@ Meile", - size_hint=(.7,1)) + size_hint=(.7,1), + min_zoom=2) #self.MeileMap.map_source = "osm" self.MeileMap.map_source = source @@ -808,6 +809,9 @@ def build_meile_map(self): self.recenter = MapCenterButton() self.recenter.on_release = self.recenter_map + + self.MeileMap.bind(lat=self.check_boundaries) + self.MeileMap.bind(lon=self.check_boundaries) layout.add_widget(self.MeileMap) layout.add_widget(self.map_widget_1) @@ -824,12 +828,16 @@ def build_meile_map(self): self.carousel = Carousel(direction='right') self.ids.country_map.add_widget(self.carousel) - #self.carousel.add_widget(self.MeileMap) self.carousel.add_widget(layout) self.AddCountryNodePins(False) self.MeileMapBuilt = True - + def check_boundaries(self, instance, value): + print(self.MeileMap.zoom) + if self.MeileMap.zoom == 2: + print(f"({self.MeileMap.lat},{self.MeileMap.lon})") + self.recenter_map() + def add_country_rv_data(self, NodeCountries, index): self.ids.rv.data.append(