Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

9596: Some events are not shown in familymaps page.

Browse Source
This commit is contained in:
SNoiraud 2016-08-08 11:36:57 +02:00
parent 2e3a4fd55f
commit 1a6752f9d9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gramps/plugins/webreport/narrativeweb.py
View File

@ -1088,10 +1088,12 @@ class BasePage:
if place_lat_long is None: if place_lat_long is None:
return return
place_handle = place.get_handle() place_handle = place.get_handle()
event_date = event.get_date_object()
# 0 = latitude, 1 = longitude, 2 - placetitle, # 0 = latitude, 1 = longitude, 2 - placetitle,
# 3 = place handle, 4 = event date, 5 = event type # 3 = place handle, 4 = event date, 5 = event type
found = any(data[3] == place_handle for data in place_lat_long) found = any(data[3] == place_handle and data[4] == event_date
for data in place_lat_long)
if not found: if not found:
placetitle = _pd.display(self.r_db, place) placetitle = _pd.display(self.r_db, place)
latitude = place.get_latitude() latitude = place.get_latitude()
@ -1099,7 +1101,6 @@ class BasePage:
if latitude and longitude: if latitude and longitude:
latitude, longitude = conv_lat_lon(latitude, longitude, "D.D8") latitude, longitude = conv_lat_lon(latitude, longitude, "D.D8")
if latitude is not None: if latitude is not None:
event_date = event.get_date_object()
etype = event.get_type() etype = event.get_type()
# only allow Birth, Death, Census, Marriage, # only allow Birth, Death, Census, Marriage,