sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-15 00:02:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup conversion of input layers to OGR compatible sources

Browse Source
This commit is contained in:
Nyall Dawson 2017-07-11 17:20:53 +10:00
parent 6301ff6606
commit d45215ebc1
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
python/plugins/processing/algs/gdal/GdalAlgorithm.py
View File

@ -39,6 +39,8 @@ from qgis.core import (QgsApplication,
from processing.core.GeoAlgorithm import GeoAlgorithm from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.algs.gdal.GdalAlgorithmDialog import GdalAlgorithmDialog from processing.algs.gdal.GdalAlgorithmDialog import GdalAlgorithmDialog
from processing.algs.gdal.GdalUtils import GdalUtils from processing.algs.gdal.GdalUtils import GdalUtils
from processing.tools.vector import ogrConnectionString, ogrLayerName
from processing.tools import dataobjects from processing.tools import dataobjects
pluginPath = os.path.normpath(os.path.join( pluginPath = os.path.normpath(os.path.join(
@ -65,23 +67,36 @@ class GdalAlgorithm(QgsProcessingAlgorithm):
def getConsoleCommands(self, parameters, context, feedback): def getConsoleCommands(self, parameters, context, feedback):
return None return None
def getOgrCompatibleSource(self, parameter_name, parameters, context, feedback):
"""
Interprets a parameter as an OGR compatible source and layer name
"""
input_layer = self.parameterAsVectorLayer(parameters, parameter_name, context)
ogr_data_path = None
ogr_layer_name = None
if input_layer is None:
# parameter is not a vector layer - try to convert to a source compatible with OGR
# and extract selection if required
ogr_data_path = self.parameterAsCompatibleSourceLayerPath(parameters, parameter_name, context,
QgsVectorFileWriter.supportedFormatExtensions(),
feedback=feedback)
ogr_layer_name = ogrLayerName(ogr_data_path)
elif input_layer.dataProvider().name() == 'ogr':
# parameter is a vector layer, with OGR data provider
# so extract selection if required
ogr_data_path = self.parameterAsCompatibleSourceLayerPath(parameters, parameter_name, context,
QgsVectorFileWriter.supportedFormatExtensions(),
feedback=feedback)
ogr_layer_name = ogrLayerName(input_layer.dataProvider().dataSourceUri())
else:
# vector layer, but not OGR - get OGR compatible path
# TODO - handle "selected features only" mode!!
ogr_data_path = ogrConnectionString(input_layer.dataProvider().dataSourceUri(), context)[1:-1]
ogr_layer_name = ogrLayerName(input_layer.dataProvider().dataSourceUri())
return ogr_data_path, ogr_layer_name
def processAlgorithm(self, parameters, context, feedback): def processAlgorithm(self, parameters, context, feedback):
commands = self.getConsoleCommands(parameters, context, feedback) commands = self.getConsoleCommands(parameters, context, feedback)
#layers = QgsProcessingUtils.compatibleVectorLayers(QgsProject.instance())
#supported = QgsVectorFileWriter.supportedFormatExtensions()
#for i, c in enumerate(commands):
# for layer in layers:
# if layer.source() in c:
# exported = dataobjects.exportVectorLayer(layer, supported)
# exportedFileName = os.path.splitext(os.path.split(exported)[1])[0]
# c = c.replace(layer.source(), exported)
# if os.path.isfile(layer.source()):
# fileName = os.path.splitext(os.path.split(layer.source())[1])[0]
# c = re.sub('[\s]{}[\s]'.format(fileName), ' ' + exportedFileName + ' ', c)
# c = re.sub('[\s]{}'.format(fileName), ' ' + exportedFileName, c)
# c = re.sub('["\']{}["\']'.format(fileName), "'" + exportedFileName + "'", c)
# commands[i] = c
GdalUtils.runGdal(commands, feedback) GdalUtils.runGdal(commands, feedback)
# auto generate outputs # auto generate outputs

9
python/plugins/processing/algs/gdal/ogr2ogrpointsonlines.py
View File

@ -83,15 +83,8 @@ class Ogr2OgrPointsOnLines(GdalAlgorithm):
return self.tr('Vector geoprocessing') return self.tr('Vector geoprocessing')
def getConsoleCommands(self, parameters, context, feedback): def getConsoleCommands(self, parameters, context, feedback):
inLayer = self.parameterAsVectorLayer(parameters, self.INPUT_LAYER, context) ogrLayer, layername = self.getOgrCompatibleSource(self.INPUT_LAYER, parameters, context, feedback)
if inLayer is None or inLayer.dataProvider().name() == 'ogr':
ogrLayer = self.parameterAsCompatibleSourceLayerPath(parameters, self.INPUT_LAYER, context, QgsVectorFileWriter.supportedFormatExtensions(), feedback=feedback)
if inLayer is None:
inLayer = ogrLayer
else:
ogrLayer = ogrConnectionString(inLayer, context)[1:-1]
layername = "'" + ogrLayerName(inLayer) + "'"
distance = str(self.parameterAsDouble(parameters, self.DISTANCE, context)) distance = str(self.parameterAsDouble(parameters, self.DISTANCE, context))
geometry = str(self.parameterAsString(parameters, self.GEOMETRY, context)) geometry = str(self.parameterAsString(parameters, self.GEOMETRY, context))