Changeset 2941 in josm for trunk/src/org

Timestamp:

2010-02-05T15:37:09+01:00 (15 years ago)

Author:

bastiK

Message:

fix gpx drawing ("intersects" is to strict on horizontal/vertical segments) (close #4478)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Bounds.java (modified) (1 diff)
• gui/layer/GpxLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Bounds.java

@@ -172 +172 @@
         return true;
     }
+    
+    /**
+     * The two bounds intersect? Compared to java Shape.intersects, if does not use
+     * the interior but the closure. (">=" instead of ">")
+     */
+    public boolean intersects(Bounds b) {
+            return b.getMax().lat() >= minLat &&
+                    b.getMax().lon() >= minLon &&
+                    b.getMin().lat() <= maxLat &&
+                    b.getMin().lon() <= maxLon;
+    }
+    
 
     /**

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -613 +613 @@
         for (GpxTrack trk: data.tracks) {
             for (GpxTrackSegment trkSeg: trk.getSegments()) {
-                if (trkSeg.getBounds().asRect().intersects(box.asRect())) {
+                if (trkSeg.getBounds().intersects(box)) {
                     visibleSegments.add(trkSeg.getWayPoints());
                 }