GRASS: points removed from topo in GRASS 7

blazek · blazek · commit 7c52e7ddcea3 · 2014-11-06T17:59:40.000+01:00
diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
@@ -919,7 +919,9 @@ QStringList GRASS_LIB_EXPORT QgsGrass::vectorLayers( QString gisdbase,
   // add topology layers
   if ( Vect_get_num_primitives( &map, GV_POINTS ) > 0 )
   {
+#if GRASS_VERSION_MAJOR < 7 /* no more point in GRASS 7 topo */
     list.append( "topo_point" );
+#endif
   }
   if ( Vect_get_num_primitives( &map, GV_LINES ) > 0 )
   {
diff --git a/src/providers/grass/qgsgrassfeatureiterator.cpp b/src/providers/grass/qgsgrassfeatureiterator.cpp
@@ -275,7 +275,12 @@ bool QgsGrassFeatureIterator::fetchFeature( QgsFeature& feature )
   else
   {
     feature.setAttribute( 0, id );
+#if GRASS_VERSION_MAJOR < 7
     if ( mSource->mLayerType == QgsGrassProvider::TOPO_POINT || mSource->mLayerType == QgsGrassProvider::TOPO_LINE )
+#else
+    /* No more topo points in GRASS 7 */
+    if ( mSource->mLayerType == QgsGrassProvider::TOPO_LINE )
+#endif
     {
       feature.setAttribute( 1, QgsGrassProvider::primitiveTypeName( type ) );
 
diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp
@@ -1401,7 +1401,13 @@ bool QgsGrassProvider::lineNodes( int line, int *node1, int *node2 )
     return false;
   }
 
+#if GRASS_VERSION_MAJOR < 7
   Vect_get_line_nodes( mMap, line, node1, node2 );
+#else
+  /* points don't have topology in GRASS >= 7 */
+  *node1 = 0;
+  *node2 = 0;
+#endif
   return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -919,7 +919,9 @@ QStringList GRASS_LIB_EXPORT QgsGrass::vectorLayers( QString gisdbase,`
`919`	`919`	`// add topology layers`
`920`	`920`	`if ( Vect_get_num_primitives( &map, GV_POINTS ) > 0 )`
`921`	`921`	`{`
	`922`	`+#if GRASS_VERSION_MAJOR < 7 /* no more point in GRASS 7 topo */`
`922`	`923`	`list.append( "topo_point" );`
	`924`	`+#endif`
`923`	`925`	`}`
`924`	`926`	`if ( Vect_get_num_primitives( &map, GV_LINES ) > 0 )`
`925`	`927`	`{`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,12 @@ bool QgsGrassFeatureIterator::fetchFeature( QgsFeature& feature )`
`275`	`275`	`else`
`276`	`276`	`{`
`277`	`277`	`feature.setAttribute( 0, id );`
	`278`	`+#if GRASS_VERSION_MAJOR < 7`
`278`	`279`	`if ( mSource->mLayerType == QgsGrassProvider::TOPO_POINT \|\| mSource->mLayerType == QgsGrassProvider::TOPO_LINE )`
	`280`	`+#else`
	`281`	`+ /* No more topo points in GRASS 7 */`
	`282`	`+ if ( mSource->mLayerType == QgsGrassProvider::TOPO_LINE )`
	`283`	`+#endif`
`279`	`284`	`{`
`280`	`285`	`feature.setAttribute( 1, QgsGrassProvider::primitiveTypeName( type ) );`
`281`	`286`
Original file line number	Diff line number	Diff line change
`@@ -1401,7 +1401,13 @@ bool QgsGrassProvider::lineNodes( int line, int node1, int node2 )`
`1401`	`1401`	`return false;`
`1402`	`1402`	`}`
`1403`	`1403`
	`1404`	`+#if GRASS_VERSION_MAJOR < 7`
`1404`	`1405`	`Vect_get_line_nodes( mMap, line, node1, node2 );`
	`1406`	`+#else`
	`1407`	`+ /* points don't have topology in GRASS >= 7 */`
	`1408`	`+ *node1 = 0;`
	`1409`	`+ *node2 = 0;`
	`1410`	`+#endif`
`1405`	`1411`	`return true;`
`1406`	`1412`	`}`
`1407`	`1413`