Merge pull request #42 from mixedbredie/master

Updated alphashape.py to use BBOX

Author: cvvergara

functions/alphashape.py

@@ -14,7 +14,8 @@ def getName(self):
 
     @classmethod
     def getControlNames(self, version):
-        return [
+        self.version = version
+        return self.commonControls + self.commonBoxes + [
             'labelId', 'lineEditId',
             'labelSource', 'lineEditSource',
             'labelTarget', 'lineEditTarget',
@@ -35,6 +36,7 @@ def prepare(self, canvasItemList):
         resultAreaRubberBand.reset(Utils.getRubberBandType(True))
 
     def getQuery(self, args):
+        args['where_clause'] = self.whereClause(args['edge_table'], args['geometry'], args['BBOX'])
         if args['version'] < 2.1:
             return """
                 SELECT x, y FROM pgr_alphashape($$
@@ -46,7 +48,7 @@ def getQuery(self, args):
                         %(target)s::int4 AS target,
                         %(cost)s::float8 AS cost%(reverse_cost)s
                         FROM %(edge_table)s
-                        WHERE %(edge_table)s.%(geometry)s && %(BBOX)s',
+			%(where_clause)s',
                         %(source_id)s, %(distance)s,
                         %(directed)s, %(has_reverse_cost)s)
                 ),
@@ -72,7 +74,7 @@ def getQuery(self, args):
                         %(target)s AS target,
                         %(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, %(distance)s,
                         %(directed)s)
                 ),
@@ -93,13 +95,13 @@ def getExportQuery(self, args):
                 SELECT 1 AS seq, ST_SetSRID(pgr_pointsAsPolygon, 0) AS path_geom FROM pgr_pointsAsPolygon($$
                 WITH
                 dd AS (
-                  SELECT seq, id1 AS _node FROM pgr_drivingDistance(''
+                  SELECT seq, id1 AS _node FROM pgr_drivingDistance('
                         SELECT %(id)s::int4 AS id,
                         %(source)s::int4 AS source,
                         %(target)s::int4 AS target,
                         %(cost)s::float8 AS cost%(reverse_cost)s
                         FROM %(edge_table)s
-                        WHERE %(edge_table)s.%(geometry)s && %(BBOX)s'',
+			%(where_clause)s',
                         %(source_id)s, %(distance)s,
                         %(directed)s, %(has_reverse_cost)s)
                 ),
@@ -116,13 +118,13 @@ def getExportQuery(self, args):
                 SELECT 1 AS seq, ST_SetSRID(pgr_pointsAsPolygon, 0) AS path_geom FROM pgr_pointsAsPolygon($$
                 WITH
                 dd AS (
-                  SELECT seq, node AS _node FROM pgr_drivingDistance(''
+                  SELECT seq, node AS _node FROM pgr_drivingDistance('
                         SELECT %(id)s AS id,
                         %(source)s AS source,
                         %(target)s AS target,
                         %(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, %(distance)s,
                         %(directed)s)
                 ),
@@ -137,8 +139,6 @@ def getExportQuery(self, args):
 
 
 
-
-
     def draw(self, rows, con, args, geomType, canvasItemList, mapCanvas):
         resultAreaRubberBand = canvasItemList['area']
         trans = None