Fix: plugin package name mismatch

pack.py

@@ -7,7 +7,7 @@
 cwd = Path.cwd()
 source_dir = cwd.joinpath("tianditu_tools")
 dist_dir = cwd.joinpath("dist")
-dist_source_dir = dist_dir.joinpath("tianditu_tools")
+dist_source_dir = dist_dir.joinpath("tianditu-tools")  # same as original plugin package name (tianditu-tools).
 
 # Other necessary files
 other_files = ["README.md", "LICENSE"]

tianditu_tools/widgets/AddMap/extra_map.py

@@ -1,8 +1,8 @@
 from qgis.PyQt.QtWidgets import QMenu
 
-from tianditu_tools.utils import PluginDir, load_yaml, PluginConfig
-from tianditu_tools.widgets.icons import icons, get_extra_map_icon
 from .utils import add_raster_layer, get_map_uri
+from ..icons import icons, get_extra_map_icon
+from ...utils import PluginDir, load_yaml, PluginConfig
 
 conf = PluginConfig()
 

tianditu_tools/widgets/AddMap/main.py

@@ -2,15 +2,11 @@
 
 from qgis.PyQt.QtWidgets import QToolButton, QMenu, QMessageBox
 
-from tianditu_tools.utils import (
-    TIANDITU_HOME_URL,
-    PluginConfig,
-    tianditu_map_url,
-)
-from tianditu_tools.widgets.icons import icons
 from .extra_map import add_tianditu_province_menu, add_extra_map_menu
 from .utils import add_raster_layer
 from .utils import get_map_uri
+from ..icons import icons
+from ...utils import TIANDITU_HOME_URL, PluginConfig, tianditu_map_url
 
 tianditu_map_info = {
     "vec": "天地图-矢量地图",

tianditu_tools/widgets/FitZoom/main.py

@@ -1,7 +1,7 @@
 from qgis.PyQt.QtWidgets import QAction
 from qgis.core import QgsCoordinateReferenceSystem
 
-from tianditu_tools.widgets.icons import icons
+from ..icons import icons
 
 
 def find_nearest_number_index(numbers_list, target):
@@ -32,7 +32,7 @@ def fit_zoom_level(self):
         crs = self.iface.mapCanvas().mapSettings().destinationCrs()
         if crs == QgsCoordinateReferenceSystem("EPSG:3857"):
             max_zoom_level = 23
-            mpp_3857 = [40075016.685 / (2**i * 256) for i in range(max_zoom_level)]
+            mpp_3857 = [40075016.685 / (2 ** i * 256) for i in range(max_zoom_level)]
             current_mpp = self.iface.mapCanvas().mapUnitsPerPixel()
             nearest_level = find_nearest_number_index(mpp_3857, current_mpp)
             zoom_factor = mpp_3857[nearest_level] / current_mpp

tianditu_tools/widgets/Search/main.py

@@ -1,18 +1,18 @@
 from qgis.PyQt.QtCore import Qt
 from qgis.PyQt.QtWidgets import QAction, QMessageBox
 
-from tianditu_tools.utils import PluginConfig
-from tianditu_tools.widgets.icons import icons
 from .searchDock import SearchDockWidget
+from ..icons import icons
+from ...utils import PluginConfig
 
 conf = PluginConfig()
 
 
 class SearchAction(QAction):
     def __init__(
-        self,
-        iface,
-        parent=None,
+            self,
+            iface,
+            parent=None,
     ):
         super().__init__(parent)
         self.parent = parent

tianditu_tools/widgets/Search/searchDock.py

@@ -5,8 +5,8 @@
 from qgis.PyQt.QtWidgets import QTreeWidget, QTreeWidgetItem
 from qgis.core import QgsFeature, QgsPoint, QgsProject, QgsSettings, QgsVectorLayer
 
-from tianditu_tools.ui.search import Ui_SearchDockWidget
-from tianditu_tools.utils import PluginDir, TiandituAPI
+from ...ui.search import Ui_SearchDockWidget
+from ...utils import PluginDir, TiandituAPI
 
 
 class SearchRequestThread(QThread):

tianditu_tools/widgets/Setting/dialog.py

@@ -3,15 +3,15 @@
 from qgis.PyQt.QtGui import QClipboard
 from qgis.PyQt.QtWidgets import QApplication
 
-from tianditu_tools.ui.setting import Ui_SettingDialog
-from tianditu_tools.utils import (
+from .mapmanager import MapManager
+from ...ui.setting import Ui_SettingDialog
+from ...utils import (
     tianditu_map_url,
     check_url_status,
     check_subdomains,
     PluginConfig,
     PluginDir,
 )
-from .mapmanager import MapManager
 
 
 def check_key_format(key: str) -> object:

tianditu_tools/widgets/Setting/main.py

@@ -1,14 +1,14 @@
 from qgis.PyQt.QtWidgets import QAction
 
-from tianditu_tools.widgets.icons import icons
 from .dialog import SettingDialog
+from ..icons import icons
 
 
 class SettingAction(QAction):
     def __init__(
-        self,
-        toolbar,
-        parent=None,
+            self,
+            toolbar,
+            parent=None,
     ):
         super().__init__(parent)
         self.setIcon(icons["setting"])

tianditu_tools/widgets/Setting/mapmanager.py

@@ -5,7 +5,7 @@
 from PyQt5.QtGui import QFont
 from PyQt5.QtWidgets import QPushButton, QTreeWidget, QTreeWidgetItem
 
-from tianditu_tools.utils import load_yaml, PluginConfig, got
+from ...utils import load_yaml, PluginConfig, got
 
 
 class MapManager(QTreeWidget):
@@ -14,9 +14,9 @@ class MapManager(QTreeWidget):
     """
 
     def __init__(
-        self,
-        map_folder: Path,
-        parent=None,
+            self,
+            map_folder: Path,
+            parent=None,
     ):
         super().__init__(parent)
         self.map_folder = map_folder
@@ -115,7 +115,7 @@ def download_map_conf(self, map_id):
         summary_data = got(self.update_url)
         if summary_data.ok:
             with open(
-                self.map_folder.joinpath("summary.yml"), "w", encoding="utf-8"
+                    self.map_folder.joinpath("summary.yml"), "w", encoding="utf-8"
             ) as f:
                 f.write(summary_data.text)
         conf_data = got(download_url)

tianditu_tools/widgets/toolbar.py

@@ -1,11 +1,11 @@
 from qgis.PyQt.QtWidgets import QToolBar
 
-from tianditu_tools.utils import PluginConfig
-from tianditu_tools.widgets.AddMap import AddMapBtn
-from tianditu_tools.widgets.FitZoom import FitZoomAction
-from tianditu_tools.widgets.Search import SearchAction
-from tianditu_tools.widgets.Setting import SettingAction
+from .AddMap import AddMapBtn
+from .FitZoom import FitZoomAction
+from .Search import SearchAction
+from .Setting import SettingAction
 from .icons import icons
+from ..utils import PluginConfig
 
 
 class TiandituToolbar(QToolBar):