Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ogr2ogr] Fix promote to multipart logic and add makevalid option #58440

Merged
merged 10 commits into from
Oct 17, 2024
Merged

[ogr2ogr] Fix promote to multipart logic and add makevalid option #58440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
673e0f9
Fix promote to multi logic and add makevalid option
Aug 20, 2024
e643ec6
Fix review comments
Aug 20, 2024
367928b
update tests, fix append and overwrite options
Aug 20, 2024
ee0fdd5
update tests, set ovewrite ti false
Aug 21, 2024
7e74b5f
update tests, remove extra space
Aug 21, 2024
2617d3f
update tests, set promote to false
Aug 21, 2024
1c16769
update tests, use same input
Aug 22, 2024
d0f078a
Format file after changes
Aug 22, 2024
c0e5807
Apply suggestions from code review
nyalldawson Oct 17, 2024
3030259
fix missing bracket reported by flake
Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions python/plugins/processing/algs/gdal/OgrToPostGis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ class OgrToPostGis(GdalAlgorithm):
SHAPE_ENCODING = 'SHAPE_ENCODING'
GTYPE = 'GTYPE'
GEOMTYPE = ['', 'NONE', 'GEOMETRY', 'POINT', 'LINESTRING', 'POLYGON', 'GEOMETRYCOLLECTION', 'MULTIPOINT',
'MULTIPOLYGON', 'MULTILINESTRING', 'CIRCULARSTRING', 'COMPOUNDCURVE', 'CURVEPOLYGON', 'MULTICURVE', 'MULTISURFACE']
'MULTIPOLYGON', 'MULTILINESTRING', 'CIRCULARSTRING', 'COMPOUNDCURVE', 'CURVEPOLYGON', 'MULTICURVE',
'MULTISURFACE', 'CONVERT_TO_LINEAR', 'CONVERT_TO_CURVE']
S_SRS = 'S_SRS'
T_SRS = 'T_SRS'
A_SRS = 'A_SRS'
Expand Down Expand Up @@ -70,6 +71,7 @@ class OgrToPostGis(GdalAlgorithm):
INDEX = 'INDEX'
SKIPFAILURES = 'SKIPFAILURES'
PRECISION = 'PRECISION'
MAKEVALID = 'MAKEVALID'
PROMOTETOMULTI = 'PROMOTETOMULTI'
OPTIONS = 'OPTIONS'

Expand Down Expand Up @@ -161,6 +163,10 @@ def initAlgorithm(self, config=None):
self.tr(
'Continue after a failure, skipping the failed feature'),
defaultValue=False))
self.addParameter(QgsProcessingParameterBoolean(self.MAKEVALID,
self.tr(
'Validate geometries based on Simple Features specification'),
defaultValue=False))
self.addParameter(QgsProcessingParameterBoolean(self.PROMOTETOMULTI,
self.tr('Promote to Multipart'),
defaultValue=True))
Expand Down Expand Up @@ -248,6 +254,7 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
index = self.parameterAsBoolean(parameters, self.INDEX, context)
indexstring = "-lco SPATIAL_INDEX=OFF"
skipfailures = self.parameterAsBoolean(parameters, self.SKIPFAILURES, context)
make_valid = self.parameterAsBoolean(parameters, self.MAKEVALID, context)
promotetomulti = self.parameterAsBoolean(parameters, self.PROMOTETOMULTI, context)
precision = self.parameterAsBoolean(parameters, self.PRECISION, context)
options = self.parameterAsString(parameters, self.OPTIONS, context)
Expand All @@ -270,7 +277,11 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
arguments.append(indexstring)
if launder:
arguments.append(launderstring)
if append:
if append and overwrite:
raise QgsProcessingException(
self.tr(
'Only one of "Overwrite existing table" or "Append to existing table" can be enabled at a time.'))
elif append:
arguments.append('-append')
if include_fields:
arguments.append(fields_string)
Expand Down Expand Up @@ -323,7 +334,16 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
if len(gt) > 0:
arguments.append('-gt')
arguments.append(gt)
if promotetomulti:
if make_valid:
arguments.append('-makevalid')
if promotetomulti and self.GEOMTYPE[self.parameterAsEnum(parameters, self.GTYPE, context)]:
if self.GEOMTYPE[self.parameterAsEnum(parameters, self.GTYPE, context)] == 'CONVERT_TO_LINEAR':
arguments.append('-nlt PROMOTE_TO_MULTI')
else:
raise QgsProcessingException(
self.tr(
'Only one of "Promote to Multipart" or "Output geometry type" (excluding Convert to Linear) can be enabled.'))
elif promotetomulti and not self.GEOMTYPE[self.parameterAsEnum(parameters, self.GTYPE, context)]:
arguments.append('-nlt PROMOTE_TO_MULTI')
if precision is False:
arguments.append('-lco PRECISION=NO')
Expand Down
36 changes: 30 additions & 6 deletions python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ class Ogr2OgrToPostGisList(GdalAlgorithm):
SHAPE_ENCODING = 'SHAPE_ENCODING'
GTYPE = 'GTYPE'
GEOMTYPE = ['', 'NONE', 'GEOMETRY', 'POINT', 'LINESTRING', 'POLYGON', 'GEOMETRYCOLLECTION', 'MULTIPOINT',
'MULTIPOLYGON', 'MULTILINESTRING', 'CIRCULARSTRING', 'COMPOUNDCURVE', 'CURVEPOLYGON', 'MULTICURVE', 'MULTISURFACE']
'MULTIPOLYGON', 'MULTILINESTRING', 'CIRCULARSTRING', 'COMPOUNDCURVE', 'CURVEPOLYGON', 'MULTICURVE',
'MULTISURFACE', 'CONVERT_TO_LINEAR', 'CONVERT_TO_CURVE']
S_SRS = 'S_SRS'
T_SRS = 'T_SRS'
A_SRS = 'A_SRS'
Expand Down Expand Up @@ -76,6 +77,7 @@ class Ogr2OgrToPostGisList(GdalAlgorithm):
INDEX = 'INDEX'
SKIPFAILURES = 'SKIPFAILURES'
PRECISION = 'PRECISION'
MAKEVALID = 'MAKEVALID'
PROMOTETOMULTI = 'PROMOTETOMULTI'
OPTIONS = 'OPTIONS'

