Fix #12154 - select by location not working when A covers B

The combination of touches+overlaps+contains is not enough if input layer
(where selection should be done) is completely within selection layer.

I have reintroduced "intersects" predicate and made it default.

The processing toolbox has an improved (fixed?) version but fTools
were not adapted at the same time

Author: wonder-sk

python/plugins/fTools/tools/doSelectByLocation.py

@@ -38,6 +38,7 @@ class Dialog(QDialog, Ui_Dialog):
     TOUCH = 1
     OVERLAP = 2
     WITHIN = 4
+    INTERSECT = 8
 
     def __init__(self, iface):
         QDialog.__init__(self, iface.mainWindow())
@@ -92,7 +93,9 @@ def _poly_lines_op(geomA,geomB):
             if geomA.disjoint(geomB):
                 return False
             intersects = False
-            if self.opFlags & self.TOUCH:
+            if self.opFlags & self.INTERSECT:
+                intersects |= geomA.intersects(geomB)
+            if not intersects and (self.opFlags & self.TOUCH):
                 intersects |= geomA.touches(geomB)
             if not intersects and (self.opFlags & self.OVERLAP):
                 if geomB.type() == QGis.Line or geomA.type() == QGis.Line:
@@ -116,6 +119,8 @@ def _sp_operator():
             self.opFlags |= self.OVERLAP
         if self.chkContains.checkState() == Qt.Checked:
             self.opFlags |= self.WITHIN
+        if self.chkIntersects.checkState() == Qt.Checked:
+            self.opFlags |= self.INTERSECT
 
         sp_operator = _sp_operator()
 

python/plugins/fTools/tools/frmSelectByLocation.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>423</width>
-    <height>308</height>
+    <width>534</width>
+    <height>321</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -19,20 +19,20 @@
   <property name="minimumSize">
    <size>
     <width>0</width>
-    <height>308</height>
+    <height>321</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
     <width>16777215</width>
-    <height>308</height>
+    <height>321</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>Select by location</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
     <layout class="QVBoxLayout" name="verticalLayout_2">
      <item>
       <widget class="QLabel" name="label_3">
@@ -46,7 +46,7 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0">
+   <item>
     <layout class="QVBoxLayout" name="verticalLayout_3">
      <item>
       <widget class="QLabel" name="label_4">
@@ -60,44 +60,48 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0">
-    <widget class="QCheckBox" name="chkTouches">
+   <item>
+    <widget class="QCheckBox" name="chkIntersects">
      <property name="text">
-      <string>Include input features that touch the selection features</string>
+      <string>Include input features that insersect the selection features</string>
      </property>
      <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item>
+    <widget class="QCheckBox" name="chkTouches">
+     <property name="text">
+      <string>Include input features that touch the selection features</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QCheckBox" name="chkOverlaps">
      <property name="text">
       <string>Include input features that overlap/cross the selection features</string>
      </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item>
     <widget class="QCheckBox" name="chkContains">
      <property name="text">
       <string>Include input features completely within the selection features</string>
      </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
     </widget>
    </item>
-   <item row="5" column="0">
+   <item>
     <widget class="QCheckBox" name="chkSelected">
      <property name="text">
       <string>Only selected features</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="0">
+   <item>
+    <widget class="QComboBox" name="cmbModify"/>
+   </item>
+   <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="QProgressBar" name="progressBar">
@@ -124,11 +128,19 @@
      </item>
     </layout>
    </item>
-   <item row="6" column="0">
-    <widget class="QComboBox" name="cmbModify"/>
-   </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>inPolygon</tabstop>
+  <tabstop>inPoint</tabstop>
+  <tabstop>chkIntersects</tabstop>
+  <tabstop>chkTouches</tabstop>
+  <tabstop>chkOverlaps</tabstop>
+  <tabstop>chkContains</tabstop>
+  <tabstop>chkSelected</tabstop>
+  <tabstop>cmbModify</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>