diff --git a/src/DataViews/GeoView.py b/src/DataViews/GeoView.py index 26557f028..f1c754fea 100644 --- a/src/DataViews/GeoView.py +++ b/src/DataViews/GeoView.py @@ -59,6 +59,16 @@ import Config from BasicUtils import name_displayer as _nd from PlaceUtils import conv_lat_lon +#------------------------------------------------------------------------- +# +# map icons +# +#------------------------------------------------------------------------- +_icons = { + gen.lib.EventType.BIRTH : 'gramps-geo-birth', + gen.lib.EventType.DEATH : 'gramps-geo-death', +} + #------------------------------------------------------------------------- # # regexp for html title Notes ... @@ -92,7 +102,7 @@ NB_MARKERS_PER_PAGE = 200 #------------------------------------------------------------------------- _HTMLHEADER = ''' + \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\" {xmllang} > @@ -106,8 +116,10 @@ _JAVASCRIPT = '''\n") - self.mapview.write("\n") if _alternate_map() == "microsoft": self.mapview.write("\n") @@ -1112,7 +1154,9 @@ class GeoView(HtmlView): latitude, longitude, descr1, int(self.center), - birthyear) + birthyear, + birth.get_type() + ) self.center = False else: self._append_to_places_without_coord( @@ -1148,7 +1192,9 @@ class GeoView(HtmlView): latitude, longitude, descr1, int(self.center), - deathyear) + deathyear, + death.get_type() + ) self.center = False else: self._append_to_places_without_coord( @@ -1182,7 +1228,8 @@ class GeoView(HtmlView): if ( longitude and latitude ): self._append_to_places_list(descr, None, "", latitude, longitude, - descr1, self.center, None) + descr1, self.center, None, + gen.lib.EventType.UNKNOWN) self.center = False else: self._append_to_places_without_coord(place.gramps_id, descr) @@ -1215,19 +1262,16 @@ class GeoView(HtmlView): place_handle = event.get_place_handle() eventdate = event.get_date_object() eventyear = eventdate.get_year() - descr1 = _("Id : %(id)s (%(year)s)") % { - 'id' : event.gramps_id, - 'year' : eventyear} if place_handle: place = dbstate.db.get_place_from_handle(place_handle) if place: + descr1 = place.get_title() longitude = place.get_longitude() latitude = place.get_latitude() latitude, longitude = conv_lat_lon(latitude, longitude, "D.D8") city = place.get_main_location().get_city() country = place.get_main_location().get_country() - descr2 = "%s; %s" % (city, country) # place.get_longitude and place.get_latitude return # one string. We have coordinates when the two values # contains non null string. @@ -1239,19 +1283,18 @@ class GeoView(HtmlView): if ref_type == 'Person' ] if person_list: - descr = "
" + descr2 = "" for person in person_list: - descr = ("%(description)s%(name)s
") % { - 'description' : descr, + descr2 = ("%(description)s%(name)s; ") % { + 'description' : descr2, 'name' : _nd.display(person)} - #) % { 'eventtype': gen.lib.EventType( descr = ("%(eventtype)s;"+ " %(place)s%(description)s" ) % { 'eventtype': gen.lib.EventType( event.get_type() ), 'place': place.get_title(), - 'description': descr} + 'description': descr2} else: descr = ("%(eventtype)s; %(place)s
") % { 'eventtype': gen.lib.EventType( @@ -1262,7 +1305,9 @@ class GeoView(HtmlView): descr, latitude, longitude, descr2, self.center, - eventyear) + eventyear, + event.get_type() + ) self.center = False else: descr = place.get_title() @@ -1301,12 +1346,17 @@ class GeoView(HtmlView): handle = fam.get_father_handle() father = dbstate.db.get_person_from_handle(handle) if father: - comment = _("Id : Father : %s") % father.gramps_id + comment = _("Id : Father : %s : %s") % ( father.gramps_id, + _nd.display(father) + ) self._createpersonmarkers(dbstate, father, comment) handle = fam.get_mother_handle() mother = dbstate.db.get_person_from_handle(handle) if mother: comment = _("Id : Mother : %s") % mother.gramps_id + comment = _("Id : Mother : %s : %s") % ( mother.gramps_id, + _nd.display(mother) + ) self._createpersonmarkers(dbstate, mother, comment) index = 0 child_ref_list = fam.get_child_ref_list() @@ -1315,9 +1365,12 @@ class GeoView(HtmlView): child = dbstate.db.get_person_from_handle(child_ref.ref) if child: index += 1 - comment = _("Id : Child : %(id)s %(index)d") % { - 'id' : child.gramps_id, - 'index': index} + comment = _("Id : Child : %(id)s - %(index)d " + ": %(name)s") % { + 'id' : child.gramps_id, + 'index' : index, + 'name' : _nd.display(child) + } self._createpersonmarkers(dbstate, child, comment) else: comment = _("Id : Child : %(id)s has no parents.") % { @@ -1390,7 +1443,9 @@ class GeoView(HtmlView): _nd.display(person), latitude, longitude, descr1, self.center, - eventyear) + eventyear, + event.get_type() + ) self.center = False else: self._append_to_places_without_coord( diff --git a/src/images/16x16/gramps-geo-birth.png b/src/images/16x16/gramps-geo-birth.png new file mode 100644 index 000000000..dfc3015a9 Binary files /dev/null and b/src/images/16x16/gramps-geo-birth.png differ diff --git a/src/images/16x16/gramps-geo-death.png b/src/images/16x16/gramps-geo-death.png new file mode 100644 index 000000000..f318d9526 Binary files /dev/null and b/src/images/16x16/gramps-geo-death.png differ diff --git a/src/images/22x22/gramps-geo-birth.png b/src/images/22x22/gramps-geo-birth.png new file mode 100644 index 000000000..48fd8b38c Binary files /dev/null and b/src/images/22x22/gramps-geo-birth.png differ diff --git a/src/images/22x22/gramps-geo-death.png b/src/images/22x22/gramps-geo-death.png new file mode 100644 index 000000000..25594eb42 Binary files /dev/null and b/src/images/22x22/gramps-geo-death.png differ diff --git a/src/images/48x48/gramps-geo-birth.png b/src/images/48x48/gramps-geo-birth.png new file mode 100644 index 000000000..652b8b03d Binary files /dev/null and b/src/images/48x48/gramps-geo-birth.png differ diff --git a/src/images/48x48/gramps-geo-death.png b/src/images/48x48/gramps-geo-death.png new file mode 100644 index 000000000..41c63eb09 Binary files /dev/null and b/src/images/48x48/gramps-geo-death.png differ diff --git a/src/images/scalable/gramps-geo-birth.svg b/src/images/scalable/gramps-geo-birth.svg new file mode 100644 index 000000000..87d0647b3 --- /dev/null +++ b/src/images/scalable/gramps-geo-birth.svg @@ -0,0 +1,647 @@ + + + + + Birth + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Birth + + + Serge Noiraud + + + + + + baby + birth + + + + This baby is based on the People icon from Jakub Steiner +http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/images/scalable/gramps-geo-death.svg b/src/images/scalable/gramps-geo-death.svg new file mode 100644 index 000000000..e85a69c8d --- /dev/null +++ b/src/images/scalable/gramps-geo-death.svg @@ -0,0 +1,506 @@ + + + + + death + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + death + + + + Serge Noiraud + + + + + + + + + + + + + + + + + + + + + + + + + + +