From 5a10264d5f655118e7301d828c3115a3d9adc188 Mon Sep 17 00:00:00 2001 From: noirauds Date: Sun, 9 Feb 2014 13:53:14 +0100 Subject: [PATCH] bug 7368 : Geography gramplet does not communicate over proxy server with autorisation. --- gramps/plugins/lib/maps/osmgps.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gramps/plugins/lib/maps/osmgps.py b/gramps/plugins/lib/maps/osmgps.py index 5632c47ca..2d4ecd3fe 100644 --- a/gramps/plugins/lib/maps/osmgps.py +++ b/gramps/plugins/lib/maps/osmgps.py @@ -133,11 +133,18 @@ class OsmGps(): constants.map_title[map_type]) config.set("geography.map_service", map_type) self.current_map = map_type + http_proxy = os.environ.get('http_proxy') if 0: self.osm = DummyMapNoGpsPoint() else: - self.osm = osmgpsmap.Map(tile_cache=tiles_path, - map_source=constants.map_type[map_type]) + if http_proxy: + self.osm = osmgpsmap.Map(tile_cache=tiles_path, + proxy_uri=http_proxy, + map_source=constants.map_type[map_type]) + else: + self.osm = osmgpsmap.Map(tile_cache=tiles_path, + map_source=constants.map_type[map_type]) + self.osm.props.tile_cache = osmgpsmap.MAP_CACHE_AUTO current_map = osmgpsmap.MapOsd( show_dpad=False, show_zoom=True) self.end_selection = None self.osm.layer_add(current_map)