Expand Down Expand Up @@ -106,12 +108,14 @@ def initAlgorithm(self, config=None):

schema_param = QgsProcessingParameterDatabaseSchema(
self.SCHEMA,
self.tr('Schema (schema name)'), defaultValue='public', connectionParameterName=self.DATABASE, optional=True)
self.tr('Schema (schema name)'), defaultValue='public', connectionParameterName=self.DATABASE,
optional=True)
self.addParameter(schema_param)

table_param = QgsProcessingParameterDatabaseTable(
self.TABLE,
self.tr('Table to import to (leave blank to use layer name)'), defaultValue=None, connectionParameterName=self.DATABASE,
self.tr('Table to import to (leave blank to use layer name)'), defaultValue=None,
connectionParameterName=self.DATABASE,
schemaParameterName=self.SCHEMA, optional=True, allowNewTableNames=True)
self.addParameter(table_param)

Expand Down Expand Up @@ -165,6 +169,10 @@ def initAlgorithm(self, config=None):
self.tr(
'Continue after a failure, skipping the failed feature'),
defaultValue=False))
self.addParameter(QgsProcessingParameterBoolean(self.MAKEVALID,
self.tr(
'Validate geometries based on Simple Features specification'),
defaultValue=False))
self.addParameter(QgsProcessingParameterBoolean(self.PROMOTETOMULTI,
self.tr('Promote to Multipart'),
defaultValue=True))
Expand Down Expand Up @@ -206,7 +214,8 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
md = QgsProviderRegistry.instance().providerMetadata('postgres')
conn = md.createConnection(connection_name)
except QgsProviderConnectionException:
raise QgsProcessingException(self.tr('Could not retrieve connection details for {}').format(connection_name))
raise QgsProcessingException(
self.tr('Could not retrieve connection details for {}').format(connection_name))

uri = conn.uri()

Expand Down Expand Up @@ -239,6 +248,7 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
index = self.parameterAsBoolean(parameters, self.INDEX, context)
indexstring = "-lco SPATIAL_INDEX=OFF"
skipfailures = self.parameterAsBoolean(parameters, self.SKIPFAILURES, context)
make_valid = self.parameterAsBoolean(parameters, self.MAKEVALID, context)
promotetomulti = self.parameterAsBoolean(parameters, self.PROMOTETOMULTI, context)
precision = self.parameterAsBoolean(parameters, self.PRECISION, context)
options = self.parameterAsString(parameters, self.OPTIONS, context)
Expand All @@ -265,7 +275,11 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
arguments.append(indexstring)
if launder:
arguments.append(launderstring)
if append:
if append and overwrite:
raise QgsProcessingException(
self.tr(
'Only one of "Overwrite existing table" or "Append to existing table" can be enabled at a time.'))
elif append:
arguments.append('-append')
if addfields:
arguments.append('-addfields')
Expand Down Expand Up @@ -316,7 +330,17 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
if len(gt) > 0:
arguments.append('-gt')
arguments.append(gt)
if promotetomulti:
if make_valid:
arguments.append('-makevalid')
if promotetomulti and self.GEOMTYPE[self.parameterAsEnum(parameters, self.GTYPE, context)]:
if self.GEOMTYPE[self.parameterAsEnum(parameters, self.GTYPE, context)] == 'CONVERT_TO_LINEAR':
arguments.append('-nlt PROMOTE_TO_MULTI')
else:
raise QgsProcessingException(
self.tr(
'Only one of "Promote to Multipart" or "Output geometry type" (excluding Convert to Linear) can be enabled.'))

elif promotetomulti and not self.GEOMTYPE[self.parameterAsEnum(parameters, self.GTYPE, context)]:
arguments.append('-nlt PROMOTE_TO_MULTI')
if precision is False:
arguments.append('-lco PRECISION=NO')
Expand Down
Loading
Loading