Set the charset to the writer as well as is done in the reader

Update test containing text with special characters Decode the encoded text containing special characters
halestudio · Jul 6, 2023 · cf74501 · cf74501
1 parent 6817550
commit cf74501
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 17 deletions.
diff --git a/...boldt.hale.io.shp.test/src/eu/esdihumboldt/hale/io/shp/ShapefileInstanceWriterTest.groovy b/...boldt.hale.io.shp.test/src/eu/esdihumboldt/hale/io/shp/ShapefileInstanceWriterTest.groovy
@@ -25,6 +25,7 @@ import java.time.Instant
 import java.time.LocalDate
 import java.util.function.Consumer
 
+import org.geotools.data.shapefile.ShapefileDataStore
 import org.junit.Test
 import org.locationtech.jts.geom.Coordinate
 import org.locationtech.jts.geom.Geometry
@@ -184,9 +185,9 @@ class ShapefileInstanceWriterTest {
 		try {
 			println "Temporary file is $tmpFile"
 			writeInstances(tmpFile.toFile(), schema, instances, configurator)
-			handler.accept(tmpFile.toFile())
-
 			testCpgFileAgainstRelatedShapefile(tmpFile.toFile())
+
+			handler.accept(tmpFile.toFile())
 		} finally {
 			tmpDir.deleteDir()
 		}
@@ -213,9 +214,9 @@ class ShapefileInstanceWriterTest {
 		try {
 			println "Temporary file is $tmpFile"
 			writeInstancesWithReporterErrors(tmpFile.toFile(), schema, instances, configurator)
-			handler.accept(tmpFile.toFile())
-
 			testCpgFileAgainstRelatedShapefile(tmpFile.toFile())
+
+			handler.accept(tmpFile.toFile())
 		} finally {
 			tmpDir.deleteDir()
 		}
@@ -294,6 +295,7 @@ class ShapefileInstanceWriterTest {
 			// load instances again and test
 
 			def loaded = loadInstances(file)
+			ShapefileDataStore shapeFileDataStore = new ShapefileDataStore(file.toURL())
 
 			int num = 0
 			loaded.iterator().withCloseable {
@@ -311,16 +313,18 @@ class ShapefileInstanceWriterTest {
 					def jts = the_geom.geometry
 					assert jts instanceof Point
 					def name = inst.p.name.value()
-					assert name
-					switch (name) {
+
+					String dencodedString = new String(name.getBytes(shapeFileDataStore.getCharset()));
+					assert dencodedString
+					switch (dencodedString) {
 						case 'Darmstadt':
 							assert inst.p.population.value() == 158254
 							break
 						case 'München':
 							assert inst.p.population.value() == 1471508
 							break
 						default:
-							throw new IllegalStateException("Unexpected type $typeName")
+							throw new IllegalStateException("Unexpected type $dencodedString")
 					}
 				}
 			}
@@ -367,6 +371,7 @@ class ShapefileInstanceWriterTest {
 			// load instances again and test
 
 			def loaded = loadInstances(file)
+			ShapefileDataStore shapeFileDataStore = new ShapefileDataStore(file.toURL())
 
 			int num = 0
 			loaded.iterator().withCloseable {
@@ -386,8 +391,9 @@ class ShapefileInstanceWriterTest {
 
 					assert jts instanceof MultiPolygon
 					def name = inst.p.name.value()
-					assert name
-					switch (name) {
+					String dencodedString = new String(name.getBytes(shapeFileDataStore.getCharset()));
+					assert dencodedString
+					switch (dencodedString) {
 						case 'Darmstadt':
 							assert inst.p.population.value() == 158254
 							break
@@ -440,6 +446,7 @@ class ShapefileInstanceWriterTest {
 			int num = 0
 			for (geom in geomNames) {
 				def loaded = loadInstances(file, geom)
+				ShapefileDataStore shapeFileDataStore = new ShapefileDataStore(file.toURL())
 
 				loaded.iterator().withCloseable {
 					while (it.hasNext()) {
@@ -457,8 +464,9 @@ class ShapefileInstanceWriterTest {
 						def jts = the_geom.geometry
 						assert jts
 						def name = inst.p.name.value()
-						assert name
-						switch (name) {
+						String dencodedString = new String(name.getBytes(shapeFileDataStore.getCharset()));
+						assert dencodedString
+						switch (dencodedString) {
 							case 'Darmstadt':
 								assert inst.p.population.value() == 158254
 								break
@@ -1176,6 +1184,7 @@ class ShapefileInstanceWriterTest {
 		withNewShapefile(schema, instances) { file ->
 			// load instances again and test
 			def loaded = loadInstances(file)
+			ShapefileDataStore shapeFileDataStore = new ShapefileDataStore(file.toURL())
 
 			int num = 0
 			loaded.iterator().withCloseable {
@@ -1196,8 +1205,9 @@ class ShapefileInstanceWriterTest {
 					def jts = geom.geometry
 					assert jts instanceof Point
 					def name = inst.p.name.value()
-					assert name
-					switch (name) {
+					String dencodedString = new String(name.getBytes(shapeFileDataStore.getCharset()));
+					assert dencodedString
+					switch (dencodedString) {
 						case 'Darmstadt':
 							assert inst.p.population.value() == 158254
 							break
@@ -1357,6 +1367,7 @@ class ShapefileInstanceWriterTest {
 			// load instances again and test
 
 			def loaded = loadInstances(file)
+			ShapefileDataStore shapeFileDataStore = new ShapefileDataStore(file.toURL())
 
 			int num = 0
 			loaded.iterator().withCloseable {
@@ -1376,8 +1387,9 @@ class ShapefileInstanceWriterTest {
 
 					assert jts instanceof MultiPolygon
 					def name = inst.p.name.value()
-					assert name
-					switch (name) {
+					String dencodedString = new String(name.getBytes(shapeFileDataStore.getCharset()));
+					assert dencodedString
+					switch (dencodedString) {
 						case 'Darmstadt':
 							assert inst.p.po12.value() == 158254
 							break
@@ -1431,6 +1443,7 @@ class ShapefileInstanceWriterTest {
 			// load instances again and test
 
 			def loaded = loadInstances(file)
+			ShapefileDataStore shapeFileDataStore = new ShapefileDataStore(file.toURL())
 
 			int num = 0
 			loaded.iterator().withCloseable {
@@ -1450,8 +1463,9 @@ class ShapefileInstanceWriterTest {
 
 					assert jts instanceof MultiPolygon
 					def name = inst.p.name.value()
-					assert name
-					switch (name) {
+					String dencodedString = new String(name.getBytes(shapeFileDataStore.getCharset()));
+					assert dencodedString
+					switch (dencodedString) {
 						case 'München':
 							assert inst.p.po12.value() == 1471508
 							break

diff --git a/...ihumboldt.hale.io.shp/src/eu/esdihumboldt/hale/io/shp/writer/ShapefileInstanceWriter.java b/...ihumboldt.hale.io.shp/src/eu/esdihumboldt/hale/io/shp/writer/ShapefileInstanceWriter.java
@@ -461,6 +461,7 @@ private Map<String, Map<String, ShapefileDataStore>> createSchema(URI location,
 				ShapefileDataStore newDataStore;
 
 				newDataStore = (ShapefileDataStore) dataStoreFactory.createNewDataStore(params);
+				newDataStore.setCharset(getCharset());
 				newDataStore.createSchema(geometryEntry.getValue());
 				schemaDataStoreMap
 						.computeIfAbsent(schemaEntry.getKey(),