Skip to content

Commit

Permalink
[processing] restore offset curve algorithm
Browse files Browse the repository at this point in the history
  • Loading branch information
alexbruy committed Oct 11, 2017
1 parent 105222e commit 9b74d9f
Show file tree
Hide file tree
Showing 5 changed files with 124 additions and 137 deletions.
4 changes: 2 additions & 2 deletions python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
# from .gdalcalc import gdalcalc
# from .rasterize_over import rasterize_over

from .OffsetCurve import OffsetCurve
from .ogrinfo import ogrinfo
from .OgrToPostGis import OgrToPostGis
from .PointsAlongLines import PointsAlongLines
Expand All @@ -84,7 +85,6 @@
# from .ogr2ogrbuffer import Ogr2OgrBuffer
# from .ogr2ogrdissolve import Ogr2OgrDissolve
# from .onesidebuffer import OneSideBuffer
# from .offsetcurve import OffsetCurve
# from .ogr2ogrtabletopostgislist import Ogr2OgrTableToPostGisList
# from .ogrsql import OgrSql

Expand Down Expand Up @@ -175,6 +175,7 @@ def loadAlgorithms(self):
# gdalcalc(),
# rasterize_over(),
# ----- OGR tools -----
OffsetCurve(),
ogrinfo(),
OgrToPostGis(),
PointsAlongLines(),
Expand All @@ -185,7 +186,6 @@ def loadAlgorithms(self):
# Ogr2OgrBuffer(),
# Ogr2OgrDissolve(),
# OneSideBuffer(),
# OffsetCurve(),
# Ogr2OgrTableToPostGisList(),
# OgrSql(),
]
Expand Down
103 changes: 103 additions & 0 deletions python/plugins/processing/algs/gdal/OffsetCurve.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
offsetcurve.py
---------------------
Date : Janaury 2015
Copyright : (C) 2015 by Giovanni Manghi
Email : giovanni dot manghi at naturalgis dot pt
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************
"""

__author__ = 'Giovanni Manghi'
__date__ = 'January 2015'
__copyright__ = '(C) 2015, Giovanni Manghi'

# This will get replaced with a git SHA1 when you do a git archive

__revision__ = '$Format:%H$'

from qgis.core import (QgsProcessing,
QgsProcessingParameterFeatureSource,
QgsProcessingParameterString,
QgsProcessingParameterNumber,
QgsProcessingParameterVectorDestination,
QgsProcessingOutputVectorLayer)
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.algs.gdal.GdalUtils import GdalUtils


class OffsetCurve(GdalAlgorithm):

INPUT = 'INPUT'
GEOMETRY = 'GEOMETRY'
DISTANCE = 'DISTANCE'
OPTIONS = 'OPTIONS'
OUTPUT = 'OUTPUT'

def __init__(self):
super().__init__()

def initAlgorithm(self, config=None):
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT,
self.tr('Input layer'),
[QgsProcessing.TypeVectorLine]))
self.addParameter(QgsProcessingParameterString(self.GEOMETRY,
self.tr('Geometry column name'),
defaultValue='geometry'))
self.addParameter(QgsProcessingParameterNumber(self.DISTANCE,
self.tr('Offset distance (left-sided: positive, right-sided: negative)'),
type=QgsProcessingParameterNumber.Double,
defaultValue=10))
self.addParameter(QgsProcessingParameterString(self.OPTIONS,
self.tr('Additional creation options'),
defaultValue='',
optional=True))

self.addParameter(QgsProcessingParameterVectorDestination(self.OUTPUT,
self.tr('Offset curve'),
QgsProcessing.TypeVectorLine))

def name(self):
return 'offsetcurve'

def displayName(self):
return self.tr('Offset curve')

def group(self):
return self.tr('Vector geoprocessing')

def commandName(self):
return 'ogr2ogr'

def getConsoleCommands(self, parameters, context, feedback):
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback)
geometry = self.parameterAsString(parameters, self.GEOMETRY, context)
distance = self.parameterAsDouble(parameters, self.DISTANCE, context)
options = self.parameterAsString(parameters, self.OPTIONS, context)
outFile = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)

output, outputFormat = GdalUtils.ogrConnectionStringAndFormat(outFile, context)

arguments = []
arguments.append(output)
arguments.append(ogrLayer)
arguments.append('-dialect')
arguments.append('sqlite')
arguments.append('-sql')

sql = "SELECT ST_OffsetCurve({}, {}), * FROM '{}'".format(geometry, distance, layerName)
arguments.append(sql)

if options:
arguments.append(options)

return ['ogr2ogr', GdalUtils.escapeAndJoin(arguments)]
115 changes: 0 additions & 115 deletions python/plugins/processing/algs/gdal/offsetcurve.py

This file was deleted.

6 changes: 3 additions & 3 deletions python/plugins/processing/algs/gdal/ogrinfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
__revision__ = '$Format:%H$'


from qgis.core import (QgsProcessingParameterVectorLayer,
from qgis.core import (QgsProcessingParameterFeatureSource,
QgsProcessingParameterBoolean,
QgsProcessingParameterFileDestination,
QgsProcessingOutputHtml)
Expand All @@ -45,8 +45,8 @@ def __init__(self):
super().__init__()

def initAlgorithm(self, config=None):
self.addParameter(QgsProcessingParameterVectorLayer(self.INPUT,
self.tr('Input layer')))
self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT,
self.tr('Input layer')))
self.addParameter(QgsProcessingParameterBoolean(self.SUMMARY_ONLY,
self.tr('Summary output only'),
defaultValue=True))
Expand Down
33 changes: 16 additions & 17 deletions python/plugins/processing/tests/testdata/gdal_algorithm_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -338,22 +338,22 @@ tests:
compare:
ignore_crs_check: true

# - algorithm: gdal:offsetlinesforlines
# name: Offset lines for lines (right-handed)
# params:
# GEOMETRY: geometry
# INPUT_LAYER:
# name: lines.gml
# type: vector
# RADIUS: -0.5
# results:
# OUTPUT_LAYER:
# name: expected/gdal/offset_lines.gml
# type: vector
# compare:
# geometry:
# precision: 7
#
- algorithm: gdal:offsetcurve
name: Offset curve (right-handed)
params:
GEOMETRY: geometry
INPUT_LAYER:
name: lines.gml
type: vector
RADIUS: -0.5
results:
OUTPUT_LAYER:
name: expected/gdal/offset_lines.gml
type: vector
compare:
geometry:
precision: 7

# - algorithm: gdal:singlesidedbufferforlines
# name: One-side buffer for lines (left-handed)
# params:
Expand Down Expand Up @@ -429,4 +429,3 @@ tests:
# geometry:
# precision: 7
#

0 comments on commit 9b74d9f

Please sign in to comment.