Merge pull request #78 from cayetanobv/cayetanobv/python3_cleaning

Cayetanobv/python3 cleaning

Author: cayetanobv

Test_utils.py

@@ -1,19 +1,19 @@
 from __future__ import absolute_import
 
 from builtins import str
-from qgis.core import QgsCoordinateReferenceSystem, QgsCoordinateTransform, QgsPoint, QgsMessageLog, QgsProject
+from qgis.core import QgsCoordinateReferenceSystem, QgsCoordinateTransform, QgsPoint, Qgis, QgsProject
 from qgis.gui import QgsRubberBand
 import psycopg2
 from pgRoutingLayer import pgRoutingLayer_utils as Utils
 from .FunctionBase import FunctionBase
 
 class Function(FunctionBase):
-    
+
     @classmethod
     def getName(self):
         ''' returns Function name. '''
         return 'alphashape'
-    
+
     @classmethod
     def getControlNames(self, version):
         ''' returns control names for this function. '''
@@ -29,7 +29,7 @@ def getControlNames(self, version):
             'labelAlpha', 'lineEditAlpha',
             'checkBoxDirected', 'checkBoxHasReverseCost'
         ]
-    
+
     @classmethod
     def canExportMerged(self):
         return False
@@ -64,7 +64,7 @@ def getQuery(self, args):
                 )
                 SELECT * FROM node$$::text)
                 """ % args
-                    
+
         # V21.+ has pgr_drivingDistance with big int
         # and pgr_alphaShape has an alpha value
         args['alpha'] = ', ' + str(args['alpha'])
@@ -90,7 +90,7 @@ def getQuery(self, args):
                 )
                 SELECT * FROM node$$::text%(alpha)s)
                 """ % args
-                    
+
 
 
     def getExportQuery(self, args):
@@ -148,24 +148,24 @@ def draw(self, rows, con, args, geomType, canvasItemList, mapCanvas):
 
         resultAreaRubberBand = canvasItemList['area']
         trans = None
-        
+
         canvasCrs = Utils.getDestinationCrs(mapCanvas)
         layerCrs = QgsCoordinateReferenceSystem()
         Utils.createFromSrid(layerCrs, args['srid'])
         trans = QgsCoordinateTransform(layerCrs, canvasCrs,QgsProject.instance())
-        
+
         # return columns are 'x', 'y'
         for row in rows:
             x = row[0]
             y = row[1]
             if args['version'] > 2.0 and ((x is None) or (y is None)):
-                Utils.logMessage(u'Alpha shape result geometry is MultiPolygon or has holes.\nPlease click [Export] button to see complete result.', level=QgsMessageLog.WARNING)
+                Utils.logMessage(u'Alpha shape result geometry is MultiPolygon or has holes.\nPlease click [Export] button to see complete result.', level=Qgis.Warning)
                 return
             pt = QgsPoint(x, y)
             if trans:
                 pt = trans.transform(pt.x(),pt.y())
-            
+
             resultAreaRubberBand.addPoint(pt)
-    
+
     def __init__(self, ui):
         FunctionBase.__init__(self, ui)

functions/alphashape.py

@@ -12,12 +12,12 @@ class Function(FunctionBase):
 
     version = 2.0
 
-    
+
     @classmethod
     def getName(self):
         ''' returns Function name. '''
         return 'ksp'
-    
+
     @classmethod
     def getControlNames(self, version):
         ''' returns control names. '''
@@ -26,30 +26,17 @@ def getControlNames(self, version):
         # only works for directed graph
         self.version = version
         if (self.version < 2.1):
