Transparently reproject source points in algs

qgis · Sep 24, 2017 · 6efcc2f · 6efcc2f
1 parent e1eef7e
commit 6efcc2f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py b/python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py
@@ -35,6 +35,7 @@
                        QgsUnitTypes,
                        QgsFeature,
                        QgsFeatureSink,
+                       QgsFeatureRequest,
                        QgsGeometry,
                        QgsFields,
                        QgsField,

diff --git a/python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py b/python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py
@@ -163,7 +163,7 @@ def displayName(self):
 
     def processAlgorithm(self, parameters, context, feedback):
         network = self.parameterAsSource(parameters, self.INPUT, context)
-        startPoint = self.parameterAsPoint(parameters, self.START_POINT, context)
+        startPoint = self.parameterAsPoint(parameters, self.START_POINT, context, network.sourceCrs())
         strategy = self.parameterAsEnum(parameters, self.STRATEGY, context)
         travelCost = self.parameterAsDouble(parameters, self.TRAVEL_COST, context)
 

diff --git a/python/plugins/processing/algs/qgis/ShortestPathLayerToPoint.py b/python/plugins/processing/algs/qgis/ShortestPathLayerToPoint.py
@@ -34,6 +34,7 @@
 from qgis.core import (QgsWkbTypes,
                        QgsUnitTypes,
                        QgsFeature,
+                       QgsFeatureRequest,
                        QgsFeatureSink,
                        QgsGeometry,
                        QgsFields,
@@ -158,7 +159,7 @@ def displayName(self):
     def processAlgorithm(self, parameters, context, feedback):
         network = self.parameterAsSource(parameters, self.INPUT, context)
         startPoints = self.parameterAsSource(parameters, self.START_POINTS, context)
-        endPoint = self.parameterAsPoint(parameters, self.END_POINT, context)
+        endPoint = self.parameterAsPoint(parameters, self.END_POINT, context, network.sourceCrs())
         strategy = self.parameterAsEnum(parameters, self.STRATEGY, context)
 
         directionFieldName = self.parameterAsString(parameters, self.DIRECTION_FIELD, context)

diff --git a/python/plugins/processing/algs/qgis/ShortestPathPointToLayer.py b/python/plugins/processing/algs/qgis/ShortestPathPointToLayer.py
@@ -157,7 +157,7 @@ def displayName(self):
 
     def processAlgorithm(self, parameters, context, feedback):
         network = self.parameterAsSource(parameters, self.INPUT, context)
-        startPoint = self.parameterAsPoint(parameters, self.START_POINT, context)
+        startPoint = self.parameterAsPoint(parameters, self.START_POINT, context, network.sourceCrs())
         endPoints = self.parameterAsSource(parameters, self.END_POINTS, context)
         strategy = self.parameterAsEnum(parameters, self.STRATEGY, context)
 

diff --git a/python/plugins/processing/algs/qgis/ShortestPathPointToPoint.py b/python/plugins/processing/algs/qgis/ShortestPathPointToPoint.py
@@ -160,8 +160,8 @@ def displayName(self):
 
     def processAlgorithm(self, parameters, context, feedback):
         network = self.parameterAsSource(parameters, self.INPUT, context)
-        startPoint = self.parameterAsPoint(parameters, self.START_POINT, context)
-        endPoint = self.parameterAsPoint(parameters, self.END_POINT, context)
+        startPoint = self.parameterAsPoint(parameters, self.START_POINT, context, network.sourceCrs())
+        endPoint = self.parameterAsPoint(parameters, self.END_POINT, context, network.sourceCrs())
         strategy = self.parameterAsEnum(parameters, self.STRATEGY, context)
 
         directionFieldName = self.parameterAsString(parameters, self.DIRECTION_FIELD, context)

diff --git a/python/plugins/processing/gui/PointSelectionPanel.py b/python/plugins/processing/gui/PointSelectionPanel.py
@@ -28,6 +28,9 @@
 
 import os
 
+from qgis.core import (QgsProject,
+                       QgsReferencedPointXY,
+                       QgsPointXY)
 from qgis.PyQt import uic
 
 from qgis.utils import iface
@@ -48,6 +51,7 @@ def __init__(self, dialog, default=None):
         self.btnSelect.clicked.connect(self.selectOnCanvas)
 
         self.dialog = dialog
+        self.crs = QgsProject.instance().crs()
 
         if iface is not None:
             canvas = iface.mapCanvas()
@@ -76,6 +80,7 @@ def selectOnCanvas(self):
 
     def updatePoint(self, point, button):
         s = '{},{}'.format(point.x(), point.y())
+        self.crs = QgsProject.instance().crs()
 
         self.leText.setText(s)
         canvas = iface.mapCanvas()
@@ -86,7 +91,15 @@ def updatePoint(self, point, button):
 
     def getValue(self):
         if str(self.leText.text()).strip() != '':
-            return str(self.leText.text())
+            try:
+                parts = self.leText.text().split(',')
+                parts = [float(p) for p in parts]
+                r = QgsReferencedPointXY(QgsPointXY(parts[0], parts[1]),
+                                         self.crs)
+                return r
+
+            except:
+                return str(self.leText.text())
         else:
             return None