From 9fa8fbb8f40aa4e5dce520e1e21dceddfe202a4a Mon Sep 17 00:00:00 2001 From: Serge Noiraud Date: Thu, 28 Apr 2011 15:41:36 +0000 Subject: [PATCH] geography : icons not correctly selected due to the sort key. cleaning. svn: r17325 --- src/plugins/lib/maps/geography.py | 3 +-- src/plugins/view/geoevents.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/lib/maps/geography.py b/src/plugins/lib/maps/geography.py index b16452993..4c470e2f3 100644 --- a/src/plugins/lib/maps/geography.py +++ b/src/plugins/lib/maps/geography.py @@ -475,9 +475,8 @@ class GeoGraphyView(osmGpsMap, NavigationView): lat = mark[3] lon = mark[4] icon = mark[7] - differtype = False else: # This marker already exists. add info. - if ( mark[6] and icon != mark[7] ): + if icon != mark[7]: differtype = True if ( lat != 0.0 and lon != 0.0 ): self.add_marker(None, None, lat, lon, icon, differtype) diff --git a/src/plugins/view/geoevents.py b/src/plugins/view/geoevents.py index ab110c5a7..649435bd6 100644 --- a/src/plugins/view/geoevents.py +++ b/src/plugins/view/geoevents.py @@ -296,7 +296,7 @@ class GeoEvents(GeoGraphyView): event = dbstate.db.get_event_from_handle(obj) self._createmap_for_one_event(event) self.sort = sorted(self.place_list, - key=operator.itemgetter(6) + key=operator.itemgetter(3, 4) ) self._create_markers()