geography : icons not correctly selected due to the sort key. cleaning.

svn: r17324

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)

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()