Update data_geo_streets.py

sdpython · Jan 9, 2019 · 99a75bb · 99a75bb
1 parent 8569f7e
commit 99a75bb
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/ensae_projects/datainc/data_geo_streets.py b/src/ensae_projects/datainc/data_geo_streets.py
@@ -33,16 +33,17 @@ 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",
                                   whereTo=folder, fLOG=buf.fprint)
             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