From bf65ad1e7cf8b0a4471ddf64527fc5a669c7ba3e Mon Sep 17 00:00:00 2001
From: Serge Noiraud <Serge.Noiraud@free.fr>
Date: Sun, 17 Feb 2013 12:48:55 +0000
Subject: [PATCH] Geography : bug #06466 : History change when clicking on one
 marker             bug #06451 : incomplete precedent patch

svn: r21368
---
 gramps/plugins/lib/maps/geography.py    | 7 -------
 gramps/plugins/lib/maps/messagelayer.py | 2 +-
 gramps/plugins/view/geoclose.py         | 1 -
 gramps/plugins/view/geofamclose.py      | 1 -
 gramps/plugins/view/geoperson.py        | 7 +++----
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/gramps/plugins/lib/maps/geography.py b/gramps/plugins/lib/maps/geography.py
index f578b91f2..c192908a5 100644
--- a/gramps/plugins/lib/maps/geography.py
+++ b/gramps/plugins/lib/maps/geography.py
@@ -406,13 +406,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):
diff --git a/gramps/plugins/lib/maps/messagelayer.py b/gramps/plugins/lib/maps/messagelayer.py
index 632b21a43..9bd0ef6e7 100644
--- a/gramps/plugins/lib/maps/messagelayer.py
+++ b/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
diff --git a/gramps/plugins/view/geoclose.py b/gramps/plugins/view/geoclose.py
index 595e06409..892c7ab71 100644
--- a/gramps/plugins/view/geoclose.py
+++ b/gramps/plugins/view/geoclose.py
@@ -205,7 +205,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:
diff --git a/gramps/plugins/view/geofamclose.py b/gramps/plugins/view/geofamclose.py
index b456102fc..96a6809c2 100644
--- a/gramps/plugins/view/geofamclose.py
+++ b/gramps/plugins/view/geofamclose.py
@@ -234,7 +234,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:
diff --git a/gramps/plugins/view/geoperson.py b/gramps/plugins/view/geoperson.py
index 5b3560632..551d2e1d9 100644
--- a/gramps/plugins/view/geoperson.py
+++ b/gramps/plugins/view/geoperson.py
@@ -195,11 +195,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)