Skip to content

Commit 7961ac5

Browse files
committed
Using suggestions from rabbit
1 parent 1e6b253 commit 7961ac5

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

help/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
# The short X.Y version.
4949
version = '4.0'
5050
# The full version, including alpha/beta/rc tags.
51-
release = '4.0'
51+
release = '4.0.0'
5252

5353
# The language for content autogenerated by Sphinx. Refer to documentation
5454
# for a list of supported languages.

pgRoutingLayer.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,15 +1098,17 @@ def findNearestNode(self, args, pt):
10981098

10991099
#Utils.logMessage(PgrQ.get_closestVertexInfo(args).as_string(connection))
11001100
cursor.execute(PgrQ.get_closestVertexInfo(args))
1101-
if cursor:
1102-
data = cursor.fetchone()
1101+
data = cursor.fetchone()
1102+
db.con.close()
1103+
if data:
11031104
return True, data[0], data[2]
11041105
else:
11051106
return False, None, None
11061107

11071108
except psycopg2.DatabaseError as e:
11081109
QApplication.restoreOverrideCursor()
11091110
QMessageBox.critical(self.dock, self.dock.windowTitle(), '%s' % e)
1111+
return False, None, None
11101112

11111113
finally:
11121114
if db and db.con:

utilities/pgr_queries.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,24 +71,27 @@ def getEdgesQueryXY(args):
7171
FROM {edge_schema}.{edge_table} {where_clause}
7272
""".replace("\\n", r"\n")).format(**args)
7373

74-
def getEndPoint(args, vertex_id):
7574
def getEndPoint(args, vertex_id):
7675
# Prefer source endpoint when available; otherwise fallback to target endpoint
7776
return sql.SQL("""
7877
SELECT COALESCE(
79-
(SELECT ST_StartPoint({geometry}) FROM {edge_schema}.{edge_table} WHERE {source} = {vid} LIMIT 1),
80-
(SELECT ST_EndPoint({geometry}) FROM {edge_schema}.{edge_table} WHERE {target} = {vid} LIMIT 1)
78+
(SELECT ST_StartPoint({geometry}) FROM {edge_schema}.{edge_table} WHERE {source} = {vid} ORDER BY {id} LIMIT 1),
79+
(SELECT ST_EndPoint({geometry}) FROM {edge_schema}.{edge_table} WHERE {target} = {vid} ORDER BY {id} LIMIT 1)
8180
)
8281
""".replace("\\n", r"\n")).format(**args, vid=vertex_id)
8382

8483
def getCostLine(args, departure, arrival):
8584
return sql.Composed([
86-
sql.SQL("SELECT ST_asText(ST_makeLine(("),
87-
getEndPoint(args, departure),
88-
sql.SQL("), ("),
89-
getEndPoint(args, arrival),
90-
sql.SQL("))) AS line")
91-
])
85+
sql.SQL("SELECT ST_AsText("),
86+
args['transform_s'],
87+
sql.SQL("ST_MakeLine(("),
88+
getEndPoint(args, departure),
89+
sql.SQL("), ("),
90+
getEndPoint(args, arrival),
91+
sql.SQL("))"),
92+
args['transform_e'],
93+
sql.SQL(") AS line"),
94+
])
9295

9396
def getMidPoint():
9497
return sql.SQL("SELECT ST_asText(ST_LineInterpolatePoint(ST_GeomFromText(%s),0.5))")

0 commit comments

Comments
 (0)