Merge pull request #10 from Kanahiro/fix/url-without-ext

Fix/url without ext
Kanahiro · Oct 22, 2023 · 257ece9 · 257ece9
2 parents f33c064 + 19af91f
commit 257ece9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@ def _requires_from_file(filename):
 
 setup(
     name="tileget",
-    version="0.2.0",
+    version="0.2.1",
     description="Tile download utility - easily download xyz-tile data",
     author="Kanahiro Iguchi",
     license="MIT",

diff --git a/tileget/__main__.py b/tileget/__main__.py
@@ -103,9 +103,12 @@ def main():
     geom_3857 = shapely.ops.transform(transformer.transform, geometry)
 
     def download(tile):
-        ext = args["tileurl"].split(".")[-1]
+        basepath = args["tileurl"].split("/")[-1]  # ?foo=bar&z={z}.ext
+        segments = basepath.split(".")
+        ext = "." + segments[-1] if len(segments) > 1 else ""
+
         write_dir = os.path.join(args["output_dir"], str(tile[2]), str(tile[0]))
-        write_filepath = os.path.join(write_dir, str(tile[1]) + "." + ext)
+        write_filepath = os.path.join(write_dir, str(tile[1]) + ext)
 
         if os.path.exists(write_filepath) and not args["overwrite"]:
             # skip if already exists when not-overwrite mode