Making the pgr_KSP and DijkstraBase as similar as possible

Author: cvvergara

functions/DijkstraBase.py

@@ -51,13 +51,12 @@ def prepare(self, canvasItemList):
     @classmethod
     def getQuery(self, args):
         ''' returns the sql query in required signature format of pgr_dijkstra '''
-        return sql.SQL("""
-            SELECT seq, '(' || start_vid || ',' || end_vid || ')' AS path_name,
+        return sql.SQL("""SELECT seq,
+                '(' || start_vid || ',' || end_vid || ')' AS path_name,
                 path_seq AS _path_seq, start_vid AS _start_vid, end_vid AS _end_vid,
-                node AS _node, edge AS _edge, cost AS _cost, lead(agg_cost) over() AS _agg_cost
-            FROM {function}('
-                {innerQuery}
-                ',
+                node AS _node, edge AS _edge,
+                cost AS _cost, agg_cost AS _agg_cost
+            FROM {function}('{innerQuery}',
                 {source_ids}, {target_ids}, {directed})
             """).format(**args)
 

functions/FunctionBase.py

@@ -264,7 +264,6 @@ def drawCostPaths(self, rows, con, args, geomType, canvasItemList, mapCanvas):
                 rubberBand = QgsRubberBand(mapCanvas, Utils.getRubberBandType(False))
                 rubberBand.setColor(QColor(255, 0, 0, 128))
                 rubberBand.setWidth(4)
-
             if args['result_cost'] != -1:
                 costLine = PgrQ.getCostLine(args, sql.Literal(row[1]), sql.Literal(row[2]))
                 # Utils.logMessage(costLine.as_string(cursor))

functions/pgr_KSP.py

@@ -56,16 +56,13 @@ def getControlNames(self, version):
 
     def getQuery(self, args):
         ''' returns the sql query in required signature format of pgr_KSP '''
-        return sql.SQL("""
-            SELECT seq,
-              '(' || start_vid || ',' ||  end_vid || ')-' || path_id AS path_name,
-              path_seq AS _path_seq,
-              start_vid AS _start_vid, end_vid AS _end_vid,
-              path_id AS _path_id,
-              node AS _node,
-              edge AS _edge,
-              cost AS _cost
-            FROM pgr_KSP(' {innerQuery} ',
+        return sql.SQL("""SELECT seq,
+               '(' || start_vid || ',' || end_vid || ')-' || path_id AS path_name,
+                path_seq AS _path_seq, start_vid AS _start_vid, end_vid AS _end_vid,
+                node AS _node, edge AS _edge,
+                path_id AS _path_id,
+                cost AS _cost, agg_cost AS _agg_cost
+            FROM pgr_KSP('{innerQuery}',
                 {source_ids}, {target_ids}, {Kpaths}, {directed}, {heap_paths})
             """).format(**args)
 
@@ -77,5 +74,5 @@ def getExportMergeQuery(self, args):
 
     def draw(self, rows, con, args, geomType, canvasItemList, mapCanvas):
         ''' draw the result '''
-        columns = [2, 4, 5]
+        columns = [2, 5, 6]
         self.drawManyPaths(rows, columns, con, args, geomType, canvasItemList, mapCanvas)

tests/qgis_models.py

@@ -29,7 +29,7 @@
 import logging
 import sys
 
-from PyQt4.QtCore import QObject, pyqtSlot, pyqtSignal, QCoreApplication
+from PyQt5.QtCore import QObject, pyqtSlot, pyqtSignal, QCoreApplication
 from qgis.core import QgsMapLayerRegistry, QgsApplication, QgsVectorLayer
 from qgis.gui import QgsMapCanvasLayer
 import config