Fixing/Using issues found by rabbit

cvvergara · cvvergara · commit b56f923be42c · 2025-10-28T14:45:47.000-06:00
diff --git a/functions/CostBase.py b/functions/CostBase.py
@@ -63,24 +63,31 @@ def getExportQuery(self, args):
             WITH
             result AS ( {result_query} ),
             departure AS (
-                SELECT start_vid, end_vid, ST_startPoint(geom) AS depart
-                FROM result JOIN {edge_table} ON ({edge_table}.{source} = start_vid)
-
-                UNION
-
-                SELECT start_vid, end_vid, ST_endPoint(geom)
-                FROM result JOIN {edge_table} ON ({edge_table}.{target} = start_vid)
-                ),
-
+                SELECT DISTINCT ON (start_vid, end_vid)
+                       start_vid, end_vid,
+                       CASE
+                           WHEN {edge_table}.{source} = start_vid
+                               THEN ST_StartPoint({edge_table}.{geometry})
+                           ELSE ST_EndPoint({edge_table}.{geometry})
+                       END AS depart
+                FROM result
+                JOIN {edge_schema}.{edge_table}
+                  ON ({edge_table}.{source} = start_vid OR {edge_table}.{target} = start_vid)
+                ORDER BY start_vid, end_vid, {edge_table}.{id}
+            ),
             destination AS (
-                SELECT start_vid, end_vid, ST_startPoint(geom) AS arrive
-                FROM result JOIN {edge_table} ON ({edge_table}.{source} = end_vid)
-
-                UNION
-
-                SELECT start_vid, end_vid, ST_endPoint(geom)
-                FROM result JOIN {edge_table} ON ({edge_table}.{target} = end_vid)
-                )
+                SELECT DISTINCT ON (start_vid, end_vid)
+                       start_vid, end_vid,
+                       CASE
+                           WHEN {edge_table}.{source} = end_vid
+                               THEN ST_StartPoint({edge_table}.{geometry})
+                           ELSE ST_EndPoint({edge_table}.{geometry})
+                       END AS arrive
+                FROM result
+                JOIN {edge_schema}.{edge_table}
+                  ON ({edge_table}.{source} = end_vid OR {edge_table}.{target} = end_vid)
+                ORDER BY start_vid, end_vid, {edge_table}.{id}
+            )
 
             SELECT result.*, ST_MakeLine(depart, arrive) AS path_geom
 
diff --git a/functions/FunctionBase.py b/functions/FunctionBase.py
@@ -283,7 +283,6 @@ def drawCostPaths(self, rows, con, args, geomType, canvasItemList, mapCanvas):
 
                 # Label the edge
                 midPoint = PgrQ.getMidPoint()
-                midPointstr = midPoint.as_string(con)
                 midPointCursor.execute(midPoint,(line,))
                 pointRow = midPointCursor.fetchone()
                 # Utils.logMessage("The point:" + str(pointRow[0]))
diff --git a/functions/pgr_aStar.py b/functions/pgr_aStar.py
@@ -30,8 +30,6 @@
 
 class Function(AstarBase):
 
-    minPGRversion = 2.4
-
     def __init__(self, ui):
         AstarBase.__init__(self, ui)
 
diff --git a/functions/pgr_aStarCost.py b/functions/pgr_aStarCost.py
@@ -30,8 +30,6 @@
 
 class Function(CostBase):
 
-    minPGRversion = 2.4
-
     def __init__(self, ui):
         CostBase.__init__(self, ui)
 
diff --git a/functions/pgr_bdAstar.py b/functions/pgr_bdAstar.py
@@ -30,8 +30,6 @@
 
 class Function(AstarBase):
 
-    minPGRversion = 2.5
-
     def __init__(self, ui):
         AstarBase.__init__(self, ui)
 
diff --git a/functions/pgr_bdAstarCost.py b/functions/pgr_bdAstarCost.py
@@ -30,8 +30,6 @@
 
 class Function(CostBase):
 
-    minPGRversion = 2.5
-
     def __init__(self, ui):
         CostBase.__init__(self, ui)
 
diff --git a/functions/pgr_bdDijkstra.py b/functions/pgr_bdDijkstra.py
@@ -29,8 +29,6 @@
 
 class Function(DijkstraBase):
 
-    minPGRversion = 2.5
-
     def __init__(self, ui):
         DijkstraBase.__init__(self, ui)
 
diff --git a/functions/pgr_bdDijkstraCost.py b/functions/pgr_bdDijkstraCost.py
@@ -30,8 +30,6 @@
 
 class Function(CostBase):
 
-    minPGRversion = 2.5
-
     def __init__(self, ui):
         CostBase.__init__(self, ui)
 
