API changes

Author: AasheeshT

__init__.py

@@ -32,5 +32,5 @@ def icon():
 def qgisMinimumVersion():
     return "1.7"
 def classFactory(iface):
-    from pgRoutingLayer import PgRoutingLayer
-    return PgRoutingLayer(iface)
+    from pgRoutingLayer import pgRoutingLayer
+    return pgRoutingLayer(iface)

connectors/postgis.py

@@ -18,7 +18,7 @@
 from __future__ import print_function
 from builtins import str
 from builtins import map
-from qgis.core import QgsDataSourceURI
+from qgis.core import QgsDataSourceUri
 from qgis.PyQt.QtCore import QSettings
 from qgis.PyQt.QtGui import QIcon
 from qgis.PyQt.QtWidgets import QInputDialog
@@ -134,7 +134,7 @@ def connect(self, selected, parent=None):
 
 		settings.endGroup()
 
-		uri = qgis.core.QgsDataSourceURI()
+		uri = qgis.core.QgsDataSourceUri()
 		if service:
 			uri.setConnection(service, database, username, password)
 		else:

dbConnection.py

@@ -4,7 +4,7 @@
 from builtins import str
 from builtins import range
 from builtins import object
-from qgis.core import QgsDataSourceURI
+from qgis.core import QgsDataSourceUri
 from qgis.PyQt.QtCore import QSettings
 from qgis.PyQt.QtWidgets import QAction
 
@@ -116,8 +116,8 @@ def getAvailableConnections(self):
 
 
 	def getURI(self):
-		# returns a new QgsDataSourceURI instance
-		return qgis.core.QgsDataSourceURI( self.uri.connectionInfo() )
+		# returns a new QgsDataSourceUri instance
+		return qgis.core.QgsDataSourceUri( self.uri.connectionInfo() )
 
 	def getAction(self, parent=None):
 		return Connection.ConnectionAction(self.uri.database(), self.getTypeName(), parent)

functions/FunctionBase.py

@@ -1,6 +1,6 @@
 from builtins import str
 from builtins import object
-from qgis.core import (QgsMessageLog, QGis, QgsGeometry)
+from qgis.core import (QgsMessageLog, Qgis, QgsGeometry)
 from qgis.gui import QgsRubberBand
 from qgis.PyQt.QtGui import QColor
 
@@ -218,11 +218,11 @@ def drawManyPaths(self, rows, con, args, geomType, canvasItemList, mapCanvas):
                 assert row2, "Invalid result geometry. (path_id:%(result_path_id)s, node_id:%(result_node_id)d, edge_id:%(result_edge_id)d)" % args
 
                 geom = QgsGeometry().fromWkt(str(row2[0]))
-                if geom.wkbType() == QGis.WKBMultiLineString:
+                if geom.wkbType() == Qgis.WKBMultiLineString:
                     for line in geom.asMultiPolyline():
                         for pt in line:
                             rubberBand.addPoint(pt)
-                elif geom.wkbType() == QGis.WKBLineString:
+                elif geom.wkbType() == Qgis.WKBLineString:
                     for pt in geom.asPolyline():
                         rubberBand.addPoint(pt)
 
@@ -253,7 +253,7 @@ def drawOnePath(self, rows, con, args, geomType, canvasItemList, mapCanvas):
                     assert row2, "Invalid result geometry. (node_id:%(result_node_id)d, edge_id:%(result_edge_id)d)" % args
 
                     geom = QgsGeometry().fromWkt(str(row2[0]))
-                    if geom.wkbType() == QGis.WKBMultiLineString:
+                    if geom.wkbType() == Qgis.WKBMultiLineString:
                         for line in geom.asMultiPolyline():
                             for pt in line:
                                 resultPathRubberBand.addPoint(pt)
@@ -268,5 +268,5 @@ def drawOnePath(self, rows, con, args, geomType, canvasItemList, mapCanvas):
 
     def __init__(self, ui):
         self.ui = ui
-        self.minVersion = 2.0
-        self.maxVersion = 2.99
+        self.minVersion = 3.0
+        self.maxVersion = 3.0

