Skip to content

Commit c36ae50

Browse files
committed
fix upstream tree
1 parent 7874154 commit c36ae50

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

src/tools/qgepmaptools.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,7 @@ def getTree(self, node_id: str):
464464
self.rubberBand.reset()
465465

466466
nodes, edges = self.network_analyzer.getTree(node_id, upstream)
467-
polylines = self.network_analyzer.getEdgeGeometry(
468-
[edge[2]['feature'] for edge in edges])
467+
polylines = self.network_analyzer.getEdgeGeometry([edge[2]['feature'] for edge in edges])
469468

470469
# Fix for QGIS < 2.0
471470
filtered_polylines = [pl for pl in polylines if pl]

src/tools/qgepnetwork.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,28 +28,25 @@
2828
"""
2929
from __future__ import print_function
3030

31+
import copyreg
32+
3133
# pylint: disable=no-name-in-module
32-
from builtins import str
33-
from builtins import zip
34-
from builtins import next
35-
from builtins import object
34+
from builtins import str, zip, object
3635
from collections import defaultdict
3736
import time
3837
import re
39-
from qgis.PyQt.QtCore import pyqtSignal
38+
from qgis.PyQt.QtCore import pyqtSignal, QObject
4039
from qgis.PyQt.QtSql import QSqlDatabase, QSqlQuery
4140

4241
from qgis.core import (
4342
Qgis,
4443
QgsMessageLog,
4544
QgsGeometry,
4645
QgsDataSourceUri,
46+
QgsPointXY,
4747
NULL
4848
)
49-
from qgis.gui import (
50-
QgsMessageBar
51-
)
52-
from qgis.PyQt.QtCore import QObject
49+
from qgis.gui import QgsMessageBar
5350
import networkx as nx
5451

5552

@@ -282,6 +279,11 @@ def getTree(self, node, upstream=False):
282279
if self.dirty:
283280
self.createGraph()
284281

282+
# fix point pickle
283+
def pickle_point(p):
284+
return QgsPointXY, (p.x(),p.y(),)
285+
copyreg.pickle(QgsPointXY, pickle_point)
286+
285287
if upstream:
286288
my_graph = self.graph.reverse()
287289
else:

0 commit comments

Comments
 (0)