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

Little bits of cleanup in the javascript code for place maps.

Browse Source 
svn: r18027
This commit is contained in:
Rob G. Healey 2011-08-11 09:28:24 +00:00
parent 49dd772d3c
commit 199786a53c
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4088,7 +4088,6 @@ class IndividualPage(BasePage):
if self.mapservice == "Google": if self.mapservice == "Google":
head += Html("script", type ="text/javascript", head += Html("script", type ="text/javascript",
src ="http://maps.googleapis.com/maps/api/js?sensor=false", inline =True) src ="http://maps.googleapis.com/maps/api/js?sensor=false", inline =True)
else: else:
head += Html("script", type ="text/javascript", head += Html("script", type ="text/javascript",
src ="http://www.openlayers.org/api/OpenLayers.js", inline =True) src ="http://www.openlayers.org/api/OpenLayers.js", inline =True)
@ -4166,7 +4165,6 @@ class IndividualPage(BasePage):
} }
map = new google.maps.Map(document.getElementById("map_canvas"), mapOptions); map = new google.maps.Map(document.getElementById("map_canvas"), mapOptions);
} }
function drop() { function drop() {
for (var i = 0; i < gpsCoords.length; i++) { for (var i = 0; i < gpsCoords.length; i++) {
@ -4175,7 +4173,6 @@ class IndividualPage(BasePage):
}, i * 200); }, i * 200);
} }
} }
function addMarker() { function addMarker() {
markers.push(new google.maps.Marker({ markers.push(new google.maps.Marker({
@ -4247,7 +4244,6 @@ class IndividualPage(BasePage):
selector: new OpenLayers.Control.SelectFeature(vectorLayer, { onSelect: selector: new OpenLayers.Control.SelectFeature(vectorLayer, { onSelect:
createPopup, onUnselect: destroyPopup }) createPopup, onUnselect: destroyPopup })
}; };
function createPopup(feature) { function createPopup(feature) {
feature.popup = new OpenLayers.Popup.FramedCloud("pop", feature.popup = new OpenLayers.Popup.FramedCloud("pop",
feature.geometry.getBounds().getCenterLonLat(), feature.geometry.getBounds().getCenterLonLat(),
@ -4260,7 +4256,6 @@ class IndividualPage(BasePage):
//feature.popup.closeOnMove = true; //feature.popup.closeOnMove = true;
map.addPopup(feature.popup); map.addPopup(feature.popup);
} }
function destroyPopup(feature) { function destroyPopup(feature) {
feature.popup.destroy(); feature.popup.destroy();
feature.popup = null; feature.popup = null;
@ -4290,11 +4285,11 @@ class IndividualPage(BasePage):
ordered1 += list1 ordered1 += list1
# add body id for this page... # add body id for this page...
body.attr = 'id ="FamilyMap" ' body.attr = 'id ="FamilyMap"'
# add body onload to initialize map for Google Maps only... # add body onload to initialize map for Google Maps only...
if self.mapservice == "Google": if self.mapservice == "Google":
body.attr += ' onload ="initialize()" ' body.attr += ' onload ="initialize()"'
# add clearline for proper styling # add clearline for proper styling
# add footer section # add footer section