jacob.eva/openCom-Companion
1
0
Fork 0
mirror of https://github.com/liberatedsystems/openCom-Companion.git synced 2024-11-25 14:50:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed map zoom

Browse Source
This commit is contained in:
Mark Qvist 2023-11-01 02:08:27 +01:00
parent 6d15dd2940
commit 10273d3e85
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sbapp/main.py
View File

@ -788,7 +788,7 @@ class SidebandApp(MDApp):
if text == "q" or text == "-": self.map_nav_zoom_out(modifier=nav_mod) if text == "q" or text == "-": self.map_nav_zoom_out(modifier=nav_mod)
if text == "e" or text == "+": self.map_nav_zoom_in(modifier=nav_mod) if text == "e" or text == "+": self.map_nav_zoom_in(modifier=nav_mod)
if self.root.ids.screen_manager.current == "conversations_screen": if True or self.root.ids.screen_manager.current == "conversations_screen":
if len(modifiers) > 0 and "ctrl" in modifiers: if len(modifiers) > 0 and "ctrl" in modifiers:
if keycode < 40 and keycode > 29: if keycode < 40 and keycode > 29:
c_index = keycode-29 c_index = keycode-29
@ -3921,16 +3921,23 @@ class SidebandApp(MDApp):
def map_object_list(self, sender): def map_object_list(self, sender):
pass pass
def map_show(self, location): def map_show(self, location, retry=0):
max_tries = 6
if hasattr(self, "map") and self.map: if hasattr(self, "map") and self.map:
# self.map.lat = location["latitude"]
# self.map.lon = location["longtitude"]
mz = 16 mz = 16
lat = location["latitude"]
lon = location["longtitude"]
if mz > self.map.map_source.max_zoom: mz = self.map.map_source.max_zoom if mz > self.map.map_source.max_zoom: mz = self.map.map_source.max_zoom
if mz < self.map.map_source.min_zoom: mz = self.map.map_source.min_zoom if mz < self.map.map_source.min_zoom: mz = self.map.map_source.min_zoom
self.map.center_on(location["latitude"],location["longtitude"]) self.map.zoom = mz
px, py = self.map_get_zoom_center(); self.map.set_zoom_at(mz, px, py)
self.map.trigger_update(True) self.map.trigger_update(True)
self.map.center_on(lat,lon)
self.map.trigger_update(True)
else:
if retry < max_tries:
def j(dt):
self.map_show(location, retry=retry+1)
Clock.schedule_once(j, 0.5)
def map_show_peer_location(self, context_dest): def map_show_peer_location(self, context_dest):
location = self.sideband.peer_location(context_dest) location = self.sideband.peer_location(context_dest)