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

Complete my issue with the zoom level of the maps.

Browse Source 
svn: r15667
This commit is contained in:
Rob G. Healey 2010-07-30 05:35:17 +00:00
parent 6175654510
commit 0c6b7405c2
1 changed files with 87 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2511,48 +2511,46 @@ class PlacePage(BasePage):
middle += jsc middle += jsc
jsc += """ jsc += """
var map; var map;
var latlon; var home = new mxn.LatLonPoint(%s, %s);""" % (latitude, longitude)
function initialize() {
// create mxn object
map = new mxn.Mapstraction('googlev3','googlev3');
// add map controls to image
map.addControls({
pan: true,
zoom: 'large',
scale: true,
disableDoubleClickZoom: true,
keyboardShortcuts: true,
scrollwheel: false,
map_type: true
});
latlon = new mxn.LatLonPoint(%s, %s);""" % (latitude, longitude)
jsc += """ jsc += """
// put map on page function initialize() {
map.setCenterAndZoom(latlon, 10);
var marker; // create mxn object
map = new mxn.Mapstraction('googlev3','googlev3');
// set marker at latitude/ longitude
marker = new mxn.Marker(latlon);
// add marker InfoBubble() using place name // add map controls to image
marker.setInfoBubble('<div id = "geo-info" >%s</div>'); """ % self.page_title map.addControls({
pan: true,
zoom: 'large',
scale: true,
keyboardShortcuts: true,
map_type: true
});
// put map on page
map.setCenterAndZoom(home, 12);
// set marker at latitude/ longitude
var marker = new mxn.Marker(home);
// add marker InfoBubble() place name
marker.setInfoBubble('<div id = "geo-info" >%s</div>'); """ \
% self.page_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>", # there is no need to add an ending "</script>",
# as it will be added automatically! # as it will be added automatically!
# googlev3 division # googlev3 division
middle += Html("div", id = "googlev3", inline = True) middle += Html("div", id = "googlev3", inline = True)
# add fullclear for proper styling
middle += fullclear
# add javascript function call to body element # add javascript function call to body element
body.attr = 'onload = "initialize();"' body.attr = 'onload = "initialize();"'
@ -3905,25 +3903,39 @@ class IndividualPage(BasePage):
if not place_lat_long: if not place_lat_long:
return return
MinX = MaxX = "0.00000001" MinX = "0.00000001"
MinY = MaxY = "0.00000001" MaxX = "0.00000001"
MinY = "0.00000001"
MaxY = "0.00000001"
spanX = 0
spanY = 0
XCoordinates = []
YCoordinates = []
number_markers = len(place_lat_long) number_markers = len(place_lat_long)
if number_markers > 3: if number_markers > 3:
# sort on X coordinates to get min and max X GPS Coordinates for (lat, long, pname, handle, date) in place_lat_long:
place_lat_long = sorted(place_lat_long, key = operator.itemgetter(0, 1, 2)) XCoordinates.append(lat)
MinX = place_lat_long[0][0] YCoordinates.append(long)
MaxX = place_lat_long[-1][0]
# sort on Y coordinates to get min and max Y GPS Coordinates XCoordinates.sort()
place_lat_long = sorted(place_lat_long, key = operator.itemgetter(1, 0, 2)) MinX = XCoordinates[0]
YCoordinates = place_lat_long MaxX = XCoordinates[-1]
MinY = place_lat_long[-1][1] spanX = int( Decimal( MaxX ) - Decimal( MinX ) )
MaxY = place_lat_long[0][1]
# create span widths YCoordinates.sort()
spanX = Decimal(Decimal(MaxX) - Decimal(MinX)) MinY = YCoordinates[0]
spanY = Decimal(Decimal(MaxY) - Decimal(MinY)) MaxY = YCoordinates[-1]
spanY = int( Decimal( MaxY ) - Decimal( MinY ) )
smallset = [num for num in range(-17, 0)]
for num in range(0, 17):
smallset.append(num)
middleset = [num for num in range(-41, -17)]
for num in range(17, 41):
middleset.append(num)
# sort place_lat_long based on chronological date order # sort place_lat_long based on chronological date order
place_lat_long = sorted(place_lat_long, key = operator.itemgetter(4, 2, 0)) place_lat_long = sorted(place_lat_long, key = operator.itemgetter(4, 2, 0))
@ -3947,10 +3959,10 @@ class IndividualPage(BasePage):
head += Html("script", src = url, inline = True) head += Html("script", src = url, inline = True)
# set map dimensions based on span of Y Coordinates # set map dimensions based on span of Y Coordinates
if (-10 <= spanY > -1) or (10 <= spanY > 1): if spanY in smallset:
map_size = "smallYMap" map_size = "smallYMap"
elif (-40 <= spanY > -11) or (40 <= spanY > 11): elif spanY in middleset:
map_size = "middleYMap" map_size = "middleYMaap"
else: else:
map_size = "largeYMap" map_size = "largeYMap"
@ -3962,15 +3974,15 @@ class IndividualPage(BasePage):
msg = _("The place markers on this page represent a differemt location " msg = _("The place markers on this page represent a differemt location "
"based upon your spouse, your children (if any), and your personal " "based upon your spouse, your children (if any), and your personal "
"events and their places. The list has been sorted in chronological " "events and their places. The list has been sorted in chronological "
"order. The markers are numbered as you move your mouse pointer over " "date order. Clicking on the place&#8217;s name in the References "
"them and matching the same in References section below. Clicking " "will take you to that place&#8217;s page. Clicking on the markers "
"on the place&#8217;s name will take you to that place&#8217;s page.") "will display its place title.")
mapbody += Html("p", msg, id = "description") mapbody += Html("p", msg, id = "description")
if (-10 <= spanX > -1) or (10 <= spanX > 1): if spanX in smallset:
map_size = "smallXMap" map_size = "smallXMap"
elif (-40 <= spanX > -11) or (40 <= spanX > 11): elif spanX in middleset:
map_size = "middleXMap" map_size = "middleXMaap"
else: else:
map_size = "largeXMap" map_size = "largeXMap"
@ -3985,7 +3997,6 @@ class IndividualPage(BasePage):
jsc += """ jsc += """
var map; var map;
var latlon;
function initialize() { function initialize() {
@ -4003,19 +4014,13 @@ class IndividualPage(BasePage):
map_type: true map_type: true
});""" });"""
index = 0
for (lat, long, p, h, d) in place_lat_long: for (lat, long, p, h, d) in place_lat_long:
j = index + 1 jsc += """ add_markers(%s, %s, "%s");""" % ( lat, long, p )
jsc += """ add_markers(%d, %s, %s, "%s");""" % ( j, lat, long, p )
index += 1
jsc += """ jsc += """
}""" }"""
if (-20 <= spanY > -1) or (20 <= spanY > 1): if spanY not in smallset and spanY not in middleset:
pass
else:
# set southWest and northEast boundaries as spanY is greater than 20 # set southWest and northEast boundaries as spanY is greater than 20
jsc += """ jsc += """
// boundary southWest equals bottom left GPS Coordinates // boundary southWest equals bottom left GPS Coordinates
@ -4029,37 +4034,40 @@ class IndividualPage(BasePage):
# include add_markers function # include add_markers function
jsc += """ jsc += """
function add_markers(num, latitude, longitude, title) { function add_markers(latitude, longitude, title) {
latlon = new mxn.LatLonPoint(latitude, longitude); var latlon = new mxn.LatLonPoint(latitude, longitude);
var marker = new mxn.Marker(latlon); var marker = new mxn.Marker(latlon);
marker.setInfoBubble(title); marker.setInfoBubble('<div id="geo-info">' + title + '</div>');
map.addMarker(marker, true);""" map.addMarker(marker, true);"""
if (-20 <= spanY > -1) or (20 <= spanY > 1): if spanY in smallset:
jsc += """ zoomlevel = 6
var zoomlevel = 6;""" elif spanY in middleset:
zoomlevel = 4
else: else:
jsc += """ zoomlevel = 1
var zoomlevel = 8;"""
jsc += """ jsc += """
map.setCenterAndZoom(latlon, zoomlevel); map.setCenterAndZoom(latlon, %d);
}""" }""" % zoomlevel
# 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!
# here is where the map is held in the CSS # here is where the map is held in the CSS
middlesection += Html("div", id = "familygooglev3", inline = True) middlesection += Html("div", id = "familygooglev3", inline = True)
# add references division and title # add fullclear for proper styling
middlesection += fullclear
with Html("div", class_ = "subsection", id = "References") as section: with Html("div", class_ = "subsection", id = "References") as section:
body += section body += section
section += Html("h4", _("References"), inline = True) section += Html("h4", _("References"), inline = True)
# begin ordered list
ordered = Html("ol") ordered = Html("ol")
section += ordered section += ordered