flatten geometries in virtual ogr sublayers, i.e. mix 2D and 25D

blazek · blazek · commit d4945db8116f · 2013-06-03T14:34:42.000+02:00
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -217,9 +217,8 @@ bool QgsOgrFeatureIterator::readFeature( OGRFeatureH fet, QgsFeature& feature )
 
       feature.setGeometryAndOwnership( wkb, OGR_G_WkbSize( geom ) );
     }
-
     if (( useIntersect && ( !feature.geometry() || !feature.geometry()->intersects( mRequest.filterRect() ) ) )
-        || ( geometryTypeFilter && ( !feature.geometry() || feature.geometry()->wkbType() != ( QGis::WkbType )P->mOgrGeometryTypeFilter ) ) )
+        || ( geometryTypeFilter && ( !feature.geometry() || wkbFlatten(( OGRwkbGeometryType )feature.geometry()->wkbType() ) != wkbFlatten( P->mOgrGeometryTypeFilter ) ) ) )
     {
       OGR_F_Destroy( fet );
       return false;
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -552,7 +552,7 @@ QStringList QgsOgrProvider::subLayers() const
         OGRGeometryH geom = OGR_F_GetGeometryRef( fet );
         if ( geom )
         {
-          OGRwkbGeometryType gType = OGR_G_GetGeometryType( geom );
+          OGRwkbGeometryType gType = wkbFlatten( OGR_G_GetGeometryType( geom ) );
           fCount[gType] = fCount.value( gType ) + 1;
         }
         OGR_F_Destroy( fet );

Original file line number	Diff line number	Diff line change
`@@ -217,9 +217,8 @@ bool QgsOgrFeatureIterator::readFeature( OGRFeatureH fet, QgsFeature& feature )`
`217`	`217`
`218`	`218`	`feature.setGeometryAndOwnership( wkb, OGR_G_WkbSize( geom ) );`
`219`	`219`	`}`
`220`		`-`
`221`	`220`	`if (( useIntersect && ( !feature.geometry() \|\| !feature.geometry()->intersects( mRequest.filterRect() ) ) )`
`222`		`- \|\| ( geometryTypeFilter && ( !feature.geometry() \|\| feature.geometry()->wkbType() != ( QGis::WkbType )P->mOgrGeometryTypeFilter ) ) )`
	`221`	`+ \|\| ( geometryTypeFilter && ( !feature.geometry() \|\| wkbFlatten(( OGRwkbGeometryType )feature.geometry()->wkbType() ) != wkbFlatten( P->mOgrGeometryTypeFilter ) ) ) )`
`223`	`222`	`{`
`224`	`223`	`OGR_F_Destroy( fet );`
`225`	`224`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,7 @@ QStringList QgsOgrProvider::subLayers() const`
`552`	`552`	`OGRGeometryH geom = OGR_F_GetGeometryRef( fet );`
`553`	`553`	`if ( geom )`
`554`	`554`	`{`
`555`		`- OGRwkbGeometryType gType = OGR_G_GetGeometryType( geom );`
	`555`	`+ OGRwkbGeometryType gType = wkbFlatten( OGR_G_GetGeometryType( geom ) );`
`556`	`556`	`fCount[gType] = fCount.value( gType ) + 1;`
`557`	`557`	`}`
`558`	`558`	`OGR_F_Destroy( fet );`