Merge pull request #92 from davidmoten/intersect-with-zero-area-rect

fix intersection with zero area rectangles

Author: davidmoten

.travis.yml

@@ -1,10 +1,6 @@
 language: java
-dist: precise
 jdk:
-  - oraclejdk8
-  - oraclejdk7
-  - openjdk7
-  - openjdk6
+  - openjdk8
 
 # Workaround for buffer overflow with openjdk6
 # https://github.com/travis-ci/travis-ci/issues/5227

pom.xml

@@ -160,6 +160,13 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+            <optional>true</optional>
+        </dependency>
+
     </dependencies>
 
     <profiles>

src/main/java/com/github/davidmoten/rtree/internal/RectangleUtil.java

@@ -1,5 +1,7 @@
 package com.github.davidmoten.rtree.internal;
 
+import java.awt.geom.Line2D;
+
 public final class RectangleUtil {
 
     private RectangleUtil() {
@@ -37,8 +39,14 @@ private RectangleUtil() {
      * @since 1.2
      */
     public static final int OUT_BOTTOM = 8;
-
-    public static boolean rectangleIntersectsLine(double rectX, double rectY, double rectWidth,
+    
+    public static boolean rectangleIntersectsLine(double rectX, double rectY, double rectWidth, double rectHeight,
+            double x1, double y1, double x2, double y2) {
+        return _rectangleIntersectsLine(rectX, rectY, rectWidth, rectHeight, x1, y1, x2, y2)
+                || Line2D.Double.linesIntersect(rectX, rectY, rectX + rectWidth, rectY + rectHeight, x1, y1, x2, y2);
+    }
+    
+    private static boolean _rectangleIntersectsLine(double rectX, double rectY, double rectWidth,
             double rectHeight, double x1, double y1, double x2, double y2) {
         if (rectangleCornerOnSegment(rectX, rectY, rectWidth, rectHeight, x1, y1, x2, y2)) {
             return true;

src/test/java/com/github/davidmoten/rtree/RTreeTest.java

@@ -1140,5 +1140,5 @@ public void testSearchGreekEarthquakesDouble() {
                 .assertValueCount(22) //
                 .assertCompleted();
     }
-
+    
 }

src/test/java/com/github/davidmoten/rtree/geometry/LineTest.java

@@ -5,6 +5,9 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import java.awt.geom.Line2D;
+import java.awt.geom.Rectangle2D;
+
 import org.junit.Test;
 
 public final class LineTest {
@@ -190,6 +193,35 @@ public void testLineDoesNotIntersectsPoint() {
     @Test
     public void testLineDoesIntersectPoint() {
         assertTrue(Geometries.line(1.5, 1.5, 2.5, 2.5).intersects(point(2, 2)));
+        Rectangle2D d;
+    }
+    
+    @Test
+    public void testLineDoubleIntersectsWithHorizontalLine() {
+        {  // test expectation on Line2D.Double.intersectsLine which we depend on 
+            Line2D.Double line = new Line2D.Double(35.0d, -25.0d, 45.0d, -25.0d);
+            assertTrue(line.intersectsLine(40.0d, -20.0d, 45.0d, -40.0d));
+        }
+        {
+            Line line = Geometries.line(40.0d, -20.0d, 45.0d, -40.0d);
+            Line horizontalLine = Geometries.line(35.0d, -25.0d, 45.0d, -25.0d);
+            
+            assertTrue(line.intersects(horizontalLine.mbr()));
+        }
+    }
+    
+    @Test
+    public void testLineFloatIntersectsWithHorizontalLine() {
+        {  // test expectation on Line2D.Double.intersectsLine which we depend on 
+            Line2D.Float line = new Line2D.Float(35.0f, -25.0f, 45.0f, -25.0f);
+            assertTrue(line.intersectsLine(40.0f, -20.0f, 45.0f, -40.0f));
+        }
+        {
+            Line line = Geometries.line(40.0f, -20.0f, 45.0f, -40.0f);
+            Line horizontalLine = Geometries.line(35.0f, -25.0f, 45.0f, -25.0f);
+            
+            assertTrue(line.intersects(horizontalLine.mbr()));
+        }
     }
 
 }