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

Fixed and updated Place Maps to work with the new google v3 maps javascript code. Error reported by Jerome Rapinet.

Browse Source 
svn: r17942
This commit is contained in:
Rob G. Healey 2011-07-21 01:44:50 +00:00
parent 8aa8f58036
commit 924adb2a45
4 changed files with 134 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

226
src/plugins/webreport/NarrativeWeb.py
View File

@ -2526,16 +2526,20 @@ class PlacePage(BasePage):
self.up = True self.up = True
self.page_title = place.get_title() self.page_title = place.get_title()
placepage, head, body = self.write_header(_("Places")) placepage, head, body = self.write_header(_("Places"))
self.placemappages = self.report.options['placemappages'] self.placemappages = self.report.options['placemappages']
self.googlemap = self.report.options['placemappages']
self.openstreetmap = self.report.options['openstreetmap']
# begin PlaceDetail Division # begin PlaceDetail Division
with Html("div", class_ = "content", id = "PlaceDetail") as placedetail: with Html("div", class_ = "content", id = "PlaceDetail") as placedetail:
body += placedetail body += placedetail
media_list = place.get_media_list() if self.create_media:
thumbnail = self.display_first_image_as_thumbnail(media_list, place) media_list = place.get_media_list()
if thumbnail is not None: thumbnail = self.display_first_image_as_thumbnail(media_list, place)
placedetail += thumbnail if thumbnail is not None:
placedetail += thumbnail
# add section title # add section title
placedetail += Html("h5", html_escape(self.page_title), inline = True) placedetail += Html("h5", html_escape(self.page_title), inline = True)
@ -2572,87 +2576,87 @@ class PlacePage(BasePage):
# call_generate_page(report, title, place_handle, src_list, head, body, place, placedetail) # call_generate_page(report, title, place_handle, src_list, head, body, place, placedetail)
# add place map here # add place map here
if self.placemappages: if ((self.placemappages or self.openstreetmap) and
if (place and (place.lat and place.long)): (place and (place.lat and place.long) ) ):
# get reallatitude and reallongitude from place # get reallatitude and reallongitude from place
latitude, longitude = conv_lat_lon( place.lat, latitude, longitude = conv_lat_lon( place.lat,
place.long, place.long,
"D.D8") "D.D8")
# add Mapstraction CSS # add narrative-maps CSS...
fname = "/".join(["styles", "mapstraction.css"]) fname = "/".join(["styles", "narrative-maps.css"])
url = self.report.build_url_fname(fname, None, self.up) url = self.report.build_url_fname(fname, None, self.up)
head += Html("link", href = url, type = "text/css", media = "screen", rel = "stylesheet") head += Html("link", href = url, type = "text/css", media = "screen", rel = "stylesheet")
# add googlev3 specific javascript code # add googlev3 specific javascript code
head += Html("script", type = "text/javascript", if self.googlemap:
src = "http://maps.google.com/maps/api/js?sensor=false", inline = True) head += Html("script", type ="text/javascript",
src ="http://maps.googleapis.com/maps/api/js?sensor=false", inline =True)
# add mapstraction javascript code # Place Map division
fname = "/".join(["mapstraction", "mxn.js?(googlev3)"]) with Html("div", id = "mapstraction") as mapstraction:
url = self.report.build_url_fname(fname, None, self.up) placedetail += mapstraction
head += Html("script", type = "text/javascript", src = url, inline = True)
# Place Map division # section title
with Html("div", id = "mapstraction") as mapstraction: mapstraction += Html("h4", _("Place Map"), inline = True)
placedetail += mapstraction
# section title
mapstraction += Html("h4", _("Place Map"), inline = True)
# begin middle division
with Html("div", id = "middle") as middle:
mapstraction += middle
# begin middle division
with Html("div", id = "middle") as middle:
mapstraction += middle
if self.openstreetmap:
url = 'http://www.openstreetmap.com/?lat=%s&lon=%s&zoom=11&layers=M' % (
latitude, longitude)
middle += Html("object", data = url, inline = True)
elif self.googlemap:
# begin inline javascript code # begin inline javascript code
# because jsc is a string, it does NOT have to properly indented # because jsc is a string, it does NOT have to be properly indented
with Html("script", type = "text/javascript") as jsc: with Html("script", type = "text/javascript") as jsc:
middle += jsc head += jsc
jsc += """ jsc += """
var map; var myLatlng = new google.maps.LatLng(%s, %s);""" % (latitude, longitude)
var home = new mxn.LatLonPoint(%s, %s);""" % (latitude, longitude)
jsc += """ jsc += """
function initialize() { var marker;
var map;
// create mxn object function initialize() {
map = new mxn.Mapstraction('googlev3','googlev3'); var mapOptions = {
zoom: 13,
mapTypeId: google.maps.MapTypeId.ROADMAP,
center: myLatlng
};
map = new google.maps.Map(document.getElementById("middle"), mapOptions);
marker = new google.maps.Marker({
map: map,
draggable: true,
animation: google.maps.Animation.DROP,
position: myLatlng
});
// add map controls to image google.maps.event.addListener(marker, 'click', toggleBounce);
map.addControls({ }
pan: true,
zoom: 'large',
scale: true,
keyboardShortcuts: true,
map_type: true
});
// put map on page function toggleBounce() {
map.setCenterAndZoom(home, 12);
// set marker at latitude/ longitude if (marker.getAnimation() != null) {
var marker = new mxn.Marker(home); marker.setAnimation(null);
} else {
// add marker InfoBubble() place name marker.setAnimation(google.maps.Animation.BOUNCE);
hrp-infoInfoBubble('%s'); """ % self.page_title }
}"""
jsc += """
// add marker to map
map.addMarker(marker, true);
}"""
# there is no need to add an ending "</script>", # there is no need to add an ending "</script>",
# as it will be added automatically! # as it will be added automatically!
# googlev3 division # add fullclear for proper styling
middle += Html("div", id = "googlev3", inline = True) middle += fullclear
# add fullclear for proper styling # add javascript function call to body element
middle += fullclear body.attr = 'onload = "initialize();"'
# add javascript function call to body element
body.attr = 'onload = "initialize();"'
# source references # source references
srcrefs = self.display_ind_sources(place) srcrefs = self.display_ind_sources(place)
@ -4048,19 +4052,18 @@ class IndividualPage(BasePage):
XCoordinates, YCoordinates = [], [] XCoordinates, YCoordinates = [], []
number_markers = len(place_lat_long) number_markers = len(place_lat_long)
if number_markers > 3:
for (lat, long, pname, handle, date) in place_lat_long: for (lat, long, pname, handle, date) in place_lat_long:
XCoordinates.append(lat) XCoordinates.append(lat)
YCoordinates.append(long) YCoordinates.append(long)
XCoordinates.sort() XCoordinates.sort()
minX = XCoordinates[0] if XCoordinates[0] is not None else minX minX = XCoordinates[0] if XCoordinates[0] is not None else minX
maxX = XCoordinates[-1] if XCoordinates[-1] is not None else maxX maxX = XCoordinates[-1] if XCoordinates[-1] is not None else maxX
YCoordinates.sort() YCoordinates.sort()
minY = YCoordinates[0] if YCoordinates[0] is not None else minY minY = YCoordinates[0] if YCoordinates[0] is not None else minY
maxY = YCoordinates[-1] if YCoordinates[-1] is not None else maxY maxY = YCoordinates[-1] if YCoordinates[-1] is not None else maxY
try: try:
spanY = int( Decimal( maxY ) - Decimal( minY ) ) spanY = int( Decimal( maxY ) - Decimal( minY ) )
@ -4092,8 +4095,8 @@ class IndividualPage(BasePage):
# if active # if active
# call_(report, up, head) # call_(report, up, head)
# add Mapstraction CSS # add narrative-maps.css
fname = "/".join(["styles", "mapstraction.css"]) fname = "/".join(["styles", "narrative-maps.css"])
url = self.report.build_url_fname(fname, None, self.up) url = self.report.build_url_fname(fname, None, self.up)
head += Html("link", href = url, type = "text/css", media = "screen", rel = "stylesheet") head += Html("link", href = url, type = "text/css", media = "screen", rel = "stylesheet")
@ -4156,7 +4159,7 @@ class IndividualPage(BasePage):
function initialize() { function initialize() {
// create map object // create map object
map = new mxn.Mapstraction('familygooglev3', 'googlev3'); map = new mxn.Mapstraction('map_canvas', 'googlev3');
// add map controls to image // add map controls to image
map.addControls({ map.addControls({
@ -4217,7 +4220,8 @@ class IndividualPage(BasePage):
# as it will be added automatically! # as it will be added automatically!
# here is where the map is held in the CSS/ Page # here is where the map is held in the CSS/ Page
middlesection += Html("div", id = "familygooglev3", inline = True) middlesection += Html("div", id ="map_canvas",
style ='width: 1600px; height: 1200px;', inline = True)
# add fullclear for proper styling # add fullclear for proper styling
middlesection += fullclear middlesection += fullclear
@ -5833,6 +5837,15 @@ class NavWebReport(Report):
Copy all of the CSS, image, and javascript files for Narrated Web Copy all of the CSS, image, and javascript files for Narrated Web
""" """
# copy screen style sheet
if CSS[self.css]["filename"]:
fname = CSS[self.css]["filename"]
self.copy_file(fname, _NARRATIVESCREEN, "styles")
# copy printer style sheet
fname = CSS["Print-Default"]["filename"]
self.copy_file(fname, _NARRATIVEPRINT, "styles")
# copy behaviour style sheet # copy behaviour style sheet
fname = CSS["behaviour"]["filename"] fname = CSS["behaviour"]["filename"]
self.copy_file(fname, "behaviour.css", "styles") self.copy_file(fname, "behaviour.css", "styles")
@ -5841,11 +5854,6 @@ class NavWebReport(Report):
if self.ancestortree: if self.ancestortree:
fname = CSS["ancestortree"]["filename"] fname = CSS["ancestortree"]["filename"]
self.copy_file(fname, "ancestortree.css", "styles") self.copy_file(fname, "ancestortree.css", "styles")
# copy screen style sheet
if CSS[self.css]["filename"]:
fname = CSS[self.css]["filename"]
self.copy_file(fname, _NARRATIVESCREEN, "styles")
# copy Navigation Menu Layout style sheet if Blue or Visually is being used # copy Navigation Menu Layout style sheet if Blue or Visually is being used
if CSS[self.css]["navigation"]: if CSS[self.css]["navigation"]:
@ -5857,16 +5865,12 @@ class NavWebReport(Report):
# copy Mapstraction style sheet if using Place Maps # copy Mapstraction style sheet if using Place Maps
if self.placemappages or self.familymappages: if self.placemappages or self.familymappages:
fname = CSS["mapstraction"]["filename"] fname = CSS["NarrativeMaps"]["filename"]
self.copy_file(fname, "mapstraction.css", "styles") self.copy_file(fname, "narrative-maps.css", "styles")
for from_path in CSS["mapstraction"]["javascript"]: for from_path in CSS["NarrativeMaps"]["javascript"]:
fdir, fname = os.path.split(from_path) fdir, fname = os.path.split(from_path)
self.copy_file( from_path, fname, "mapstraction" ) self.copy_file( from_path, fname, "mapstraction" )
# copy printer style sheet
fname = CSS["Print-Default"]["filename"]
self.copy_file(fname, _NARRATIVEPRINT, "styles")
imgs = [] imgs = []
@ -6707,13 +6711,23 @@ class NavWebOptions(MenuReportOptions):
category_name = _("Place Maps") category_name = _("Place Maps")
addopt = partial(menu.add_option, category_name) addopt = partial(menu.add_option, category_name)
placemappages = BooleanOption(_("Include Place map on Place Pages"), False) self.__placemappages = BooleanOption(_("Include Place map on Place Pages (GoogleMaps)"), False)
placemappages.set_help(_("Whether to include a place map on the Place Pages, " self.__placemappages.set_help(_("Whether to include a place map on the Place Pages, "
"where Latitude/ Longitude are available.")) "where Latitude/ Longitude are available."))
addopt( "placemappages", placemappages ) self.__placemappages.connect("value-changed", self.__placemap_changed)
addopt("placemappages", self.__placemappages)
familymappages = BooleanOption(_("Include Individual Page Map with " self.__openstreetmap = BooleanOption(_("Include Place map on Place Pages (Openstreetmaps)"), False)
"all places shown on map"), False) self.__openstreetmap.set_help(_("Whether to include a place map on the Place Pages, "
"where Latitude/ Longitude are available."))
self.__openstreetmap.connect("value-changed", self.__osm_changed)
addopt("openstreetmap", self.__openstreetmap)
self.__placemap_changed()
self.__osm_changed()
familymappages = BooleanOption(_("Include Family Map Pages with "
"all places shown on the map"), False)
familymappages.set_help(_("Whether or not to add an individual page map " familymappages.set_help(_("Whether or not to add an individual page map "
"showing all the places on this page. " "showing all the places on this page. "
"This will allow you to see how your family " "This will allow you to see how your family "
@ -6806,6 +6820,26 @@ class NavWebOptions(MenuReportOptions):
self.__down_fname2.set_available(False) self.__down_fname2.set_available(False)
self.__dl_descr2.set_available(False) self.__dl_descr2.set_available(False)
def __placemap_changed(self):
"""
Handles the changing nature of the place maps
"""
if self.__placemappages.get_value():
self.__openstreetmap.set_available(False)
else:
self.__openstreetmap.set_available(True)
def __osm_changed(self):
"""
Handles the changing nature of OpenStreetMap
"""
if self.__openstreetmap.get_value():
self.__placemappages.set_available(False)
else:
self.__placemappages.set_available(True)
# FIXME. Why do we need our own sorting? Why not use Sort.Sort? # FIXME. Why do we need our own sorting? Why not use Sort.Sort?
def sort_people(db, handle_list): def sort_people(db, handle_list):
sname_sub = defaultdict(list) sname_sub = defaultdict(list)

2
src/plugins/webstuff/css/Makefile.am
View File

@ -5,7 +5,7 @@
DATAFILES = \ DATAFILES = \
GeoView.css \ GeoView.css \
Mapstraction.css \ narrative-maps.css \
ancestortree.css \ ancestortree.css \
behaviour.css \ behaviour.css \
Web_Basic-Ash.css \ Web_Basic-Ash.css \

44
src/plugins/webstuff/css/Mapstraction.css → src/plugins/webstuff/css/narrative-maps.css
View File

@ -19,7 +19,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# $Id: $ # $Id$
# #
# #
Body element Body element
@ -69,45 +69,3 @@ div#middlesection {
float: center; float: center;
overflow-y: hidden; overflow-y: hidden;
} }
/* Y Map Sizes
------------------------------------------------- */
div#largeYMap {
width: 1400px;
margin: 1%;
}
div#middleYMap {
width: 1000px;
margin: 2%;
}
div#smallYMap {
width: 800px;
margin: 0px 8% 10px 9%;
}
div#YMap {
width: 800px;
margin: 0% 8% 10px 9%;
}
/* X Map Sizes
------------------------------------------------- */
div#largeXMap {
height: 1400px;
}
div#middleXMap {
height: 1200px;
}
div#smallXMap {
height: 800px;
}
div#XMap {
height: 800px;
}
/* Family GoogleV3
------------------------------------------------- */
div#familygooglev3 {
height: 100%;
width: 100%;
border: double 4px #000;
}

4
src/plugins/webstuff/webstuff.py
View File

@ -106,8 +106,8 @@ def load_on_reg(dbstate, uistate, plugin):
["behaviour", 0, "Behaviour", ["behaviour", 0, "Behaviour",
path_css('behaviour.css'), None, [], []], path_css('behaviour.css'), None, [], []],
# mapstraction style sheet for NarrativeWeb place maps # narrative-maps style sheet for NarrativeWeb place maps
["mapstraction", 0, "mapstraction", ["NarrativeMaps", 0, "",
path_css("Mapstraction.css"), None, [], path_css("Mapstraction.css"), None, [],
[path_js("mapstraction", "mxn.core.js"), [path_js("mapstraction", "mxn.core.js"),
path_js("mapstraction", "mxn.googlev3.core.js"), path_js("mapstraction", "mxn.googlev3.core.js"),