Improve plotmap

- Change the way of creating file path in plotmap to solve the error not reading local base map in some system environment. - Expose the `read_imgsavepath` and `read_mapboxtoken` function
ni1o1 · Sep 10, 2022 · 624a5d9 · 624a5d9
1 parent a281e03
commit 624a5d9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/transbigdata/__init__.py b/src/transbigdata/__init__.py
@@ -86,7 +86,9 @@
     plot_map,
     plotscale,
     set_mapboxtoken,
-    set_imgsavepath
+    set_imgsavepath,
+    read_imgsavepath,
+    read_mapboxtoken
 )
 from .coordinates import (
     gcj02tobd09,

diff --git a/src/transbigdata/plotmap.py b/src/transbigdata/plotmap.py
@@ -248,11 +248,12 @@ def savefig(filename, tile):
                     if filename in os.listdir(imgsavepath+'tileimg'):  # pragma: no cover
                         pass  # pragma: no cover
                     else:
-                        tile.save(imgsavepath+'tileimg/' +
-                                  filename)  # pragma: no cover
+
+                        tile.save(os.path.join(imgsavepath+'tileimg',
+                                  filename))  # pragma: no cover
                         if printlog:  # pragma: no cover
-                            print('figsaved:'+imgsavepath+'tileimg/' +
-                                  filename)  # pragma: no cover
+                            print('figsaved:'+os.path.join(imgsavepath+'tileimg',
+                                  filename))  # pragma: no cover
                 else:
                     os.mkdir(imgsavepath+'tileimg')
             except Exception as e:
@@ -263,14 +264,16 @@ def loadfig(filename):
                 if 'tileimg' in os.listdir(imgsavepath):
                     if filename in os.listdir(imgsavepath+'tileimg'):  # pragma: no cover
                         tile = Image.open(
-                            imgsavepath+'tileimg\\'+filename)  # pragma: no cover
+                            os.path.join(os.path.join(imgsavepath, 'tileimg'), filename))  # pragma: no cover
                         return tile  # pragma: no cover
                     else:
                         return None  # pragma: no cover
                 else:
                     os.mkdir(imgsavepath+'tileimg')
                     return None  # pragma: no cover
-            except Exception:
+            except Exception as e:
+                if printlog:  # pragma: no cover
+                    print(e)
                 return None
 
         tile = loadfig(filename)