Make requested changes

src/quick_map_services/about_dialog.py

@@ -10,8 +10,8 @@
 from qgis.PyQt.QtWidgets import QDialog, QLabel, QWidget
 from qgis.utils import pluginMetadata
 
-qt_major_version = int(QT_VERSION_STR.split(".")[0])
-if qt_major_version < 6:
+QT_MAJOR_VERSION = int(QT_VERSION_STR.split(".")[0])
+if QT_MAJOR_VERSION < 6:
     from qgis.PyQt.QtSvg import QSvgWidget
 elif find_spec("qgis.PyQt.QtSvgWidgets"):
     from qgis.PyQt.QtSvgWidgets import QSvgWidget

src/quick_map_services/compat.py

@@ -1,12 +1,102 @@
-from qgis.PyQt.QtCore import QT_VERSION_STR
+from typing import TYPE_CHECKING
 
-qt_major_version = int(QT_VERSION_STR.split(".")[0])
+from qgis.core import (
+    Qgis,
+    QgsFeatureRequest,
+    QgsMapLayerProxyModel,
+    QgsMapLayerType,
+    QgsWkbTypes,
+)
+from qgis.PyQt.QtCore import QT_VERSION_STR, QMetaType, QVariant
 
-if qt_major_version < 6:
+QGIS_3_30 = 33000
+QGIS_3_32 = 33200
+QGIS_3_34 = 33400
+QGIS_3_36 = 33600
+QGIS_3_38 = 33800
+QGIS_3_38 = 34000
+
+QT_MAJOR_VERSION = int(QT_VERSION_STR.split(".")[0])
+
+if QT_MAJOR_VERSION < 6:
     from qgis.PyQt.QtCore import QIODevice
 
     OpenModeFlag = QIODevice.OpenModeFlag.WriteOnly
 else:
     from qgis.PyQt.QtCore import QIODeviceBase
 
     OpenModeFlag = QIODeviceBase.OpenModeFlag.WriteOnly
+
+if Qgis.versionInt() >= QGIS_3_30 or TYPE_CHECKING:
+    WkbType = Qgis.WkbType  # type: ignore
+
+    GeometryType = Qgis.GeometryType  # type: ignore
+
+    LayerType = Qgis.LayerType  # type: ignore
+
+else:
+    WkbType = QgsWkbTypes.Type  # type: ignore
+
+    GeometryType = QgsWkbTypes.GeometryType  # type: ignore
+    GeometryType.Point = GeometryType.PointGeometry  # type: ignore
+    GeometryType.Point.is_monkey_patched = True
+    GeometryType.Line = GeometryType.LineGeometry  # type: ignore
+    GeometryType.Line.is_monkey_patched = True
+    GeometryType.Polygon = GeometryType.PolygonGeometry  # type: ignore
+    GeometryType.Polygon.is_monkey_patched = True
+    GeometryType.Unknown = GeometryType.UnknownGeometry  # type: ignore
+    GeometryType.Unknown.is_monkey_patched = True
+    GeometryType.Null = GeometryType.NullGeometry  # type: ignore
+    GeometryType.Null.is_monkey_patched = True
+
+    LayerType = QgsMapLayerType
+    LayerType.Vector = QgsMapLayerType.VectorLayer  # type: ignore
+    LayerType.Vector.is_monkey_patched = True
+    LayerType.Raster = QgsMapLayerType.RasterLayer  # type: ignore
+    LayerType.Raster.is_monkey_patched = True
+    LayerType.Plugin = QgsMapLayerType.PluginLayer  # type: ignore
+    LayerType.Plugin.is_monkey_patched = True
+    LayerType.Mesh = QgsMapLayerType.MeshLayer  # type: ignore
+    LayerType.Mesh.is_monkey_patched = True
+    LayerType.VectorTile = QgsMapLayerType.VectorTileLayer  # type: ignore
+    LayerType.VectorTile.is_monkey_patched = True
+    LayerType.Annotation = QgsMapLayerType.AnnotationLayer  # type: ignore
+    LayerType.Annotation.is_monkey_patched = True
+    LayerType.PointCloud = QgsMapLayerType.PointCloudLayer  # type: ignore
+    LayerType.PointCloud.is_monkey_patched = True
+
+if Qgis.versionInt() >= QGIS_3_34 or TYPE_CHECKING:
+    LayerFilter = Qgis.LayerFilter
+    LayerFilters = Qgis.LayerFilters
+
+else:
+    LayerFilter = QgsMapLayerProxyModel.Filter
+    LayerFilters = QgsMapLayerProxyModel.Filters
+
+if Qgis.versionInt() >= QGIS_3_36 or TYPE_CHECKING:
+    FeatureRequestFlag = Qgis.FeatureRequestFlag
+    FeatureRequestFlags = Qgis.FeatureRequestFlags
+
+else:
+    FeatureRequestFlag = QgsFeatureRequest.Flag
+    FeatureRequestFlags = QgsFeatureRequest.Flags
+
+
+if Qgis.versionInt() >= QGIS_3_38 or TYPE_CHECKING:
+    FieldType = QMetaType.Type
+else:
+    FieldType = QVariant.Type
+    FieldType.QString = QVariant.Type.String
+    FieldType.QString.is_monkey_patched = True
+    FieldType.LongLong = QVariant.Type.LongLong
+    FieldType.LongLong.is_monkey_patched = True
+
+try:
+    from packaging import version
+
+    parse_version = version.parse
+
+except Exception:
+    import pkg_resources
+
+    parse_version = pkg_resources.parse_version  # type: ignore