From 99a75bb13ebe4cc70b16357ea80a835b5cdbe1a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?xavier=20dupr=C3=A9?= Date: Wed, 9 Jan 2019 23:59:37 +0100 Subject: [PATCH] Update data_geo_streets.py --- src/ensae_projects/datainc/data_geo_streets.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ensae_projects/datainc/data_geo_streets.py b/src/ensae_projects/datainc/data_geo_streets.py index 88e4b2d..78cd101 100644 --- a/src/ensae_projects/datainc/data_geo_streets.py +++ b/src/ensae_projects/datainc/data_geo_streets.py @@ -33,9 +33,9 @@ def get_seattle_streets(filename=None, folder="."): The function returns a filename. """ if filename is None: - download_data("WGS84_seattle_street.zip", whereTo=folder) - filename = os.path.join(folder, "Street_Network_Database.shp") - if not os.path.exists(filename): + names = download_data("WGS84_seattle_street.zip", whereTo=folder) + shp = [n for n in names if n.endswith('.shp')] + if len(shp) != 1: from pyquickhelper.loghelper import BufferedPrint buf = BufferedPrint() names = download_data("WGS84_seattle_street.zip", @@ -43,6 +43,7 @@ def get_seattle_streets(filename=None, folder="."): raise FileNotFoundError( "Unable to download data 'WGS84_seattle_street.zip' to '{0}', log={1}\nnames={2}.".format( filename, str(buf), "\n".join(names))) + filename = shp[0] elif not os.path.exists(filename): raise FileNotFoundError(filename) return filename