Merge pull request #37074 from alexbruy/fix-servicearea

fix saving attributes in the service area algorithm
qgis · Jun 10, 2020 · 954ab15 · 954ab15
2 parents 013f682 + 18195e2
commit 954ab15
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 164 deletions.
diff --git a/python/plugins/processing/tests/testdata/custom/multi_polys_with_empty_geoms.gpkg b/python/plugins/processing/tests/testdata/custom/multi_polys_with_empty_geoms.gpkg
diff --git a/python/plugins/processing/tests/testdata/expected/multi_polys_non_null_one_empty.gpkg b/python/plugins/processing/tests/testdata/expected/multi_polys_non_null_one_empty.gpkg
diff --git a/python/plugins/processing/tests/testdata/expected/results_remove_null_geometries.gpkg b/python/plugins/processing/tests/testdata/expected/results_remove_null_geometries.gpkg
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_lines.gml b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_lines.gml
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_nodes_bounds.dbf b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_nodes_bounds.dbf
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_nodes_bounds.gml b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_nodes_bounds.gml
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_nodes_bounds.prj b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_nodes_bounds.prj
@@ -0,0 +1 @@
+PROJCS["WGS_1984_UTM_Zone_33S",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",10000000.0],PARAMETER["Central_Meridian",15.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]]
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_nodes_bounds.shp b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_nodes_bounds.shp
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_nodes_bounds.shx b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_nodes_bounds.shx
diff --git a/python/plugins/processing/tests/testdata/expected/service_area_from_layer_nodes_bounds.xsd b/python/plugins/processing/tests/testdata/expected/service_area_from_layer_nodes_bounds.xsd
diff --git a/python/plugins/processing/tests/testdata/qgis_algorithm_tests2.yaml b/python/plugins/processing/tests/testdata/qgis_algorithm_tests2.yaml
@@ -2004,7 +2004,7 @@ tests:
       VALUE_FORWARD: ''
     results:
       OUTPUT:
-        name: expected/service_area_from_layer_nodes_bounds.gml
+        name: expected/service_area_from_layer_nodes_bounds.shp
         type: vector
 
   - algorithm: native:serviceareafromlayer

diff --git a/src/analysis/processing/qgsalgorithmserviceareafromlayer.cpp b/src/analysis/processing/qgsalgorithmserviceareafromlayer.cpp
@@ -245,13 +245,13 @@ QVariantMap QgsServiceAreaFromLayerAlgorithm::processAlgorithm( const QVariantMa
         QgsGeometry geomLower = QgsGeometry::fromMultiPointXY( lowerBoundary );
 
         feat.setGeometry( geomUpper );
-        attributes = sourceAttributes.value( i );
+        attributes = sourceAttributes.value( i + 1 );
         attributes << QStringLiteral( "upper" ) << origPoint;
         feat.setAttributes( attributes );
         pointsSink->addFeature( feat, QgsFeatureSink::FastInsert );
 
         feat.setGeometry( geomLower );
-        attributes = sourceAttributes.value( i );
+        attributes = sourceAttributes.value( i + 1 );
         attributes << QStringLiteral( "lower" ) << origPoint;
         feat.setAttributes( attributes );
         pointsSink->addFeature( feat, QgsFeatureSink::FastInsert );
@@ -262,7 +262,7 @@ QVariantMap QgsServiceAreaFromLayerAlgorithm::processAlgorithm( const QVariantMa
     {
       QgsGeometry geomLines = QgsGeometry::fromMultiPolylineXY( lines );
       feat.setGeometry( geomLines );
-      attributes = sourceAttributes.value( i );
+      attributes = sourceAttributes.value( i + 1 );
       attributes << QStringLiteral( "lines" ) << origPoint;
       feat.setAttributes( attributes );
       linesSink->addFeature( feat, QgsFeatureSink::FastInsert );