GeoView : issue 3583 and missing file when no database.

svn: r14299
This commit is contained in:
Serge Noiraud 2010-02-09 22:43:40 +00:00
parent 4dcc9a5f31
commit 01757effa1

View File

@ -662,8 +662,8 @@ class GeoView(HtmlView):
) )
if config.get('geoview.lock'): if config.get('geoview.lock'):
config.set('geoview.zoom', int(self.realzoom)) config.set('geoview.zoom', int(self.realzoom))
config.set('geoview.latitude', self.reallatitude) config.set('geoview.latitude', str(self.reallatitude))
config.set('geoview.longitude', self.reallongitude) config.set('geoview.longitude', str(self.reallongitude))
config.set('geoview.map', self.displaytype) config.set('geoview.map', self.displaytype)
else: else:
config.set('geoview.zoom', 0) config.set('geoview.zoom', 0)
@ -782,6 +782,8 @@ class GeoView(HtmlView):
URL_SEP.join(url.split(os.sep)), URL_SEP.join(url.split(os.sep)),
'', '')) '', ''))
else: else:
if self.htmlfile == "":
self.htmlfile = os.path.join(GEOVIEW_SUBPATH, "geography.html")
url = urlparse.urlunsplit( ('file', '', url = urlparse.urlunsplit( ('file', '',
URL_SEP.join(self.htmlfile.split(os.sep)), URL_SEP.join(self.htmlfile.split(os.sep)),
'', '')) '', ''))