Isolate and only place map markers for Birth, Death, Census, Marriage, and Divorce events for the Place and Family Map Pages.

svn: r18603
This commit is contained in:
Rob G. Healey 2011-12-15 07:54:29 +00:00
parent 31803e2f3b
commit 5d034ca7a2

View File

@ -121,7 +121,6 @@ familylinks = """
var myLatLng = new google.maps.LatLng(%s, %s); var myLatLng = new google.maps.LatLng(%s, %s);
var mapOptions = { var mapOptions = {
scrollwheel: false,
scaleControl: true, scaleControl: true,
panControl: true, panControl: true,
backgroundColor: '#000000', backgroundColor: '#000000',
@ -190,7 +189,6 @@ markers = """
function initialize() { function initialize() {
var mapOptions = { var mapOptions = {
scrollwheel: false,
scaleControl: true, scaleControl: true,
panControl: true, panControl: true,
backgroundColor: '#000000', backgroundColor: '#000000',
@ -904,7 +902,11 @@ class BasePage(object):
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() event_date = event.get_date_object()
etype = str(event.get_type()) etype = event.get_type()
# only allow Birth, Death, Census, Marriage, and Divorce events...
if etype in [gen.lib.EventType.BIRTH, gen.lib.EventType.DEATH, gen.lib.EventType.CENSUS,
gen.lib.EventType.MARRIAGE, gen.lib.EventType.DIVORCE]:
place_lat_long.append([latitude, longitude, placetitle, place_handle, event_date, etype]) place_lat_long.append([latitude, longitude, placetitle, place_handle, event_date, etype])
def _get_event_place(self, person, ppl_handle_list, place_lat_long): def _get_event_place(self, person, ppl_handle_list, place_lat_long):
@ -5112,7 +5114,7 @@ class IndividualPage(BasePage):
for data, colclass in [ for data, colclass in [
(date, "ColumnDate"), (date, "ColumnDate"),
(self.place_link(handle, placetitle, up =True), "ColumnPlace"), (self.place_link(handle, placetitle, up =True), "ColumnPlace"),
(etype, "ColumnType") (str(etype), "ColumnType")
] ]
) )