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

Timestamp:

2012-03-26T18:20:51+02:00 (13 years ago)

Author:

oliverw

Message:

• Bugfix #7549: Plugin crashes, when importing TCX files
• Some minor refactorings

Location:

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

Files:

• ElevationProfilePlugin.java (modified) (1 diff)
• gui/DefaultElevationProfileRenderer.java (modified) (2 diffs)
• gui/ElevationProfileLayer.java (modified) (3 diffs)

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

@@ -46 +46 @@
                         eleMode = new ElevationMapMode("Elevation profile", Main.map);
                         eleModeButton = new IconToggleButton(eleMode);
-                        eleModeButton.setAutoHideDisabledButton(true);
                 } catch (Exception e1) {
                         System.err.println("Init of ElevationProfilePlugin failed: " + e1);

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

@@ -35 +35 @@
 import org.openstreetmap.josm.plugins.elevation.IElevationProfile;
 import org.openstreetmap.josm.plugins.elevation.WayPointHelper;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -133 +134 @@
                         MapView mv, WayPoint wpt, ElevationWayPointKind kind) {
 
-                if (mv == null || profile == null || wpt == null) {
+                CheckParameterUtil.ensureParameterNotNull(g, "graphics");
+                CheckParameterUtil.ensureParameterNotNull(profile, "profile");
+                CheckParameterUtil.ensureParameterNotNull(mv, "map view");
+                                
+                if (wpt == null) {
                         System.err.println(String.format(
-                                        "Cannot paint: mv=%s, prof=%s, wpt=%s", mv, profile, wpt));
-                        if (wpt == null) {
-                                throw new RuntimeException("WPT must not be null, profile " + profile);
-                        }
+                                        "Cannot paint: mv=%s, prof=%s, wpt=%s", mv, profile, wpt));                     
                         return;
                 }

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

@@ -43 +43 @@
 public class ElevationProfileLayer extends
 org.openstreetmap.josm.gui.layer.Layer implements IElevationProfileSelectionListener {
+        private static final double Level_Factor = 100.0;
         private IElevationProfile profile;
         private IElevationProfileRenderer renderer = new DefaultElevationProfileRenderer();
@@ -159 +160 @@
                 renderer.beginRendering();
                 if (profile != null) {                  
+                        // paint way points one by one
                         for (WayPoint wpt : profile.getWayPoints()) {
                                 int ele = (int) WayPointHelper.getElevation(wpt);
 
                                 if (lastWpt != null) {
-                                        /*
-                                        int h1 = WayPointHelper.getHourOfWayPoint(wpt);
-                                        int h2 = WayPointHelper.getHourOfWayPoint(lastWpt);
-                                        */
-                                        int ele1 = (int)(ele / 100.0);
-                                        int ele2 = (int)(lastEle / 100.0);
+                                        // normalize to levels
+                                        int ele1 = (int)(ele / Level_Factor);
+                                        int ele2 = (int)(lastEle / Level_Factor);
                                         
-                                        // Check, if we passed an elevation level
+                                        // plain way point by default
+                                        ElevationWayPointKind kind = ElevationWayPointKind.Plain;
+                                        // check, if we passed an elevation level
+                                        // We assume, that we cannot pass more than one levels between two way points ;-)
                                         if (ele1 != ele2 && Math.abs(ele1 - ele2) == 1) { 
                                                 if (ele1 > ele2) { // we went down?
-                                                        renderer.renderWayPoint(g, profile, mv, wpt,
-                                                                ElevationWayPointKind.ElevationLevelGain);
+                                                        kind =ElevationWayPointKind.ElevationLevelGain; 
                                                 } else {
-                                                        renderer.renderWayPoint(g, profile, mv, wpt,
-                                                                        ElevationWayPointKind.ElevationLevelLoss);
+                                                        kind =ElevationWayPointKind.ElevationLevelLoss;
                                                 }
                                         } else { // check for elevation gain or loss
                                                 if (ele > lastEle) { // we went down?
-                                                        renderer.renderWayPoint(g, profile, mv, wpt,
-                                                                        ElevationWayPointKind.ElevationGain);
+                                                        kind =ElevationWayPointKind.ElevationGain;
                                                 } else {
-                                                        renderer.renderWayPoint(g, profile, mv, wpt,
-                                                                        ElevationWayPointKind.ElevationLoss);
+                                                        kind =ElevationWayPointKind.ElevationLoss;
                                                 }
                                         }
+                                        
+                                        // render way point
+                                        renderer.renderWayPoint(g, profile, mv, wpt, kind);
                                 }
 
@@ -194 +195 @@
                                 lastWpt = wpt;
                         }
-
+                        
+                        // now we paint special way points in emphasized style 
+                        
                         // paint selected way point, if available
                         if (selWayPoint != null) {