Changeset 23769 in osm

Timestamp:

2010-10-23T20:11:07+02:00 (14 years ago)

Author:

oliverw

Message:

Support also elevation values in feet.

Location:

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

Files:

• UnitMode.java (added)
• WayPointHelper.java (modified) (4 diffs)
• gui/DefaultElevationProfileRenderer.java (modified) (4 diffs)
• gui/ElevationProfileDialog.java (modified) (1 diff)
• gui/ElevationProfilePanel.java (modified) (2 diffs)

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

@@ -19 +19 @@
 import java.util.GregorianCalendar;
 import java.util.List;
+import java.util.Locale;
 
 import org.openstreetmap.josm.data.gpx.WayPoint;
@@ -27 +28 @@
  */
 public class WayPointHelper {
+        public static double METER_TO_FEET = 3.280948;
+        
+        /* Countries which use the imperial system instead of the metric system. */
+        private static String IMPERIAL_SYSTEM_COUNTRIES[] = {
+                "en_US",        /* USA */
+                "en_CA",        /* Canada */
+                "en_GB",        /* Great Britain */
+                "en_AU",        /* Australia */
+                "en_NZ",        /* New Zealand */
+//              "de_DE",        /* for testing only */
+                "en_ZA" /* South Africa */
+        };
+        
         /**
          * The name of the elevation height of a way point.
          */
         public static final String HEIGHT_ATTRIBUTE = "ele";
-
+        
+        private static UnitMode unitMode = UnitMode.NotSelected;
+                
         private static GeoidCorrectionKind geoidKind = GeoidCorrectionKind.None;
 
+        /**
+         * Gets the current mode of GEOID correction.
+         * @return
+         */
         public static GeoidCorrectionKind getGeoidKind() {
                 return geoidKind;
@@ -41 +61 @@
                 WayPointHelper.geoidKind = geoidKind;
         }
-
-        /**
-         * Gets the elevation (Z coordinate) of a JOSM way point.
+        
+        /**
+         * Gets the current unit mode (metric or imperial).
+         * @return
+         */
+        public static UnitMode getUnitMode() {
+                //TODO: Use this until /JOSM/src/org/openstreetmap/josm/gui/NavigatableComponent.java 
+                // has a an appropriate method 
+                
+                // unit mode already determined?
+                if (unitMode != UnitMode.NotSelected) {
+                        return unitMode;
+                }
+                
+                // Set default
+                unitMode = UnitMode.Metric;
+                
+                // Check if user could prefer imperial system 
+                Locale l = Locale.getDefault();         
+                for (int i = 0; i < IMPERIAL_SYSTEM_COUNTRIES.length; i++) {
+                        String ctry = l.toString();
+                        if (IMPERIAL_SYSTEM_COUNTRIES[i].equals(ctry)) {
+                                unitMode = UnitMode.Imperial;
+                        }
+                }
+                
+                return unitMode;
+        }
+        
+        /**
+         * Gets the unit string for elevation ("m" or "ft").
+         * @return
+         */
+        public static String getUnit() {                
+                switch (getUnitMode()) {
+                case Metric:
+                        return "m";
+                case Imperial:
+                        return "ft";
+                default:
+                        throw new RuntimeException("Invalid or unsupported unit mode: " + unitMode);
+                }
+        }
+        
+        /**
+         * Gets the elevation (Z coordinate) of a GPX way point in meter or feet (for
+         * US, UK, ZA, AU, NZ and CA). 
          * 
          * @param wpt
@@ -51 +115 @@
          */
         public static double getElevation(WayPoint wpt) {
+                double ele = getInternalElevation(wpt);
+
+                if (getUnitMode() == UnitMode.Imperial) {
+                                // translate to feet
+                                return ele * METER_TO_FEET;
+                }       
+                
+                return ele;
+        }
+        
+        /**
+         * Gets the elevation string for a given elevation, e. g "300m" or "800ft".
+         * @param elevation
+         * @return
+         */
+        public static String getElevationText(int elevation) {
+                return String.format("%d %s", elevation, getUnit());
+        }
+
+        /**
+         * Gets the elevation (Z coordinate) of a GPX way point.
+         * 
+         * @param wpt
+         *            The way point instance.
+         * @return The x coordinate or 0, if the given way point is null or contains
+         *         not height attribute.
+         */
+        private static double getInternalElevation(WayPoint wpt) {
                 if (wpt != null) {
                         if (!wpt.attr.containsKey(HEIGHT_ATTRIBUTE)) {

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

@@ -194 +194 @@
 
                 if (kind == ElevationWayPointKind.ElevationLevelGain) {
-                        drawLabelWithTriangle(String.format("%dm", ele), pnt.x, pnt.y
+                        drawLabelWithTriangle(WayPointHelper.getElevationText(ele), pnt.x, pnt.y
                                         + g.getFontMetrics().getHeight(), g, c, 8, 
                                         getColorForWaypoint(profile, wpt, ElevationWayPointKind.ElevationGain),
@@ -201 +201 @@
                 
                 if (kind == ElevationWayPointKind.ElevationLevelLoss) {
-                        drawLabelWithTriangle(String.format("%dm", ele), pnt.x, pnt.y
-                                        + g.getFontMetrics().getHeight(), g, c, 8, 
+                        drawLabelWithTriangle(WayPointHelper.getElevationText(ele), 
+                                        pnt.x, pnt.y+ g.getFontMetrics().getHeight(), g, c, 8, 
                                         getColorForWaypoint(profile, wpt, ElevationWayPointKind.ElevationLoss),
                                         TriangleDir.Down);
@@ -214 +214 @@
                         drawLabel(String.format("%02d:%02d", hour, min), pnt.x, pnt.y
                                         - g.getFontMetrics().getHeight() - 5, g);
-                        drawLabel(String.format("%dm", eleH), pnt.x, pnt.y
+                        drawLabel(WayPointHelper.getElevationText(eleH), pnt.x, pnt.y
                                         + g.getFontMetrics().getHeight() + 5, g);
                 }
@@ -262 +262 @@
                                 DefaultElevationProfileRenderer.TRIANGLE_BASESIZE);
 
-                drawLabel(String.format("%dm", eleH), pnt.x, pnt.y
+                drawLabel(WayPointHelper.getElevationText(eleH), pnt.x, pnt.y
                                 + g.getFontMetrics().getHeight(), g, c);
         }

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

@@ -292 +292 @@
                         // Show elevation data
                         minHeightLabel.setText(
-                                        NavigatableComponent.getSystemOfMeasurement().getDistText(profile.getMinHeight()));
+                                        WayPointHelper.getElevationText(profile.getMinHeight()));
                         maxHeightLabel.setText(
-                                        NavigatableComponent.getSystemOfMeasurement().getDistText(profile.getMaxHeight()));
+                                        WayPointHelper.getElevationText(profile.getMaxHeight()));
                         avrgHeightLabel.setText(
-                                        NavigatableComponent.getSystemOfMeasurement().getDistText(profile.getAverageHeight()));
+                                        WayPointHelper.getElevationText(profile.getAverageHeight()));
                         elevationGainLabel.setText(
-                                        NavigatableComponent.getSystemOfMeasurement().getDistText(profile.getGain()));
+                                        WayPointHelper.getElevationText(profile.getGain()));
                         }
                         

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

@@ -231 +231 @@
          * @param g The graphics context.
          * @return The resulting rectangle of the drawn string.
-         */
+         
         private void drawHCenteredString(String s, int x, int y, Graphics g) {
                 drawAlignedString(s, x, y, TextAlignment.Centered, g);
-        }
+        }*/
 
         /**
@@ -269 +269 @@
                         // check bounds
                         if (yLine <= getPlotBottom() && yLine >= getPlotTop()) {
-                                String txt = String.format("%dm", i);
+                                String txt = WayPointHelper.getElevationText(i);
                                 
                                 Rectangle r = drawAlignedString(txt, getPlotHCenter(), yLine - 2,