Merge pull request #5336 from manisandro/ogrsublayer_tinpolysurf

manisandro · web-flow · commit 754c6dd95078 · 2017-10-10T15:22:52.000+02:00
[OGR] List TIN and PolyhedralSurface as Polygon when searching sublayers
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -765,15 +765,15 @@ QStringList QgsOgrProvider::subLayers() const
         fCount[wkbUnknown] = 0;
       }
 
-      // List TIN and PolyhedralSurface as MultiPolygon
+      // List TIN and PolyhedralSurface as Polygon
       if ( fCount.contains( wkbTIN ) )
       {
-        fCount[wkbMultiPolygon] = fCount.value( wkbMultiPolygon ) + fCount[wkbTIN];
+        fCount[wkbPolygon] = fCount.value( wkbPolygon ) + fCount[wkbTIN];
         fCount.remove( wkbTIN );
       }
       if ( fCount.contains( wkbPolyhedralSurface ) )
       {
-        fCount[wkbMultiPolygon] = fCount.value( wkbMultiPolygon ) + fCount[wkbPolyhedralSurface];
+        fCount[wkbPolygon] = fCount.value( wkbPolygon ) + fCount[wkbPolyhedralSurface];
         fCount.remove( wkbPolyhedralSurface );
       }
       // When there are CurvePolygons, promote Polygons

Original file line number	Diff line number	Diff line change
`@@ -765,15 +765,15 @@ QStringList QgsOgrProvider::subLayers() const`
`765`	`765`	`fCount[wkbUnknown] = 0;`
`766`	`766`	`}`
`767`	`767`
`768`		`- // List TIN and PolyhedralSurface as MultiPolygon`
	`768`	`+ // List TIN and PolyhedralSurface as Polygon`
`769`	`769`	`if ( fCount.contains( wkbTIN ) )`
`770`	`770`	`{`
`771`		`- fCount[wkbMultiPolygon] = fCount.value( wkbMultiPolygon ) + fCount[wkbTIN];`
	`771`	`+ fCount[wkbPolygon] = fCount.value( wkbPolygon ) + fCount[wkbTIN];`
`772`	`772`	`fCount.remove( wkbTIN );`
`773`	`773`	`}`
`774`	`774`	`if ( fCount.contains( wkbPolyhedralSurface ) )`
`775`	`775`	`{`
`776`		`- fCount[wkbMultiPolygon] = fCount.value( wkbMultiPolygon ) + fCount[wkbPolyhedralSurface];`
	`776`	`+ fCount[wkbPolygon] = fCount.value( wkbPolygon ) + fCount[wkbPolyhedralSurface];`
`777`	`777`	`fCount.remove( wkbPolyhedralSurface );`
`778`	`778`	`}`
`779`	`779`	`// When there are CurvePolygons, promote Polygons`