Revert "[processing] Fix missing points in polygons menu item (fix #1…

…5670)" This reverts commit ba7fdde.
qgis · Oct 11, 2016 · a1367d4 · a1367d4
1 parent 8784ad0
commit a1367d4
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 220 deletions.
diff --git a/python/plugins/processing/gui/menus.py b/python/plugins/processing/gui/menus.py
@@ -19,7 +19,7 @@
 analysisToolsMenu = vectorMenu + "/" + Processing.tr('&Analysis Tools')
 defaultMenuEntries.update({'qgis:distancematrix': analysisToolsMenu,
                            'qgis:sumlinelengths': analysisToolsMenu,
-                           'qgis:countpointsinpolygon': analysisToolsMenu,
+                           'qgis:pointsinpolygon': analysisToolsMenu,
                            'qgis:listuniquevalues': analysisToolsMenu,
                            'qgis:basicstatisticsfornumericfields': analysisToolsMenu,
                            'qgis:basicstatisticsfortextfields': analysisToolsMenu,

diff --git a/python/plugins/processing/tests/testdata/expected/points_in_polys.gfs b/python/plugins/processing/tests/testdata/expected/points_in_polys.gfs
diff --git a/python/plugins/processing/tests/testdata/expected/points_in_polys.gml b/python/plugins/processing/tests/testdata/expected/points_in_polys.gml
diff --git a/python/plugins/processing/tests/testdata/points_in_polys.gfs b/python/plugins/processing/tests/testdata/points_in_polys.gfs
diff --git a/python/plugins/processing/tests/testdata/points_in_polys.gml b/python/plugins/processing/tests/testdata/points_in_polys.gml
diff --git a/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml b/python/plugins/processing/tests/testdata/qgis_algorithm_tests.yaml
@@ -582,20 +582,3 @@ tests:
       OUTPUT_LAYER:
         name: expected/point_on_line.gml
         type: vector
-
-
-
-  - algorithm: qgis:countpointsinpolygon
-    name: Count points in polygon
-    params:
-      FIELD: NUMPOINTS
-      POINTS:
-        name: points_in_polys.gml
-        type: vector
-      POLYGONS:
-        name: polys.gml
-        type: vector
-    results:
-      OUTPUT:
-        name: expected/points_in_polys.gml
-        type: vector