Fix KMLReader to read coordinates with whitespace (#1062)

locationtech · Jul 4, 2024 · 11813d3 · 11813d3
1 parent 8c71ae7
commit 11813d3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/modules/core/src/main/java/org/locationtech/jts/io/kml/KMLReader.java b/modules/core/src/main/java/org/locationtech/jts/io/kml/KMLReader.java
@@ -34,6 +34,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Constructs a {@link Geometry} object from the OGC KML representation.
@@ -44,6 +46,8 @@ public class KMLReader {
     private final GeometryFactory geometryFactory;
     private final Set<String> attributeNames;
 
+    private final Pattern whitespaceRegex = Pattern.compile("\\s+");
+
     private static final String POINT = "Point";
     private static final String LINESTRING = "LineString";
     private static final String POLYGON = "Polygon";
@@ -119,6 +123,8 @@ private Coordinate[] parseKMLCoordinates(XMLStreamReader xmlStreamReader) throws
         if (coordinates.isEmpty()) {
             raiseParseError("Empty coordinates");
         }
+        Matcher matcher= whitespaceRegex.matcher(coordinates.trim());
+        coordinates = matcher.replaceAll(" ");
 
         double[] parsedOrdinates = {Double.NaN, Double.NaN, Double.NaN};
         List<Coordinate> coordinateList = new ArrayList();

diff --git a/modules/core/src/test/java/org/locationtech/jts/io/kml/KMLReaderTest.java b/modules/core/src/test/java/org/locationtech/jts/io/kml/KMLReaderTest.java
@@ -20,9 +20,7 @@
 import org.locationtech.jts.geom.PrecisionModel;
 import org.locationtech.jts.io.ParseException;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
+import java.util.*;
 
 public class KMLReaderTest extends TestCase {
     public static void main(String args[]) {
@@ -131,6 +129,17 @@ public void testMultiGeometryWithAllPolygons() {
         );
     }
 
+    public void testCoordinatesWithWhitespace()
+    {
+        checkParsingResult(
+                "<LineString>" +
+                        "   <coordinates> 1.0,2.0" +
+                        "   -1.0,-2.0 </coordinates>" +
+                        "</LineString>",
+                "LINESTRING (1 2, -1 -2)",
+                new Map[]{null, null}
+        );
+    }
     public void testZ() {
         String kml = "<Point><coordinates>1.0,1.0,50.0</coordinates></Point>";
         KMLReader kmlReader = new KMLReader();
@@ -155,6 +164,7 @@ public void testPrecisionAndSRID() {
         }
     }
 
+
     public void testCoordinatesErrors() {
         checkExceptionThrown("<Point></Point>", "No element coordinates found in Point");
         checkExceptionThrown("<Point><coordinates></coordinates></Point>", "Empty coordinates");