Changeset 602 in josm for trunk

Timestamp:

2008-04-12T11:21:26+02:00 (16 years ago)

Author:

ramack

Message:

• fix disappearing of gpx, when no draw.rawgps.max-line-length is set, reported by ael and Kai Stian Olstad, thanks for your help.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) (1 diff)

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

@@ -320 +320 @@
                                         if (lines && old != null) {
                                                 
-                                                // break out if a maxLineLength is set and the line is longer.
-                                            if (maxLineLength > -1){
-                                                if (trkPnt.latlon.distance(oldWp.latlon) < maxLineLength){
-                                                    g.drawLine(old.x, old.y, screen.x, screen.y);
-
-                                                    if (direction) {
-                                                        double t = Math.atan2(screen.y-old.y, screen.x-old.x) + Math.PI;
-                                                        g.drawLine(screen.x,screen.y, (int)(screen.x + 10*Math.cos(t-PHI)), (int)(screen.y + 10*Math.sin(t-PHI)));
-                                                        g.drawLine(screen.x,screen.y, (int)(screen.x + 10*Math.cos(t+PHI)), (int)(screen.y + 10*Math.sin(t+PHI)));
-                                                    }
-                                                }else{
-                                                    g.drawRect(screen.x, screen.y, 0, 0);
+                                            // draw line, if no maxLineLength is set or the line is shorter.
+                                            if (maxLineLength == -1 || trkPnt.latlon.distance(oldWp.latlon) <= maxLineLength){
+                                                g.drawLine(old.x, old.y, screen.x, screen.y);
+
+                                                if (direction) {
+                                                    double t = Math.atan2(screen.y-old.y, screen.x-old.x) + Math.PI;
+                                                    g.drawLine(screen.x,screen.y, (int)(screen.x + 10*Math.cos(t-PHI)), (int)(screen.y + 10*Math.sin(t-PHI)));
+                                                    g.drawLine(screen.x,screen.y, (int)(screen.x + 10*Math.cos(t+PHI)), (int)(screen.y + 10*Math.sin(t+PHI)));
                                                 }
+                                            }else{
+                                                g.drawRect(screen.x, screen.y, 0, 0);
                                             }