metadata.txt

@@ -3,8 +3,8 @@ name=pgRoutingLayer
 description=Dockable widget that adds pgRouting layers
 about=Dockable widget that adds pgRouting layers
 version=2.2.2
-qgisMinimumVersion=2.0
-qgisMaximumVersion=2.99
+qgisMinimumVersion=3.0
+qgisMaximumVersion=3.1
 author=Anita Graser, Ko Nagase, Vicky Vergara
 [email protected]
 changelog=2.2.2

pgRoutingLayer.py

@@ -28,7 +28,7 @@
 
 from qgis.PyQt.QtGui import QColor, QIcon, QIntValidator, QDoubleValidator
 from qgis.PyQt.QtWidgets import QAction
-from qgis.core import QgsMessageLog,QGis
+from qgis.core import QgsMessageLog,Qgis
 from qgis.gui import QgsVertexMarker,QgsRubberBand,QgsMapToolEmitPoint
 from . import dbConnection
 from qgis.utils import iface
@@ -387,11 +387,11 @@ def setIds(self, pt):
                 idRubberBand = QgsRubberBand(mapCanvas, Utils.getRubberBandType(False))
                 idRubberBand.setColor(Qt.yellow)
                 idRubberBand.setWidth(4)
-                if geom.wkbType() == QGis.WKBMultiLineString:
+                if geom.wkbType() == Qgis.WKBMultiLineString:
                     for line in geom.asMultiPolyline():
                         for pt in line:
                             idRubberBand.addPoint(pt)
-                elif geom.wkbType() == QGis.WKBLineString:
+                elif geom.wkbType() == Qgis.WKBLineString:
                     for pt in geom.asPolyline():
                         idRubberBand.addPoint(pt)
                 self.idsRubberBands.append(idRubberBand)
@@ -434,11 +434,11 @@ def setSourceId(self, pt):
             if result:
                 self.dock.lineEditSourceId.setText(str(id))
                 geom = QgsGeometry().fromWkt(wkt)
-                if geom.wkbType() == QGis.WKBMultiLineString:
+                if geom.wkbType() == Qgis.WKBMultiLineString:
                     for line in geom.asMultiPolyline():
                         for pt in line:
                             self.sourceIdRubberBand.addPoint(pt)
-                elif geom.wkbType() == QGis.WKBLineString:
+                elif geom.wkbType() == Qgis.WKBLineString:
                     for pt in geom.asPolyline():
                         self.sourceIdRubberBand.addPoint(pt)
                 self.dock.lineEditSourcePos.setText(str(pos))
@@ -506,11 +506,11 @@ def setTargetId(self, pt):
             if result:
                 self.dock.lineEditTargetId.setText(str(id))
                 geom = QgsGeometry().fromWkt(wkt)
-                if geom.wkbType() == QGis.WKBMultiLineString:
+                if geom.wkbType() == Qgis.WKBMultiLineString:
                     for line in geom.asMultiPolyline():
                         for pt in line:
                             self.targetIdRubberBand.addPoint(pt)
-                elif geom.wkbType() == QGis.WKBLineString:
+                elif geom.wkbType() == Qgis.WKBLineString:
                     for pt in geom.asPolyline():
                         self.targetIdRubberBand.addPoint(pt)
                 self.dock.lineEditTargetPos.setText(str(pos))

pgRoutingLayer_utils.py

@@ -1,4 +1,4 @@
-from qgis.core import QgsMessageLog,QGis
+from qgis.core import QgsMessageLog,Qgis
 from qgis.gui import QgsMapCanvas
 from qgis.PyQt.QtCore import QVariant, QSettings
 #from PyQt4.QtGui import *
@@ -94,7 +94,7 @@ def refreshMapCanvas(mapCanvas):
     else:
         return mapCanvas.refresh()
 
-def logMessage(message, level=QgsMessageLog.INFO):
+def logMessage(message, level=Qgis.Info):
     QgsMessageLog.logMessage(message, 'pgRouting Layer', level)
 
 def getNodeQuery(args, geomType):