Rule based renderer: empty rule matches all

m-kuhn · m-kuhn · commit abf2398880d4 · 2015-08-15T09:26:50.000+02:00
Fix #13218
diff --git a/src/core/qgsvectorlayerrenderer.cpp b/src/core/qgsvectorlayerrenderer.cpp
@@ -145,7 +145,7 @@ bool QgsVectorLayerRenderer::render()
                                      .setFilterRect( requestExtent )
                                      .setSubsetOfAttributes( mAttrNames, mFields );
 
-  if ( !rendererFilter.isNull() )
+  if ( !rendererFilter.isEmpty() )
   {
     featureRequest.setFilterExpression( rendererFilter );
   }
diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -427,24 +427,33 @@ bool QgsRuleBasedRendererV2::Rule::startRender( QgsRenderContext& context, const
     }
   }
 
-  // subfilters (on the same level) are joined with OR and finally joined with AND with their parent (this) filter
+  // subfilters (on the same level) are joined with OR
+  // Finally they are joined with their parent (this) with AND
   QString sf;
-  if ( subfilters.length() )
+  // If there are subfilters present (and it's not a single empty one), group them and join them with OR
+  if ( subfilters.length() > 1 || subfilters.value( 0 ).trimmed().length() > 0 )
     sf = subfilters.join( ") OR (" ).prepend( "(" ).append( ")" );
 
+  // Now join the subfilters with their parent (this) based on if
+  // * The parent is an else rule
+  // * The existence of parent filter and subfilters
+
   if ( isElse() )
   {
-    if ( !sf.length() )
+    if ( !sf.trimmed().length() )
       filter = "TRUE";
     else
       filter = sf;
   }
-  else if ( mFilterExp.length() && sf.length() )
+  else if ( mFilterExp.trimmed().length() && sf.trimmed().length() )
     filter = QString( "(%1) AND (%2)" ).arg( mFilterExp ).arg( sf );
-  else if ( mFilterExp.length() )
+  else if ( mFilterExp.trimmed().length() )
     filter = mFilterExp;
   else
     filter = sf;
+
+  filter = filter.trimmed();
+
   return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ bool QgsVectorLayerRenderer::render()`
`145`	`145`	`.setFilterRect( requestExtent )`
`146`	`146`	`.setSubsetOfAttributes( mAttrNames, mFields );`
`147`	`147`
`148`		`- if ( !rendererFilter.isNull() )`
	`148`	`+ if ( !rendererFilter.isEmpty() )`
`149`	`149`	`{`
`150`	`150`	`featureRequest.setFilterExpression( rendererFilter );`
`151`	`151`	`}`