[Fixes #255] Fix encoding for Shapefile uploads (#289)

Use SHAPE_ENCODING parameter to inform the ogr2ogr command of the encoding for the Shapefile so it can transform accordingly.

Author: marlowp

importer/handlers/shapefile/handler.py

@@ -164,7 +164,7 @@ def create_ogr2ogr_command(files, original_name, ovverwrite_layer, alternate):
         ):
             additional_options.append("-nlt PROMOTE_TO_MULTI")
         if encoding:
-            additional_options.append(f"-lco ENCODING={encoding}")
+            additional_options.append(f"--config SHAPE_ENCODING {encoding}")
 
         return (
             f"{base_command } -lco precision=no -lco GEOMETRY_NAME={BaseVectorFileHandler().default_geometry_column_name} "

importer/handlers/shapefile/tests.py

@@ -121,7 +121,7 @@ def test_should_create_ogr2ogr_command_with_encoding_from_cst(self):
             actual = self.handler.create_ogr2ogr_command(shp_with_cst, "a", False, "a")
 
             _file.assert_called_once_with(cst_file, "r")
-            self.assertIn("ENCODING=UTF-8", actual)
+            self.assertIn("--config SHAPE_ENCODING UTF-8", actual)
 
     @patch("importer.handlers.common.vector.Popen")
     def test_import_with_ogr2ogr_without_errors_should_call_the_right_command(