From aca75cfa6e16c021882f395844780d78670652e7 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Sun, 8 Apr 2018 09:58:06 +1000
Subject: [PATCH] [processing][grass] Fix use of v.external with ogr layers
 which do not support random read

These layers are not compatible with v.external, so we have to
use v.in.ogr for them
---
 .../processing/algs/grass7/Grass7Algorithm.py |  12 +++++
 .../testdata/expected/grass7/buffer_lines.dbf | Bin 0 -> 125 bytes
 .../testdata/expected/grass7/buffer_lines.prj |   1 +
 .../testdata/expected/grass7/buffer_lines.shp | Bin 0 -> 6132 bytes
 .../testdata/expected/grass7/buffer_lines.shx | Bin 0 -> 148 bytes
 .../grass7_algorithms_vector_tests.yaml       |  43 ++++++++++++------
 6 files changed, 42 insertions(+), 14 deletions(-)
 create mode 100644 python/plugins/processing/tests/testdata/expected/grass7/buffer_lines.dbf
 create mode 100644 python/plugins/processing/tests/testdata/expected/grass7/buffer_lines.prj
 create mode 100644 python/plugins/processing/tests/testdata/expected/grass7/buffer_lines.shp
 create mode 100644 python/plugins/processing/tests/testdata/expected/grass7/buffer_lines.shx

diff --git a/python/plugins/processing/algs/grass7/Grass7Algorithm.py b/python/plugins/processing/algs/grass7/Grass7Algorithm.py
index 06545bc1529..4e65153499f 100644
--- a/python/plugins/processing/algs/grass7/Grass7Algorithm.py
+++ b/python/plugins/processing/algs/grass7/Grass7Algorithm.py
@@ -63,6 +63,7 @@ from qgis.core import (Qgis,
                        QgsProcessingUtils,
                        QgsVectorLayer)
 from qgis.utils import iface
+from osgeo import ogr
 
 from processing.core.ProcessingConfig import ProcessingConfig
 
@@ -786,6 +787,17 @@ class Grass7Algorithm(QgsProcessingAlgorithm):
         if external is None:
             external = ProcessingConfig.getSetting(
                 Grass7Utils.GRASS_USE_VEXTERNAL)
+
+        # safety check: we can only use external for ogr layers which support random read
+        if external:
+            ds = ogr.Open(layer.source())
+            if ds is not None:
+                ogr_layer = ds.GetLayer()
+                if ogr_layer is None or not ogr_layer.TestCapability(ogr.OLCRandomRead):
+                    external = False
+            else:
+                external = False
+
         self.inputLayers.append(layer)
         self.setSessionProjectionFromLayer(layer)
         destFilename = 'vector_{}'.format(os.path.basename(getTempFilename()))
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/buffer_lines.dbf b/python/plugins/processing/tests/testdata/expected/grass7/buffer_lines.dbf
new file mode 100644
index 0000000000000000000000000000000000000000..d8e26c3d66be247a05f380e96a77db55f31365bc
GIT binary patch
literal 125
tcmZQBV_|1wU|?`$-~y6pAe@0AIk5yL=m%nO!gx@cR{;hLVGISLSpWnY3a<bF

literal 0
HcmV?d00001

diff --git a/python/plugins/processing/tests/testdata/expected/grass7/buffer_lines.prj b/python/plugins/processing/tests/testdata/expected/grass7/buffer_lines.prj
new file mode 100644
index 00000000000..a30c00a55de
--- /dev/null
+++ b/python/plugins/processing/tests/testdata/expected/grass7/buffer_lines.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137,298.257223563]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
\ No newline at end of file
diff --git a/python/plugins/processing/tests/testdata/expected/grass7/buffer_lines.shp b/python/plugins/processing/tests/testdata/expected/grass7/buffer_lines.shp
new file mode 100644
index 0000000000000000000000000000000000000000..372b6b49d01e4ba6f859b8caa5211cf82f4f461f
GIT binary patch
literal 6132
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

literal 0
HcmV?d00001

diff --git a/python/plugins/processing/tests/testdata/expected/grass7/buffer_lines.shx b/python/plugins/processing/tests/testdata/expected/grass7/buffer_lines.shx
new file mode 100644
index 0000000000000000000000000000000000000000..0ef33eecc89a7ca808f624d99feac695f0e93649
GIT binary patch
literal 148
zcmZQzQ0HR64!mA4Gcd3M<z~$Ufsgyoo&f=l1IA#W=8y&kA`aNKqlg+YFfb(m@iYbo
a#tjS%EM7qN1O^7Sdk{XyBnZvr2BHBXw-+)1

literal 0
HcmV?d00001

diff --git a/python/plugins/processing/tests/testdata/grass7_algorithms_vector_tests.yaml b/python/plugins/processing/tests/testdata/grass7_algorithms_vector_tests.yaml
index d753a6175b4..7d93dd1ce4c 100644
--- a/python/plugins/processing/tests/testdata/grass7_algorithms_vector_tests.yaml
+++ b/python/plugins/processing/tests/testdata/grass7_algorithms_vector_tests.yaml
@@ -3,18 +3,33 @@
 tests:
 
 # v.* modules
-#  - algorithm: grass7:r.plane
-#    name: GRASS7 r.plane
-#    params:
-#      GRASS_REGION_PARAMETER: 344500.0,358400.0,6682800.0,6693700.0
-#      azimuth: 125
-#      dip: 45
-#      easting: 351610
-#      elevation: 50
-#      northing: 6688312
-#      type: 1
-#    results:
-#      output:
-#        hash: a9326678c39b6f925e7f22f6e79a48217100071cc8af85d675f28462
-#        type: rasterhash
+  - algorithm: grass7:v.buffer
+    name: Buffer vectors
+    params:
+      -c: false
+      -s: false
+      -t: false
+      GRASS_MIN_AREA_PARAMETER: 0.0001
+      GRASS_OUTPUT_TYPE_PARAMETER: 0
+      GRASS_SNAP_TOLERANCE_PARAMETER: -1.0
+      angle: 0.0
+      cats: ''
+      distance: 0.1
+      input:
+        name: lines.gml
+        type: vector
+      scale: 1.0
+      tolerance: 0.01
+      type:
+      - 0
+      - 1
+      - 4
+      where: ''
+    results:
+      output:
+        name: expected/grass7/buffer_lines.shp
+        type: vector
+        compare:
+          geometry:
+            precision: 7