Merge pull request #2615 from Gustry/qgis_version

qgis version and language in osm downloader url
inasafe · Feb 5, 2016 · 9d871d6 · 9d871d6
2 parents 0ba6fb9 + a01e238
commit 9d871d6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/safe/utilities/osm_downloader.py b/safe/utilities/osm_downloader.py
@@ -26,6 +26,7 @@
 from PyQt4.QtGui import QDialog
 
 from safe.utilities.i18n import tr
+from safe.utilities.gis import qgis_version
 from safe.utilities.file_downloader import FileDownloader
 from safe.common.exceptions import DownloadError, CanceledImportDialogError
 from safe.common.version import get_version
@@ -71,16 +72,17 @@ def download(feature_type, output_base_path, extent, progress_dialog=None):
             min_latitude=min_latitude,
             max_longitude=max_longitude,
             max_latitude=max_latitude
-        )
+    )
 
     url = URL_OSM_PREFIX + feature_type + URL_OSM_SUFFIX
-    url = '{url}?bbox={box}&qgis_version=2'.format(
-        url=url, box=box)
+    url = '{url}?bbox={box}&qgis_version={qgis}'.format(
+        url=url, box=box, qgis=qgis_version())
 
     url += '&inasafe_version=%s' % get_version()
 
     if 'LANG' in os.environ:
-        env_lang = os.environ['LANG']
+        # Get the language only : eg 'en_US' -> 'en'
+        env_lang = os.environ['LANG'].split('_')[0]
         url += '&lang=%s' % env_lang
 
     path = tempfile.mktemp('.shp.zip')

diff --git a/safe/utilities/test/test_osm_downloader.py b/safe/utilities/test/test_osm_downloader.py
@@ -32,6 +32,7 @@
 from safe.utilities.osm_downloader import fetch_zip, extract_zip
 from safe.test.utilities import test_data_path, get_qgis_app
 from safe.common.version import get_version
+from safe.utilities.gis import qgis_version
 
 QGIS_APP, CANVAS, IFACE, PARENT = get_qgis_app()
 LOGGER = logging.getLogger('InaSAFE')
@@ -138,8 +139,6 @@ def request(self, request_url):
         url = str(request_url.url().toString())
         reply = MockQNetworkReply()
 
-        version = get_version()
-
         if url == 'http://hot-export.geofabrik.de/newjob':
             reply.content = read_all('test-importdlg-newjob.html')
         elif url == 'http://hot-export.geofabrik.de/wizard_area':
@@ -152,9 +151,9 @@ def request(self, request_url):
         elif url == ('http://osm.inasafe.org/buildings-shp?'
                      'bbox=20.389938354492188,-34.10782492987083'
                      ',20.712661743164062,'
-                     '-34.008273470938335&qgis_version=2'
+                     '-34.008273470938335&qgis_version=%s'
                      '&inasafe_version=%s'
-                     '&lang=en' % version):
+                     '&lang=en' % (qgis_version(), get_version())):
             reply.content = read_all("test-importdlg-extractzip.zip")
 
         return reply