Merge pull request #14494 from dbaston/csv-dropped-geom-warning

CSV: Emit warning if geometry will be dropped

Author: rouault

autotest/ogr/ogr_csv.py

@@ -2628,6 +2628,7 @@ def test_ogr_csv_string_quoting_always(tmp_vsimem):
             "CREATE_CSVT=YES",
             "STRING_QUOTING=ALWAYS",
             "LINEFORMAT=LF",
+            "GEOMETRY=NONE",
         ],
     )
 
@@ -3582,7 +3583,9 @@ def test_ogr_csv_32_bit_integer_invalid_value(tmp_vsimem):
 def test_ogr_csv_do_not_write_header(tmp_vsimem):
 
     filename = tmp_vsimem / "test.csv"
-    gdal.VectorTranslate(filename, "data/poly.shp", layerCreationOptions=["HEADER=NO"])
+    gdal.VectorTranslate(
+        filename, "data/poly.shp", layerCreationOptions=["HEADER=NO", "GEOMETRY=NONE"]
+    )
     with ogr.Open(filename) as ds:
         lyr = ds.GetLayer(0)
         assert lyr.GetLayerDefn().GetFieldDefn(0).GetName() == "field_1"
@@ -3598,7 +3601,9 @@ def test_ogr_csv_open_dir(tmp_vsimem):
     dirname = tmp_vsimem / "my_dir"
     gdal.Mkdir(dirname, 0o755)
     gdal.VectorTranslate(
-        dirname / "test.csv", "data/poly.shp", layerCreationOptions=["CREATE_CSVT=YES"]
+        dirname / "test.csv",
+        "data/poly.shp",
+        layerCreationOptions=["CREATE_CSVT=YES", "GEOMETRY=NONE"],
     )
 
     with ogr.Open(dirname) as ds:
@@ -3645,6 +3650,24 @@ def test_ogr_csv_used_creation_option_instead_of_layer_creation_option(tmp_vsime
 ###############################################################################
 
 
+def test_ogr_csv_ignored_geometry_warning(tmp_vsimem):
+
+    errors = []
+
+    def test_handler(*args):
+        errors.append(args)
+
+    with gdaltest.error_handler(test_handler):
+        gdal.VectorTranslate(tmp_vsimem / "poly.csv", "data/poly.shp")
+
+    assert len(errors) == 1
+    assert errors[0][0] == gdal.CE_Warning
+    assert "GEOMETRY layer creation option not set" in errors[0][2]
+
+
+###############################################################################
+
+
 if __name__ == "__main__":
     gdal.UseExceptions()
     if len(sys.argv) != 2:

doc/source/drivers/vector/csv.rst

@@ -456,7 +456,8 @@ The following layer creation options are supported:
       value of **CRLF** (DOS format) or **LF** (Unix format).
 
 -  .. lco:: GEOMETRY
-      :choices: AS_WKT, AS_XYZ, AS_XY, AS_YX
+      :choices: AS_WKT, AS_XYZ, AS_XY, AS_YX, NONE
+      :default: NONE
 
       By default, the geometry of
       a feature written to a .csv file is discarded. It is possible to

ogr/ogrsf_frmts/csv/ogrcsvdatasource.cpp

@@ -1142,14 +1142,20 @@ OGRCSVDataSource::ICreateLayer(const char *pszLayerName,
                 return nullptr;
             }
         }
-        else
+        else if (!EQUAL(pszGeometry, "NONE"))
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Unsupported value %s for creation option GEOMETRY",
                      pszGeometry);
             return nullptr;
         }
     }
+    else if (eGType != wkbUnknown && eGType != wkbNone)
+    {
+        CPLError(CE_Warning, CPLE_AppDefined,
+                 "Requested to create spatial CSV layer but GEOMETRY layer "
+                 "creation option not set. No geometry will be output.");
+    }
 
     // Should we create a CSVT file?
     if (bCreateCSVT)

ogr/ogrsf_frmts/csv/ogrcsvdriver.cpp

@@ -351,6 +351,7 @@ void RegisterOGRCSV()
         "    <Value>AS_XYZ</Value>"
         "    <Value>AS_XY</Value>"
         "    <Value>AS_YX</Value>"
+        "    <Value>NONE</Value>"
         "  </Option>"
         "  <Option name='CREATE_CSVT' type='boolean' description='whether to "
         "create a .csvt file' default='NO'/>"