Changeset 2635 in josm for trunk

Timestamp:

2009-12-14T16:12:58+01:00 (15 years ago)

Author:

bastiK

Message:

fixed gpx-rendering error: Tracksegments should not be connected by a line (unless explicitly demanded by the user)

File:

• trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) (2 diffs)

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

@@ -535 +535 @@
          ********** STEP 2a - CHECK CACHE VALIDITY **********************
          ****************************************************************/
-        if (computeCacheInSync
-                && ((computeCacheMaxLineLengthUsed != maxLineLength) || (!neutralColor.equals(computeCacheColorUsed))
-                        || (computeCacheColored != colored) || (computeCacheColorTracksTune != colorTracksTune))) {
+        if ((computeCacheMaxLineLengthUsed != maxLineLength) || (!neutralColor.equals(computeCacheColorUsed))
+                        || (computeCacheColored != colored) || (computeCacheColorTracksTune != colorTracksTune)) {
             // System.out.println("(re-)computing gpx line styles, reason: CCIS=" +
             // computeCacheInSync + " CCMLLU=" + (computeCacheMaxLineLengthUsed != maxLineLength) +
@@ -555 +554 @@
             WayPoint oldWp = null;
             for (GpxTrack trk : data.tracks) {
-                if (!forceLines) { // don't draw lines between segments, unless forced to
-                    oldWp = null;
-                }
                 for (Collection<WayPoint> segment : trk.trackSegs) {
+                    if (!forceLines) { // don't draw lines between segments, unless forced to
+                        oldWp = null;
+                    }
                     for (WayPoint trkPnt : segment) {
                         LatLon c = trkPnt.getCoor();