Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OsmGpsMap-CRITICAL: Map source setup called twice

Browse Source 
Fixes #012352
This commit is contained in:
SNoiraud 2021-07-19 19:26:37 +02:00 committed by Nick Hall
parent 4a9f658dd4
commit 6ba9722dee
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gramps/plugins/lib/maps/geography.py
View File

@ -289,9 +289,6 @@ class GeoGraphyView(OsmGps, NavigationView):
if self.active: if self.active:
self.bookmarks.redraw() self.bookmarks.redraw()
self.build_tree() self.build_tree()
if self.osm:
self.osm.grab_focus()
self.set_crosshair(config.get("geography.show_cross"))
def can_configure(self): def can_configure(self):
""" """

11
gramps/plugins/lib/maps/osmgps.py
View File

@ -182,14 +182,11 @@ class OsmGps:
self.osm = DummyMapNoGpsPoint() self.osm = DummyMapNoGpsPoint()
else: else:
if http_proxy: if http_proxy:
self.osm = osmgpsmap.Map(tile_cache=tiles_path, self.osm = osmgpsmap.Map(proxy_uri=http_proxy)
proxy_uri=http_proxy,
map_source=constants.MAP_TYPE[
map_type])
else: else:
self.osm = osmgpsmap.Map(tile_cache=tiles_path, self.osm = osmgpsmap.Map()
map_source=constants.MAP_TYPE[ self.osm.set_property("tile_cache", tiles_path)
map_type]) self.osm.set_property("map_source", constants.MAP_TYPE[map_type])
self.osm.props.tile_cache = osmgpsmap.MAP_CACHE_AUTO self.osm.props.tile_cache = osmgpsmap.MAP_CACHE_AUTO
current_map = osmgpsmap.MapOsd(show_dpad=False, show_zoom=True) current_map = osmgpsmap.MapOsd(show_dpad=False, show_zoom=True)
self.end_selection = None self.end_selection = None

8
gramps/plugins/view/geoclose.py
View File

@ -246,6 +246,14 @@ class GeoClose(GeoGraphyView):
self.add_item = None self.add_item = None
self.newmenu = None self.newmenu = None
self.config_meeting_slider = None self.config_meeting_slider = None
self.dbstate.connect('database-changed', self.reset_change_db)
def reset_change_db(self, dummy_dbase):
"""
Used to reset the family reference
"""
self.refperson = None
def get_title(self): def get_title(self):
""" """

7
gramps/plugins/view/geofamclose.py
View File

@ -243,6 +243,13 @@ class GeoFamClose(GeoGraphyView):
self.cal = config.get('preferences.calendar-format-report') self.cal = config.get('preferences.calendar-format-report')
self.no_show_places_in_status_bar = False self.no_show_places_in_status_bar = False
self.config_meeting_slider = None self.config_meeting_slider = None
self.dbstate.connect('database-changed', self.reset_change_db)
def reset_change_db(self, dummy_dbase):
"""
Used to reset the family reference
"""
self.reffamily = None
def get_title(self): def get_title(self):
""" """