locationtech · dr-jts · Aug 20, 2019 · Aug 20, 2019
diff --git a/...s/core/src/main/java/org/locationtech/jts/algorithm/locate/IndexedPointInAreaLocator.java b/...s/core/src/main/java/org/locationtech/jts/algorithm/locate/IndexedPointInAreaLocator.java
@@ -11,6 +11,7 @@
  */
 package org.locationtech.jts.algorithm.locate;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -106,11 +107,15 @@ public void visitItem(Object item)
 
   private static class IntervalIndexedGeometry
   {
-    private final SortedPackedIntervalRTree index= new SortedPackedIntervalRTree();
+    private boolean isEmpty = false;
+    private SortedPackedIntervalRTree index= new SortedPackedIntervalRTree();
 
     public IntervalIndexedGeometry(Geometry geom)
     {
-      init(geom);
+      if (geom.isEmpty())
+        isEmpty = true;
+      else
+        init(geom);
     }
 
     private void init(Geometry geom)
@@ -135,13 +140,18 @@ private void addLine(Coordinate[] pts)
 
     public List query(double min, double max)
     {
+     if (isEmpty) 
+        return new ArrayList();
+
       ArrayListVisitor visitor = new ArrayListVisitor();
       index.query(min, max, visitor);
       return visitor.getItems();
     }
 
     public void query(double min, double max, ItemVisitor visitor)
     {
+      if (isEmpty) 
+        return;
       index.query(min, max, visitor);
     }
   }

diff --git a/...ore/src/main/java/org/locationtech/jts/index/intervalrtree/SortedPackedIntervalRTree.java b/...ore/src/main/java/org/locationtech/jts/index/intervalrtree/SortedPackedIntervalRTree.java
@@ -38,6 +38,13 @@
 public class SortedPackedIntervalRTree 
 {
   private List leaves = new ArrayList();
+
+  /**
+   * If root is null that indicates
+   * that the tree has not yet been built,   
+   * OR nothing has been added to the tree.
+   * In both cases, the tree is still open for insertions.
+   */
 	private IntervalRTreeNode root = null;
 
 	public SortedPackedIntervalRTree()
@@ -63,7 +70,15 @@ public void insert(double min, double max, Object item)
 
   private void init()
   {
+    // already built
     if (root != null) return;
+
+    /**
+     * if leaves is empty then nothing has been inserted.
+     * In this case it is safe to leave the tree in an open state
+     */
+    if (leaves.size() == 0) return;
+
     buildRoot();
   }
 
@@ -134,7 +149,11 @@ private void printNode(IntervalRTreeNode node)
 	public void query(double min, double max, ItemVisitor visitor)
 	{
     init();
-
+
+    // if root is null tree must be empty
+    if (root == null) 
+      return;
+
 		root.query(min, max, visitor);
 	}
 

diff --git a/...re/src/test/java/org/locationtech/jts/algorithm/locate/IndexedPointInAreaLocatorTest.java b/...re/src/test/java/org/locationtech/jts/algorithm/locate/IndexedPointInAreaLocatorTest.java
@@ -14,6 +14,7 @@
 import org.locationtech.jts.algorithm.AbstractPointInRingTest;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.Location;
 import org.locationtech.jts.io.WKTReader;
 
 import junit.textui.TestRunner;
@@ -43,4 +44,13 @@ protected void runPtInRing(int expectedLoc, Coordinate pt, String wkt)
     assertEquals(expectedLoc, result);
   }
 
+   /**
+    * See JTS GH Issue #19.
+    * Used to infinite-loop on empty geometries.
+    * 
+    * @throws Exception
+    */
+   public void testEmpty() throws Exception {
+     runPtInRing(Location.EXTERIOR, new Coordinate(0,0), "POLYGON EMPTY");
+  }
 }
diff --git a/...src/test/java/org/locationtech/jts/index/intervalrtree/SortedPackedIntervalRTreeTest.java b/...src/test/java/org/locationtech/jts/index/intervalrtree/SortedPackedIntervalRTreeTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2016 Vivid Solutions.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+package org.locationtech.jts.index.intervalrtree;
+
+import org.locationtech.jts.index.ArrayListVisitor;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+public class SortedPackedIntervalRTreeTest extends TestCase {
+
+  public static void main(String args[]) {
+    TestRunner.run(SortedPackedIntervalRTreeTest.class);
+  }
+
+  public SortedPackedIntervalRTreeTest(String name) { super(name); }
+
+  /**
+   * See JTS GH Issue #19.
+   * Used to infinite-loop on empty geometries.
+   * 
+   */
+  public void testEmpty() {
+    SortedPackedIntervalRTree spitree = new SortedPackedIntervalRTree();
+    ArrayListVisitor visitor = new ArrayListVisitor();
+    spitree.query(0, 1, visitor);
+  }
+}