-            return [
-                'labelId', 'lineEditId',
-                'labelSource', 'lineEditSource',
-                'labelTarget', 'lineEditTarget',
-                'labelCost', 'lineEditCost',
-                'labelReverseCost', 'lineEditReverseCost',
+            return self.commonControls + self.commonBoxes + [
                 'labelSourceId', 'lineEditSourceId', 'buttonSelectSourceId',
                 'labelTargetId', 'lineEditTargetId', 'buttonSelectTargetId',
-                'labelPaths', 'lineEditPaths',
-                'checkBoxHasReverseCost'
+                'labelPaths', 'lineEditPaths'
                 ]
         else:
             # function pgr_ksp(text,bigint,bigint,integer,boolean,boolean)
-            return [
-                'labelId', 'lineEditId',
-                'labelSource', 'lineEditSource',
-                'labelTarget', 'lineEditTarget',
-                'labelCost', 'lineEditCost',
-                'labelReverseCost', 'lineEditReverseCost',
+            return self.commonControls + self.commonBoxes + [
                 'labelSourceId', 'lineEditSourceId', 'buttonSelectSourceId',
                 'labelTargetId', 'lineEditTargetId', 'buttonSelectTargetId',
                 'labelPaths', 'lineEditPaths',
-                'checkBoxDirected',
-                'checkBoxHasReverseCost',
                 'checkBoxHeapPaths'
                 ]
 
@@ -61,6 +48,7 @@ def prepare(self, canvasItemList):
 
     def getQuery(self, args):
         ''' returns the sql query in required signature format of pgr_bdDijkstra '''
+        args['where_clause'] = self.whereClause(args['edge_table'], args['geometry'], args['BBOX'])
         if (self.version < 2.1):
             return """
                 SELECT
@@ -74,8 +62,8 @@ def getQuery(self, args):
                     %(cost)s::float8 AS cost
                     %(reverse_cost)s
                   FROM %(edge_table)s
-                  WHERE %(edge_table)s.%(geometry)s && %(BBOX)s',
-                %(source_id)s, %(target_id)s, %(paths)s, %(has_reverse_cost)s)""" % args
+                  %(where_clause)s',
+                  %(source_id)s, %(target_id)s, %(paths)s, %(has_reverse_cost)s)""" % args
         else:
             return """
                 SELECT seq,
@@ -92,7 +80,7 @@ def getQuery(self, args):
                     %(cost)s AS cost
                     %(reverse_cost)s
                   FROM %(edge_table)s
-                  WHERE %(edge_table)s.%(geometry)s && %(BBOX)s',
+                  %(where_clause)s',
                   %(source_id)s, %(target_id)s, %(paths)s,
                   %(directed)s, %(heap_paths)s)""" % args
 
@@ -106,15 +94,15 @@ def getExportMergeQuery(self, args):
             args['result_query'] = self.getQuery(args)
 
             args['with_geom_query'] = """
-                SELECT 
+                SELECT
                   seq, _route,
                   CASE
                     WHEN result._node = %(edge_table)s.%(source)s
                       THEN %(edge_table)s.%(geometry)s
                     ELSE ST_Reverse(%(edge_table)s.%(geometry)s)
                   END AS path_geom
                 FROM %(edge_table)s JOIN result
-                  ON %(edge_table)s.%(id)s = result._edge 
+                  ON %(edge_table)s.%(id)s = result._edge
                 """ % args
 
             args['one_geom_query'] = """
@@ -149,15 +137,15 @@ def getExportMergeQuery(self, args):
             args['result_query'] = self.getQuery(args)
 
             args['with_geom_query'] = """
-                SELECT 
+                SELECT
                   seq, result.path_name,
                   CASE
                     WHEN result._node = %(edge_table)s.%(source)s
                       THEN %(edge_table)s.%(geometry)s
                     ELSE ST_Reverse(%(edge_table)s.%(geometry)s)
                   END AS path_geom
                 FROM %(edge_table)s JOIN result
-                  ON %(edge_table)s.%(id)s = result._edge 
+                  ON %(edge_table)s.%(id)s = result._edge
                 """ % args
 
             args['one_geom_query'] = """
@@ -183,7 +171,7 @@ def getExportMergeQuery(self, args):
                 aggregates AS ( %(aggregates_query)s )
                 SELECT row_number() over() as seq,
                     _path_id, path_name, _nodes, _edges, agg_cost,
-                    path_geom FROM aggregates JOIN one_geom 
+                    path_geom FROM aggregates JOIN one_geom
                     USING (path_name)
                     ORDER BY _path_id
                 """ % args