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

Add place_title to bottom of map and at marker description. Added style elements to style sheet.

Browse Source 
svn: r15584
This commit is contained in:
Rob G. Healey 2010-06-20 05:42:42 +00:00
parent 939ac5505e
commit cba915b882
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/data/Mapstraction.css
View File

@ -35,9 +35,15 @@ div#middle {
float: center; float: center;
height: 400px; height: 400px;
width: 60%; width: 60%;
margin: 10px 0px 10px 0px; margin: 10px 0px 6px 0px;
padding: 0% 20% 0% 20%; padding: 0% 20% 0% 20%;
} }
div#middle div#location {
margin-top: 6px;
font: normal 12px sans-serif;
text-align: center;
width: 80%;
}
/* geo-info bubble /* geo-info bubble
------------------------------------------------- */ ------------------------------------------------- */

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

@ -104,7 +104,7 @@ from libhtml import Html
from libhtmlbackend import HtmlBackend from libhtmlbackend import HtmlBackend
from libgedcom import make_gedcom_date from libgedcom import make_gedcom_date
from PlaceUtils import conv_lat_lon
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
# constants # constants
@ -342,8 +342,10 @@ class BasePage(object):
will create the place map will create the place map
@param: placedetail -- Html instance page @param: placedetail -- Html instance page
@param: head -- the <head> </head> section of the web page
@param: latitude -- GPS Latitude from place @param: latitude -- GPS Latitude from place
@param: Longitude -- GPS Longitude from place @param: Longitude -- GPS Longitude from place
@param: place_title - place description for InfoBubble
""" """
# add Mapstraction CSS # add Mapstraction CSS
@ -381,7 +383,6 @@ class BasePage(object):
//<![CDATA[ //<![CDATA[
var map; var map;
var pprovider = 'googlev3';
var latlon; var latlon;
function initialize() { function initialize() {
@ -403,21 +404,31 @@ class BasePage(object):
// put map on page // put map on page
map.setCenterAndZoom(latlon, 9); map.setCenterAndZoom(latlon, 9);
// add marker
var marker; var marker;
// set marker at latitude/ longitude
marker = new mxn.Marker(latlon); marker = new mxn.Marker(latlon);
// add marker InfoBubble() using place description
marker.setInfoBubble('<div id = "geo-info" >%s</div>'); """ % place_title marker.setInfoBubble('<div id = "geo-info" >%s</div>'); """ % place_title
jsc += """ jsc += """
// add marker to map // add marker to map
map.addMarker(marker, true); map.addMarker(marker, true);
} }
//]]>""" //]]>"""
# there is no need to add an ending "</script>" as it will be added automatically! # there is no need to add an ending "</script>",
# as it will be added automatically!
# googlev3 division
middle += Html("div", id = "googlev3", inline = True) middle += Html("div", id = "googlev3", inline = True)
# add place title to middle section
middle += Html("div", place_title, id = "location", inline = True)
# return placedetail division back to its callers # return placedetail division back to its callers
return placedetail, head return placedetail, head
@ -1908,7 +1919,6 @@ class BasePage(object):
@param: place -- place object from the database @param: place -- place object from the database
@param: table -- table from Placedetail @param: table -- table from Placedetail
@param: gid -- place gramps id
""" """
if not place: if not place:
@ -2488,12 +2498,22 @@ class PlacePage(BasePage):
# add place map here # add place map here
if self.placemaps: if self.placemaps:
if place.lat and place.long: if place:
if place.lat and place.long:
realatitude, realongitude = conv_lat_lon(
place.lat,
place.long,
"D.D8")
self._create_place_map(placedetail, head, place.lat, place.long, self.page_title) # create place map using realatitude and realongitude
self._create_place_map(
placedetail,
head,
realatitude, realongitude,
self.page_title)
# add javascript function call to body element # add javascript function call to body element
body.attr = 'onload = "initialize();"' body.attr = 'onload = "initialize();"'
# source references # source references
srcrefs = self.display_ind_sources(place) srcrefs = self.display_ind_sources(place)