Adding parse gates for valid GeoJSON coordinates. Includes unit tests.

elastic · Nov 14, 2014 · 4993565 · 4993565
1 parent 345c06e
commit 4993565
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 6 deletions.
diff --git a/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java b/src/main/java/org/elasticsearch/common/geo/builders/ShapeBuilder.java
@@ -206,13 +206,17 @@ public String toString() {
     private static CoordinateNode parseCoordinates(XContentParser parser) throws IOException {
         XContentParser.Token token = parser.nextToken();
 
-        // Base case
-        if (token != XContentParser.Token.START_ARRAY) {
+        // Base cases
+        if (token != XContentParser.Token.START_ARRAY && 
+                token != XContentParser.Token.END_ARRAY && 
+                token != XContentParser.Token.VALUE_NULL) {
             double lon = parser.doubleValue();
             token = parser.nextToken();
             double lat = parser.doubleValue();
             token = parser.nextToken();
             return new CoordinateNode(new Coordinate(lon, lat));
+        } else if (token == XContentParser.Token.VALUE_NULL) {
+            return null;
         }
 
         List<CoordinateNode> nodes = new ArrayList<>();

diff --git a/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java b/src/test/java/org/elasticsearch/common/geo/GeoJSONShapeParserTests.java
@@ -158,8 +158,8 @@ public void testParse_polygonNoHoles() throws IOException {
     @Test
     public void testParse_invalidPolygon() throws IOException {
         /**
-         * TODO parser should fail if poly is not composed of an array of LinearRings
-         * This test only checks number of coordinates, not the validity of the LinearRing
+         * The following 3 test cases ensure proper error handling of invalid polygons 
+         * per the GeoJSON specification
          */
         // test case 1: create an invalid polygon with only 2 points
         String invalidPoly1 = XContentFactory.jsonBuilder().startObject().field("type", "polygon")
@@ -175,15 +175,52 @@ public void testParse_invalidPolygon() throws IOException {
         ElasticsearchGeoAssertions.assertValidParseException(parser);
 
         // test case 2: create an invalid polygon with only 1 point
-        String invalidPolyGeoJson1 = XContentFactory.jsonBuilder().startObject().field("type", "polygon")
+        String invalidPoly2 = XContentFactory.jsonBuilder().startObject().field("type", "polygon")
                 .startArray("coordinates")
                 .startArray()
                 .startArray().value(-74.011).value(40.753).endArray()
                 .endArray()
                 .endArray()
                 .endObject().string();
 
-        parser = JsonXContent.jsonXContent.createParser(invalidPolyGeoJson1);
+        parser = JsonXContent.jsonXContent.createParser(invalidPoly2);
+        parser.nextToken();
+        ElasticsearchGeoAssertions.assertValidParseException(parser);
+
+        // test case 3: create an invalid polygon with 0 points
+        String invalidPoly3 = XContentFactory.jsonBuilder().startObject().field("type", "polygon")
+                .startArray("coordinates")
+                .startArray()
+                .startArray().endArray()
+                .endArray()
+                .endArray()
+                .endObject().string();
+
+        parser = JsonXContent.jsonXContent.createParser(invalidPoly3);
+        parser.nextToken();
+        ElasticsearchGeoAssertions.assertValidParseException(parser);
+
+        // test case 4: create an invalid polygon with null value points
+        String invalidPoly4 = XContentFactory.jsonBuilder().startObject().field("type", "polygon")
+                .startArray("coordinates")
+                .startArray()
+                .startArray().nullValue().nullValue().endArray()
+                .endArray()
+                .endArray()
+                .endObject().string();
+
+        parser = JsonXContent.jsonXContent.createParser(invalidPoly4);
+        parser.nextToken();
+        ElasticsearchGeoAssertions.assertValidParseException(parser);
+
+        // test case 5: create an invalid polygon with 1 invalid LinearRing
+        String invalidPoly5 = XContentFactory.jsonBuilder().startObject().field("type", "polygon")
+                .startArray("coordinates")
+                .nullValue().nullValue()
+                .endArray()
+                .endObject().string();
+
+        parser = JsonXContent.jsonXContent.createParser(invalidPoly5);
         parser.nextToken();
         ElasticsearchGeoAssertions.assertValidParseException(parser);
     }