Geography : bug #06466 : History change when clicking on one marker

bug #06451 : incomplete precedent patch


svn: r21367

gramps/plugins/lib/maps/geography.py

@@ -405,13 +405,6 @@ class GeoGraphyView(OsmGps, NavigationView):
                 found = True
         if found:
             self.bubble_message(event, lat, lon, mark_selected)
-            # add the first place found to history
-            hobj = self.uistate.get_history(self.navigation_type(),
-                                            self.navigation_group())
-            place = self.dbstate.db.get_place_from_gramps_id(mark_selected[0][9])
-            handle = place.get_handle()
-            if handle and not hobj.lock and not (handle == hobj.present()):
-                hobj.push(handle)
         self.uistate.set_busy_cursor(False)
 
     def bubble_message(self, event, lat, lon, mark):

gramps/plugins/lib/maps/messagelayer.py

@@ -75,7 +75,7 @@ class MessageLayer(GObject.GObject, osmgpsmap.MapLayer):
         Initialize the layer
         """
         GObject.GObject.__init__(self)
-        self.message = []
+        self.message = ""
         self.color = "black"
         self.font = "Sans"
         self.size = 13

gramps/plugins/view/geoclose.py

@@ -204,7 +204,6 @@ class GeoClose(GeoGraphyView):
         active = self.get_active()
         if active:
             p1 = self.dbstate.db.get_person_from_handle(active)
-            self.change_active(active)
             color = self._config.get('geography.color2')
             self._createmap(p1, color, self.place_list_active, False)
         if self.refperson:

gramps/plugins/view/geofamclose.py

@@ -233,7 +233,6 @@ class GeoFamClose(GeoGraphyView):
         f1 = None
         if active:
             f1 = self.dbstate.db.get_family_from_handle(active)
-            self.change_active(active)
             color = self._config.get('geography.color2')
             self._createmap(f1, color, self.place_list_active, False)
         if self.reffamily:

gramps/plugins/view/geoperson.py

@@ -194,11 +194,10 @@ class GeoPerson(GeoGraphyView):
         Rebuild the tree with the given person handle as the root.
         """
         self.places_found = []
-        if handle:
-            self.change_active(handle)
-            self._createmap(handle)
         active = self.get_active()
-        if active:
+        if handle:
+            self._createmap(handle)
+        elif active:
             p1 = self.dbstate.db.get_person_from_handle(active)
             self._createmap(p1)
         self.uistate.modify_statusbar(self.dbstate)