Changeset 23754 in osm for applications/editors/josm/plugins/ElevationProfile/src/org

Timestamp:

2010-10-22T21:24:32+02:00 (14 years ago)

Author:

oliverw

Message:

• Apply distance from GPX track instead of recomputing it
• Consider locale settings to show statistics

Location:

applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation

Files:

• ElevationModel.java (modified) (1 diff)
• ElevationProfileBase.java (modified) (3 diffs)
• gui/ElevationProfileDialog.java (modified) (3 diffs)

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

@@ -145 +145 @@
                 }
 
+                setDistance(gpxData.length());  // get distance from GPX 
                 GpxIterator.visit(gpxData, this);
 

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

@@ -135 +135 @@
                 gain = 0;
                 lastEle = 0;
-                dist = 0.0;
-
+                
                 for (WayPoint wayPoint : this.wayPoints) {
                         visit(wayPoint);
@@ -340 +339 @@
         @Override
         public double getDistance() {
-                return dist / 1000.0; // dist is in meters
+                return dist; // dist is in meters
+        }
+        
+        /**
+         * Sets the distance of the elevation profile.
+         * @param dist
+         */
+        protected void setDistance(double dist) {
+                this.dist = dist; 
         }
 
@@ -489 +496 @@
                 }
                 
-                // determine distance
+                /*
                 if (lastWayPoint != null) {
                         double d = wp.getCoor().greatCircleDistance(lastWayPoint.getCoor());
                         dist += d;
-                }
+                }*/
                 lastWayPoint = wp;
         }

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

@@ -41 +41 @@
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.MapView.EditLayerChangeListener;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
@@ -289 +290 @@
                 setTitle(String.format("%s: %s", tr("Elevation Profile"), profile.getName()));
                 
-                // TODO: Offer also ft here
                 if (profile.hasElevationData()) {
-                        minHeightLabel.setText(String.format("%d m", profile.getMinHeight()));
-                        maxHeightLabel.setText(String.format("%d m", profile.getMaxHeight()));
-                        avrgHeightLabel.setText(String.format("%d m", profile.getAverageHeight()));
-                        elevationGainLabel.setText(String.format("%d m", profile
-                                        .getGain()));
+                        // Show elevation data
+                        minHeightLabel.setText(
+                                        NavigatableComponent.getSystemOfMeasurement().getDistText(profile.getMinHeight()));
+                        maxHeightLabel.setText(
+                                        NavigatableComponent.getSystemOfMeasurement().getDistText(profile.getMaxHeight()));
+                        avrgHeightLabel.setText(
+                                        NavigatableComponent.getSystemOfMeasurement().getDistText(profile.getAverageHeight()));
+                        elevationGainLabel.setText(
+                                        NavigatableComponent.getSystemOfMeasurement().getDistText(profile.getGain()));
                 } else { // no elevation data
                         minHeightLabel.setText("-");
@@ -312 +316 @@
 
                 totalTimeLabel.setText(String.format("%d:%d h", hours, minutes));
-                distLabel.setText(String.format("%5.2f km", dist));
+                distLabel.setText(NavigatableComponent.getSystemOfMeasurement().getDistText(dist));
                 
                 fireModelChanged();