diff --git a/functions/pgr_dijkstra.py b/functions/pgr_dijkstra.py
@@ -29,8 +29,6 @@
 
 class Function(DijkstraBase):
 
-    minPGRversion = 2.1
-
     def __init__(self, ui):
         DijkstraBase.__init__(self, ui)
 
diff --git a/functions/pgr_dijkstraCost.py b/functions/pgr_dijkstraCost.py
@@ -30,8 +30,6 @@
 
 class Function(CostBase):
 
-    minPGRversion = 2.2
-
     def __init__(self, ui):
         CostBase.__init__(self, ui)
 
diff --git a/metadata.txt b/metadata.txt
@@ -7,7 +7,7 @@ about=Dockable widget that adds pgRouting layers
     - pgr_dijstra pgr_dijstraCost
     - pgr_bdDijstra pgr_bdDijstraCost
     - pgr_KSP
-version=3.0.2
+version=4.0.0
 qgisMinimumVersion=3.10
 qgisMaximumVersion=3.99
 author=Anita Graser, Ko Nagase, Vicky Vergara, Cayetano Benavent, Aasheesh Tiwari
@@ -16,7 +16,7 @@ changelog=4.0.0
     - Works best for pgRouting 4.0.0
     - No longer Support of QGIS < 3.10
     - Using PyQt5
-    3.0.1
+    3.0.2
     - Support for QGIS >= 3.24.
     - Fixed non-existence database error issue.
     3.0.1
@@ -29,7 +29,7 @@ changelog=4.0.0
     - Last experimental release works only for QGIS 2.x
 tags=pgRouting,PostGIS,routing,network analysis
 icon=icon.png
-experimental=True
+experimental=False
 homepage=https://qgis.pgrouting.org/
 tracker=https://github.com/pgRouting/pgRoutingLayer/issues
 repository=https://github.com/pgRouting/pgRoutingLayer
diff --git a/pgRoutingLayer.py b/pgRoutingLayer.py
@@ -1089,6 +1089,7 @@ def findNearestNode(self, args, pt):
         args['SBBOX'] = self.getBBOX(args['srid'])[0]
         args['geom_t'] = Utils.getTransformedGeom(args['srid'], args['dbcanvas_srid'], args['geometry'])
 
+        db = None
         try:
             dbname = str(self.dock.comboConnections.currentText())
             db = self.actionsDb[dbname].connect()
@@ -1103,12 +1104,17 @@ def findNearestNode(self, args, pt):
             else:
                 return False, None, None
 
-            db.connection.close()
-
         except psycopg2.DatabaseError as e:
             QApplication.restoreOverrideCursor()
             QMessageBox.critical(self.dock, self.dock.windowTitle(), '%s' % e)
 
+        finally:
+            if db and db.con:
+                try:
+                    db.con.close()
+                except Exception:
+                    pass
+
     # emulate "matching.sql" - "find_nearest_link_within_distance"
     def findNearestLink(self, args, pt):
         ''' finds the nearest link to selected point '''
diff --git a/pgRoutingLayer_utils.py b/pgRoutingLayer_utils.py
@@ -94,8 +94,7 @@ def getCanvasSrid(crs):
 
 def createFromSrid(crs, srid):
     ''' Creates Spatial reference system based of SRID. '''
-    return crs.createFromProj(str(srid))
-
+    return crs.createFromString(f"EPSG:{srid}")
 
 def getRubberBandType(isPolygon):
     ''' returns RubberBandType as polygon or lineString '''
diff --git a/utilities/pgr_queries.py b/utilities/pgr_queries.py
@@ -72,11 +72,14 @@ def getEdgesQueryXY(args):
         """.replace("\\n", r"\n")).format(**args)
 
 def getEndPoint(args, vertex_id):
+def getEndPoint(args, vertex_id):
+    # Prefer source endpoint when available; otherwise fallback to target endpoint
     return sql.SQL("""
-        SELECT ST_startPoint({geometry}) FROM {edge_schema}.{edge_table} WHERE {source} = {vid}
-        UNION
-        SELECT ST_endPoint({geometry}) FROM {edge_schema}.{edge_table} WHERE {target} = {vid}
-        """.replace("\\n", r"\n")).format(**args, vid=vertex_id)
+        SELECT COALESCE(
+            (SELECT ST_StartPoint({geometry}) FROM {edge_schema}.{edge_table} WHERE {source} = {vid} LIMIT 1),
+            (SELECT ST_EndPoint({geometry}) FROM {edge_schema}.{edge_table} WHERE {target} = {vid} LIMIT 1)
+        )
+    """.replace("\\n", r"\n")).format(**args, vid=vertex_id)
 
 def getCostLine(args, departure, arrival):
     return sql.Composed([
