From 49666928050cbdf9e87dac4d3356e96665c3afd0 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Fri, 8 Nov 2024 12:15:36 +1100 Subject: [PATCH] Rename field to extremum_type --- .../tests/testdata/expected/raster_max.gml | 2 +- .../tests/testdata/expected/raster_max.xsd | 2 +- .../tests/testdata/expected/raster_min.gml | 2 +- .../tests/testdata/expected/raster_min.xsd | 2 +- .../tests/testdata/expected/raster_min_max.gml | 4 ++-- .../tests/testdata/expected/raster_min_max.xsd | 2 +- .../testdata/expected/raster_zonal_extremum.gml | 12 ++++++------ .../testdata/expected/raster_zonal_extremum.xsd | 2 +- src/analysis/processing/qgsalgorithmrasterminmax.cpp | 2 +- .../processing/qgsalgorithmzonalminmaxpoint.cpp | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/python/plugins/processing/tests/testdata/expected/raster_max.gml b/python/plugins/processing/tests/testdata/expected/raster_max.gml index 8967cb3bff1b..5f06d9037a86 100644 --- a/python/plugins/processing/tests/testdata/expected/raster_max.gml +++ b/python/plugins/processing/tests/testdata/expected/raster_max.gml @@ -12,7 +12,7 @@ 45.7964514376 18.696447944245.7964514376 18.6964479442 45.7964514376 18.6964479442 243.00000000 - maximum + maximum diff --git a/python/plugins/processing/tests/testdata/expected/raster_max.xsd b/python/plugins/processing/tests/testdata/expected/raster_max.xsd index dbff6447a2ab..3c10229ed906 100644 --- a/python/plugins/processing/tests/testdata/expected/raster_max.xsd +++ b/python/plugins/processing/tests/testdata/expected/raster_max.xsd @@ -48,7 +48,7 @@ - + diff --git a/python/plugins/processing/tests/testdata/expected/raster_min.gml b/python/plugins/processing/tests/testdata/expected/raster_min.gml index 273785658083..89759ba6dfb8 100644 --- a/python/plugins/processing/tests/testdata/expected/raster_min.gml +++ b/python/plugins/processing/tests/testdata/expected/raster_min.gml @@ -12,7 +12,7 @@ 45.8027514376 18.678647944245.8027514376 18.6786479442 45.8027514376 18.6786479442 85.00000000 - minimum + minimum diff --git a/python/plugins/processing/tests/testdata/expected/raster_min.xsd b/python/plugins/processing/tests/testdata/expected/raster_min.xsd index bf307a4458d5..a0bc2c80e889 100644 --- a/python/plugins/processing/tests/testdata/expected/raster_min.xsd +++ b/python/plugins/processing/tests/testdata/expected/raster_min.xsd @@ -48,7 +48,7 @@ - + diff --git a/python/plugins/processing/tests/testdata/expected/raster_min_max.gml b/python/plugins/processing/tests/testdata/expected/raster_min_max.gml index 70abe6e5ebf5..8df8a23b2469 100644 --- a/python/plugins/processing/tests/testdata/expected/raster_min_max.gml +++ b/python/plugins/processing/tests/testdata/expected/raster_min_max.gml @@ -12,7 +12,7 @@ 45.8027514376 18.678647944245.8027514376 18.6786479442 45.8027514376 18.6786479442 85.00000000 - minimum + minimum @@ -20,7 +20,7 @@ 45.7964514376 18.696447944245.7964514376 18.6964479442 45.7964514376 18.6964479442 243.00000000 - maximum + maximum diff --git a/python/plugins/processing/tests/testdata/expected/raster_min_max.xsd b/python/plugins/processing/tests/testdata/expected/raster_min_max.xsd index 4eee53262e9d..a50cd4bea92c 100644 --- a/python/plugins/processing/tests/testdata/expected/raster_min_max.xsd +++ b/python/plugins/processing/tests/testdata/expected/raster_min_max.xsd @@ -48,7 +48,7 @@ - + diff --git a/python/plugins/processing/tests/testdata/expected/raster_zonal_extremum.gml b/python/plugins/processing/tests/testdata/expected/raster_zonal_extremum.gml index bb83c38a6b9a..09e621333776 100644 --- a/python/plugins/processing/tests/testdata/expected/raster_zonal_extremum.gml +++ b/python/plugins/processing/tests/testdata/expected/raster_zonal_extremum.gml @@ -13,7 +13,7 @@ 2078985.88326099 5746736.89404743 zone 1 97.50000000 - minimum + minimum @@ -22,7 +22,7 @@ 2078752.11232507 5745092.4177069 zone 1 219.19999695 - maximum + maximum @@ -31,7 +31,7 @@ 2080499.82836984 5749099.83092514 zone 2 108.06781769 - minimum + minimum @@ -40,7 +40,7 @@ 2081279.06482292 5747790.6361686 zone 2 243.00000000 - maximum + maximum @@ -49,7 +49,7 @@ 2080421.90472453 5747072.17563143 zone 3 163.57766724 - minimum + minimum @@ -58,7 +58,7 @@ 2080433.03667386 5747056.20984171 zone 3 170.00000000 - maximum + maximum diff --git a/python/plugins/processing/tests/testdata/expected/raster_zonal_extremum.xsd b/python/plugins/processing/tests/testdata/expected/raster_zonal_extremum.xsd index 0b5b3c14fecc..a63be0f20aa6 100644 --- a/python/plugins/processing/tests/testdata/expected/raster_zonal_extremum.xsd +++ b/python/plugins/processing/tests/testdata/expected/raster_zonal_extremum.xsd @@ -54,7 +54,7 @@ - + diff --git a/src/analysis/processing/qgsalgorithmrasterminmax.cpp b/src/analysis/processing/qgsalgorithmrasterminmax.cpp index 004b5604039d..92394d1ccb99 100644 --- a/src/analysis/processing/qgsalgorithmrasterminmax.cpp +++ b/src/analysis/processing/qgsalgorithmrasterminmax.cpp @@ -111,7 +111,7 @@ QVariantMap QgsRasterMinMaxAlgorithm::processAlgorithm( const QVariantMap ¶m { QgsFields outFields; outFields.append( QgsField( QStringLiteral( "value" ), QMetaType::Type::Double, QString(), 20, 8 ) ); - outFields.append( QgsField( QStringLiteral( "extremum" ), QMetaType::Type::QString ) ); + outFields.append( QgsField( QStringLiteral( "extremum_type" ), QMetaType::Type::QString ) ); sink.reset( parameterAsSink( parameters, QStringLiteral( "OUTPUT" ), context, dest, outFields, Qgis::WkbType::Point, mCrs ) ); if ( !sink ) throw QgsProcessingException( invalidSinkError( parameters, QStringLiteral( "OUTPUT" ) ) ); diff --git a/src/analysis/processing/qgsalgorithmzonalminmaxpoint.cpp b/src/analysis/processing/qgsalgorithmzonalminmaxpoint.cpp index 9b5843ad567b..fba2916d33d6 100644 --- a/src/analysis/processing/qgsalgorithmzonalminmaxpoint.cpp +++ b/src/analysis/processing/qgsalgorithmzonalminmaxpoint.cpp @@ -136,7 +136,7 @@ bool QgsZonalMinimumMaximumPointAlgorithm::prepareAlgorithm( const QVariantMap & QgsFields newFields; newFields.append( QgsField( QStringLiteral( "value" ), QMetaType::Type::Double, QString(), 20, 8 ) ); - newFields.append( QgsField( QStringLiteral( "extremum" ), QMetaType::Type::QString ) ); + newFields.append( QgsField( QStringLiteral( "extremum_type" ), QMetaType::Type::QString ) ); mOutputFields = QgsProcessingUtils::combineFields( source->fields(), newFields ); return true;