Changeset 24033 in osm for applications/editors/josm/plugins/ElevationProfile

Timestamp:

2010-11-02T23:16:43+01:00 (14 years ago)

Author:

oliverw

Message:

Bugfix ##5598: Plugin crashed when GPX data contain anonymous time stamps or no elevation data.

Location:

applications/editors/josm/plugins/ElevationProfile

Files:

• images (modified) (1 prop)
• images/dialogs (modified) (1 prop)
• images/layer (modified) (1 prop)
• images/mapmode (modified) (1 prop)
• src/org/openstreetmap/josm/plugins/elevation/ElevationProfileBase.java (modified) (2 diffs)

applications/editors/josm/plugins/ElevationProfile/images

@@ -1 +1 @@
 Screenshot.png
+
+EelvationProfile-Icon.png
+
+Thumbs.db

@@ -1 +1 @@
 Screenshot.png
+
+EelvationProfile-Icon.png
+
+Thumbs.db

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationProfileBase.java

@@ -126 +126 @@
                         return;
 
-                start = new Date();
+                start = new Date();             
                 end = new Date(0L);
                 this.minHeight = Integer.MAX_VALUE;
@@ -136 +136 @@
                 for (WayPoint wayPoint : this.wayPoints) {
                         visit(wayPoint);
+                }
+                
+                if (this.minHeight == Integer.MAX_VALUE && this.maxHeight == Integer.MIN_VALUE) {
+                        // file does not contain elevation data at all
+                        minHeight = 0;
+                        maxHeight = 0;
+                        setMinWayPoint(wayPoints.get(0));
+                        setMaxWayPoint(wayPoints.get(n-1));
+                }               
+                
+                if (start.after(end) || start.equals(end)) {
+                        // GPX does not contain time stamps -> use sequential order
+                        setStart(wayPoints.get(0));
+                        setEnd(wayPoints.get(n-1));
                 }
                 

@@ -1 +1 @@
 Screenshot.png
+
+EelvationProfile-Icon.png
+
+Thumbs.db