Changeset 29876 in osm

Timestamp:

2013-08-25T20:26:56+02:00 (11 years ago)

Author:

oliverw

Message:

• Read elevation data from external HGT file
• Code cleanup
• Changed icons slightly

Location:

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

Files:

• ElevationProfilePlugin.java (modified) (1 diff)
• HgtReader.java (added)
• WayPointHelper.java (modified) (4 diffs)
• gui/ElevationProfileLayer.java (modified) (1 diff)
• tests (added)
• tests/HgtReaderTest.java (added)

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

@@ -48 +48 @@
             e1.printStackTrace();
         }
+        
+        getPluginDir();
     }
 

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

@@ -21 +21 @@
 import java.util.Locale;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.gpx.WayPoint;
 
@@ -41 +42 @@
         };
         
+        
+        
         /**
          * The name of the elevation height of a way point.
@@ -49 +52 @@
                 
         private static GeoidCorrectionKind geoidKind = GeoidCorrectionKind.None;
-
+        
+        /** The HGT reader instance. */
+        private static HgtReader hgt = new HgtReader();
+        
         /**
          * Gets the current mode of GEOID correction.
@@ -217 +223 @@
         private static double getInternalElevation(WayPoint wpt) {
                 if (wpt != null) {
+                        // Try to read data from SRTM file
+                        // TODO: Option to switch this off
+                        double eleHgt = hgt.getElevationFromHgt(wpt.getCoor());
+                        
+                        if (!Double.isNaN(eleHgt)) {                        
+                            return eleHgt;
+                        }
+                    
                         if (!wpt.attr.containsKey(HEIGHT_ATTRIBUTE)) {
                                 return 0;

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

@@ -222 +222 @@
         // plain way point by default
         ElevationWayPointKind kind = ElevationWayPointKind.Plain;
-        System.out.println("Slope: " + slope + "%");
         
         // check, if we passed an elevation level