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

GeoView : 2 bugs : swap map and saving zoom when no title.

Browse Source 
svn: r13180
This commit is contained in:
Serge Noiraud 2009-09-08 21:28:27 +00:00
parent 4e7df6fc71
commit 5d7f92a4fc
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/DataViews/GeoView.py
View File

@ -262,11 +262,14 @@ class GeoView(HtmlView):
res = self.dbstate.db.get_researcher() res = self.dbstate.db.get_researcher()
if res: # Don't modify the current values if no db is loaded. if res: # Don't modify the current values if no db is loaded.
start = 0 start = 0
title = ZOOMANDPOS.search(self.renderer.title, start) try:
if title: title = ZOOMANDPOS.search(self.renderer.title, start)
self.realzoom = title.group(1) if title:
self.reallatitude = title.group(2) self.realzoom = title.group(1)
self.reallongitude = title.group(3) self.reallatitude = title.group(2)
self.reallongitude = title.group(3)
except:
pass
def _change_map(self, usedmap): def _change_map(self, usedmap):
""" """
@ -737,18 +740,18 @@ class GeoView(HtmlView):
self.mapview.write("maps?file=api&v=2\"\n") self.mapview.write("maps?file=api&v=2\"\n")
self.mapview.write(" type=\"text/javascript\">\n") self.mapview.write(" type=\"text/javascript\">\n")
self.mapview.write("</script>\n") self.mapview.write("</script>\n")
if self.usedmap == "microsoft": if _alternate_map() == "microsoft":
self.mapview.write("<script type=\"text/javascript\"\n") self.mapview.write("<script type=\"text/javascript\"\n")
self.mapview.write(" src=\"http://dev.virtualearth.net/") self.mapview.write(" src=\"http://dev.virtualearth.net/")
self.mapview.write("mapcontrol/mapcontrol.ashx?v=6\">\n") self.mapview.write("mapcontrol/mapcontrol.ashx?v=6\">\n")
self.mapview.write("</script>\n") self.mapview.write("</script>\n")
elif self.usedmap == "yahoo": elif _alternate_map() == "yahoo":
self.mapview.write("<script type=\"text/javascript\"\n") self.mapview.write("<script type=\"text/javascript\"\n")
self.mapview.write(" src=\"http://api.maps.yahoo.com/") self.mapview.write(" src=\"http://api.maps.yahoo.com/")
self.mapview.write("ajaxymap?v=3.0&appid=MapstractionDemo\" ") self.mapview.write("ajaxymap?v=3.0&appid=MapstractionDemo\" ")
self.mapview.write("type=\"text/javascript\">\n") self.mapview.write("type=\"text/javascript\">\n")
self.mapview.write("</script>\n") self.mapview.write("</script>\n")
elif self.usedmap == "openlayers": elif _alternate_map() == "openlayers":
self.mapview.write("<script type=\"text/javascript\"\n") self.mapview.write("<script type=\"text/javascript\"\n")
self.mapview.write(" src=\"http://openlayers.org/") self.mapview.write(" src=\"http://openlayers.org/")
self.mapview.write("api/OpenLayers.js\">\n") self.mapview.write("api/OpenLayers.js\">\n")