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

Timestamp:

2013-09-23T23:07:52+02:00 (11 years ago)

Author:

oliverw

Message:

[JOSM_ElevationProfile]: Redesign due to perf problems (see #josm8080)

Location:

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

Files:

• ElevationMapMode.java (modified) (1 diff)
• IElevationModelListener.java (modified) (1 diff)
• IElevationProfile.java (deleted)
• gpx/ElevationModel.java (modified) (7 diffs)
• gpx/ElevationProfileBase.java (modified) (7 diffs)
• gpx/ElevationProfileLeaf.java (deleted)
• gpx/ElevationProfileNode.java (deleted)
• gpx/IElevationModel.java (added)
• gpx/IElevationProfile.java (added)
• gpx/WayPointMap.java (added)
• gui/DefaultElevationProfileRenderer.java (modified) (1 diff)
• gui/ElevationProfileDialog.java (modified) (16 diffs)
• gui/ElevationProfileLayer.java (modified) (4 diffs)
• gui/ElevationProfilePanel.java (modified) (13 diffs)
• gui/IElevationProfileRenderer.java (modified) (1 diff)

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

@@ -21 +21 @@
 import org.openstreetmap.josm.actions.mapmode.MapMode;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.plugins.elevation.gpx.IElevationProfile;
 
 /**

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

@@ -16 +16 @@
 
 import org.openstreetmap.josm.plugins.elevation.gpx.ElevationModel;
+import org.openstreetmap.josm.plugins.elevation.gpx.IElevationProfile;
 
 /**

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

@@ -24 +24 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.plugins.elevation.IElevationModelListener;
-import org.openstreetmap.josm.plugins.elevation.IElevationProfile;
-import org.openstreetmap.josm.plugins.elevation.ElevationHelper;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
  * Represents the top-level part of the elevation model. The elevation model
- * breaks done into the tracks/routes of a GPX file (see
- * {@link ElevationProfileNode}). Each track is divided into 'slices' (see
- * {@link ElevationProfileLeaf}) - a set of fixed number of way points. This
- * structure allows as well an overview over a single track as a detailed
- * elevation view of a track part.
+ * breaks done into the tracks/routes of a GPX file.
  * 
- * @see ElevationProfileNode
- * @see ElevationProfileLeaf
  * @see IElevationModelTrackListener
- * @see IElevationModelSliceListener
  * @author Oliver Wieland <oliver.wieland@online.de>
  */
-public class ElevationModel extends ElevationProfileBase implements IGpxVisitor {
+public class ElevationModel implements IGpxVisitor, IElevationModel {
         // private int sliceSize;
         private int trackCounter;
         private GpxData gpxData;
 
-        private List<IElevationProfile> tracks;
-        private List<WayPoint> buffer = new ArrayList<WayPoint>(1000);
-        private List<WayPoint> tmpWaypoints = new ArrayList<WayPoint>(1000);
-
+        private WayPointMap children = new WayPointMap(); 
         private List<IElevationModelListener> listeners = new ArrayList<IElevationModelListener>();
-
+        private List<WayPoint> buffer = new ArrayList<WayPoint>();
+        private int currentProfileIndex = 0;
+        
+
+        /**
+         * Instantiates a new elevation model.
+         */
         public ElevationModel() {
-                this("", null, 100);
-        }
-
-        public ElevationModel(String name, GpxData data, int sliceSize) {
-                super(name);
+                this("", null);
+        }
+
+        /**
+         * Instantiates a new elevation model.
+         *
+         * @param name the name of the model
+         * @param data the GPX data
+         */
+        public ElevationModel(String name, GpxData data) {
                 gpxData = data;
-                setSliceSize(Math.max(sliceSize, 100));
-        }
-
-        @Override
-        public void setSliceSize(int sliceSize) {
-
-                super.setSliceSize(sliceSize);
-
-                // FIXME: Listener should go in base class
-                updateElevationData();
-                fireModelChanged();
+                
+                GpxIterator.visit(data, this);          
         }
 
@@ -84 +75 @@
          * @return the tracks
          */
-        protected List<IElevationProfile> getTracks() {
-                return tracks;
-        }
-
-        /**
-         * Gets a flag indicating whether the associated way points contained
-         * elevation data or not. This is the case if min and max height or both
-         * zero.
-         * 
-         * @return
-         */
-        public boolean hasElevationData() {
-                return getMaxHeight() != getMinHeight();
+        protected WayPointMap getTracks() {
+                return children;
         }
 
@@ -102 +82 @@
          * Fires the 'model changed' event to all listeners.
          */
-        protected void fireModelChanged() {
+        protected void fireModelChanged() {             
                 for (IElevationModelListener listener : listeners) {
-                        listener.elevationProfileChanged(this);
+                    if (children != null && children.size() > 0)
+                        listener.elevationProfileChanged(getCurrentProfile());
                 }
         }
 
-        /**
-         * Adds a model listener to this instance.
-         * 
-         * @param listener
-         *            The listener to add.
-         */
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.elevation.gpx.IElevationModel#addModelListener(org.openstreetmap.josm.plugins.elevation.IElevationModelListener)
+         */
+        @Override
         public void addModelListener(IElevationModelListener listener) {
                 this.listeners.add(listener);
         }
 
-        /**
-         * Removes a model listener from this instance.
-         * 
-         * @param listener
-         *            The listener to remove.
-         */
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.elevation.gpx.IElevationModel#removeModelListener(org.openstreetmap.josm.plugins.elevation.IElevationModelListener)
+         */
+        @Override
         public void removeModelListener(IElevationModelListener listener) {
                 this.listeners.remove(listener);
         }
 
-        /**
-         * Removes all listeners from this instance.
-         */
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.elevation.gpx.IElevationModel#removeAllListeners()
+         */
+        @Override
         public void removeAllListeners() {
                 this.listeners.clear();
-        }
-
-        /**
-         * (Re)computes the elevation model.
-         */
-        private void computeProfile() {
-                if (gpxData == null)
-                        return; // nothing to do
-
-                trackCounter = 0;
-
-                super.updateValues();
-                if (tracks == null) {
-                        tracks = new ArrayList<IElevationProfile>();
-                } else {
-                        tmpWaypoints.clear();
-                        buffer.clear();
-                        tracks.clear();
-                }
-
-                setDistance(gpxData.length());  // get distance from GPX 
-                GpxIterator.visit(gpxData, this);
-
-                // reduce data
-                setWayPoints(ElevationHelper.downsampleWayPoints(tmpWaypoints,
-                                getSliceSize()), false);
-        }
-
-        /**
-         * Forces the model to refresh itself. Clients (e. g. UI widgets) may use
-         * this method to notify the model on UI changes.
-         */
-        public void updateElevationData() {
-                computeProfile();
         }
 
@@ -189 +133 @@
          */
         public void visit(GpxTrack track, GpxTrackSegment segment, WayPoint wp) {
+                // we ignore the segment here 
                 processWayPoint(wp);
         }
@@ -197 +142 @@
         @Override
         public void visit(WayPoint wp) {
-                super.visit(wp);
                 processWayPoint(wp);
         }
 
         public void start() {
-                buffer.clear();
+                children.clear();               
         }
 
@@ -211 +155 @@
         
         private void addTrackOrRoute(String trackName) {
-                if (getSliceSize() > 0) {
-                        ElevationProfileNode emt = new ElevationProfileNode(trackName,
-                                        this, buffer, getSliceSize());
-                        tracks.add(emt);
-                }
-                trackCounter++;
-                buffer.clear();
+                if (buffer.size() > 0) {
+                    
+                        System.out.println("Add track " + trackName + ", n =  " + buffer.size()); // TODO: Remove
+                        
+                        ElevationProfileBase ep = new ElevationProfileBase(trackName);
+                        ep.setWayPoints(buffer);
+                        ep.setName(trackName);
+                        children.add(ep);
+                        buffer.clear();
+                }
         }
 
@@ -226 +173 @@
                 
                 buffer.add(wp);
-                tmpWaypoints.add(wp);
-        }
-
-        /*
-         * (non-Javadoc)
-         * 
-         * @see
-         * org.openstreetmap.josm.plugins.elevation.ElevationProfileBase#getChildren
-         * ()
-         */
-        @Override
-        public List<IElevationProfile> getChildren() {
-                return tracks;
+        }
+
+        
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.elevation.gpx.IElevationModel#getProfiles()
+         */
+        @Override
+        public List<IElevationProfile> getProfiles() {
+                return children;
+        }
+
+        @Override
+        public IElevationProfile getCurrentProfile() {
+            if (currentProfileIndex < 0 || currentProfileIndex >= profileCount()) return null;
+            
+            return children.get(currentProfileIndex);
+        }
+
+        @Override
+        public void setCurrentProfile(IElevationProfile newProfile) {
+            CheckParameterUtil.ensureParameterNotNull(newProfile);
+            
+            if (!children.contains(newProfile)) {
+                children.add(newProfile);
+            }
+            
+            setCurrentProfile(children.indexOf(newProfile)); 
+        }
+
+        @Override
+        public void setCurrentProfile(int index) {
+            if (index < 0 || index >= profileCount()) throw new RuntimeException("Invalid arg for setCurrentProfile: " + index + ", value must be 0.." + profileCount());
+            
+            currentProfileIndex = index;
+            fireModelChanged();     
+        }
+
+        @Override
+        public int profileCount() {
+            return children != null ? children.size() : 0;
         }
 }

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

@@ -20 +20 @@
 
 import org.openstreetmap.josm.data.gpx.WayPoint;
-import org.openstreetmap.josm.plugins.elevation.IElevationProfile;
 import org.openstreetmap.josm.plugins.elevation.ElevationHelper;
 
@@ -43 +42 @@
  * 
  */
-public abstract class ElevationProfileBase implements IElevationProfile,
+public class ElevationProfileBase implements IElevationProfile,
                 IGpxWaypointVisitor {
         public static final int WAYPOINT_START = 0;
@@ -62 +61 @@
         private List<WayPoint> wayPoints;
         private int numWayPoints; // cached value
-        private int sliceSize;
         private int gain;
         private int lastEle;
@@ -93 +91 @@
                 this.name = name;
                 this.parent = parent;
-                this.sliceSize = sliceSize;
-                setWayPoints(wayPoints, true);
+                setWayPoints(wayPoints);
         }
 
@@ -225 +222 @@
          * @param wayPoints
          */
-        public void setWayPoints(List<WayPoint> wayPoints, boolean revisit) {
+        public void setWayPoints(List<WayPoint> wayPoints) {
                 if (this.wayPoints != wayPoints) {
                         this.wayPoints = new ArrayList<WayPoint>(wayPoints);
                         numWayPoints = wayPoints != null ? wayPoints.size() : 0;
-                        if (revisit) {                          
-                                updateValues();
-                        }
+                        updateValues();
+                        
                 }
         }
@@ -263 +259 @@
         }
 
-        /**
-         * Gets the slice size for the detail view.
-         * 
-         * @return
-         */
-        public int getSliceSize() {
-                return sliceSize;
-        }
-
-        /**
-         * Sets the desired size of the elevation profile.
-         */
-        public void setSliceSize(int sliceSize) {
-                if (this.sliceSize != sliceSize) {
-                        this.sliceSize = sliceSize;
-                }
-        }
-
         /*
          * (non-Javadoc)
@@ -298 +276 @@
          * org.openstreetmap.josm.plugins.elevation.IElevationProfile#getChildren()
          */
-        public abstract List<IElevationProfile> getChildren();
+        public List<IElevationProfile> getChildren() {
+            return null;
+        }
 
         /*

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

@@ -32 +32 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.plugins.elevation.IElevationProfile;
 import org.openstreetmap.josm.plugins.elevation.ElevationHelper;
 import org.openstreetmap.josm.plugins.elevation.gpx.ElevationWayPointKind;
+import org.openstreetmap.josm.plugins.elevation.gpx.IElevationProfile;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 

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

@@ -15 +15 @@
 package org.openstreetmap.josm.plugins.elevation.gui;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.BorderLayout;
 import java.awt.Font;
 import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
@@ -26 +26 @@
 import java.util.List;
 
-import javax.swing.ButtonGroup;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -34 +33 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
-import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.plugins.elevation.ElevationHelper;
 import org.openstreetmap.josm.plugins.elevation.IElevationModelListener;
-import org.openstreetmap.josm.plugins.elevation.ElevationHelper;
 import org.openstreetmap.josm.plugins.elevation.gpx.ElevationModel;
 import org.openstreetmap.josm.plugins.elevation.gpx.GeoidCorrectionKind;
+import org.openstreetmap.josm.plugins.elevation.gpx.IElevationModel;
+import org.openstreetmap.josm.plugins.elevation.gpx.IElevationProfile;
 import org.openstreetmap.josm.tools.Shortcut;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 /**
  * @author Oliver Wieland <oliver.wieland@online.de>
@@ -60 +59 @@
         private static final long serialVersionUID = -868463893732535577L;
         /* Elevation profile instance */
-        private ElevationModel profile;
+        private IElevationModel model;
         /* GPX data */
         private GpxLayer activeLayer = null;
@@ -73 +72 @@
         private JLabel totalTimeLabel;
         private JLabel distLabel;
-        private JRadioButton geoidNone;
-        private JRadioButton geoidAuto;
-        private JRadioButton geoidFixed;
-        private JTextField geoidFixedValue;
         /* Listener to the elevation model */
         private List<IElevationModelListener> listeners = new ArrayList<IElevationModelListener>();
@@ -160 +155 @@
                 dataPanel.add(totalTimeLabel);
 
-                // Geoid
-                JLabel geoidHead = new JLabel(tr("Geoid"));
-                geoidHead.setFont(getFont().deriveFont(Font.BOLD));
-                dataPanel.add(geoidHead);
-
-                geoidNone = new JRadioButton(tr("None"));
-                // TODO: Obtain value from preferences
-                geoidNone.setSelected(true);
-                geoidNone.addActionListener(new ActionListener() {
-                        public void actionPerformed(ActionEvent arg0) {
-                                ElevationHelper.setGeoidKind(GeoidCorrectionKind.None);
-                                geoidFixedValue.setEnabled(false);
-                                getModel().updateElevationData();
-                                updateView();
-                        }
-                });
-
-                geoidAuto = new JRadioButton(tr("Automatic"));
-                geoidAuto.addActionListener(new ActionListener() {
-                        public void actionPerformed(ActionEvent arg0) {
-                                ElevationHelper.setGeoidKind(GeoidCorrectionKind.Auto);
-                                geoidFixedValue.setEnabled(false);
-                                getModel().updateElevationData();
-                                updateView();
-                        }
-                });
-
-                geoidFixed = new JRadioButton(tr("Fixed value"));
-                geoidFixed.setEnabled(false);
-                geoidFixed.addActionListener(new ActionListener() {
-                        public void actionPerformed(ActionEvent arg0) {
-                                ElevationHelper.setGeoidKind(GeoidCorrectionKind.Fixed);
-                                geoidFixedValue.setEnabled(true);
-                                getModel().updateElevationData();
-                                updateView();
-                        }
-                });
-
-                // TODO: Obtain value from preferences
-                geoidFixedValue = new JTextField("0");
-                geoidFixedValue.setEnabled(false);
-                geoidFixedValue.setAlignmentX(RIGHT_ALIGNMENT);
-                ButtonGroup grp = new ButtonGroup();
-                grp.add(geoidAuto);
-                grp.add(geoidNone);
-                grp.add(geoidFixed);
-
-                dataPanel.add(geoidNone);
-                dataPanel.add(geoidAuto);
-                dataPanel.add(geoidFixed);
-                dataPanel.add(geoidFixedValue);
-                dataPanel.add(new JLabel(" m"));
-
                 add(dataPanel, BorderLayout.PAGE_END);
-                profile = new ElevationModel();
+                model = new ElevationModel();
 
                 profPanel = new ElevationProfilePanel(null);
                 add(profPanel, BorderLayout.CENTER);
                 profPanel.addComponentListener(this);
-
-                if (ElevationHelper.getGeoidKind() == GeoidCorrectionKind.Auto) {
-                        geoidAuto.setSelected(true);
-                }
-                if (ElevationHelper.getGeoidKind() == GeoidCorrectionKind.Fixed) {
-                        geoidFixed.setSelected(true);
-                }
                 
                 dock();
@@ -250 +185 @@
          * @return
          */
-        public ElevationModel getModel() {
-                return profile;
+        public IElevationModel getModel() {
+                return model;
         }
 
@@ -258 +193 @@
          * @param model The new model.
          */
-        public void setModel(ElevationModel model) {
-                if (this.profile != model) {
-                        this.profile = model;
+        public void setModel(IElevationModel model) {
+                if (this.model != model) {
+                        this.model = model;
                         profPanel.setElevationModel(model);
-                        
                         updateView();
                 }
@@ -294 +228 @@
          */
         private void updateView() {
+                if (model == null) return;
+
+                IElevationProfile profile = model.getCurrentProfile();
+
                 if (profile != null) {
-                        // Show name of profile in title 
-                        setTitle(String.format("%s: %s", tr("Elevation Profile"), profile.getName()));
-
-                        if (profile.hasElevationData()) {
-                                // Show elevation data
-                                minHeightLabel.setText(
-                                                ElevationHelper.getElevationText(profile.getMinHeight()));
-                                maxHeightLabel.setText(
-                                                ElevationHelper.getElevationText(profile.getMaxHeight()));
-                                avrgHeightLabel.setText(
-                                                ElevationHelper.getElevationText(profile.getAverageHeight()));
-                                elevationGainLabel.setText(
-                                                ElevationHelper.getElevationText(profile.getGain()));
-                        }
-                        
-                        // compute values for time and distance
-                        long diff = profile.getTimeDifference();
-                        long minutes = diff / (1000 * 60);
-                        long hours = minutes / 60;
-                        minutes = minutes % 60;
-                        
-                        double dist = profile.getDistance();
-
-                        totalTimeLabel.setText(String.format("%d:%d h", hours, minutes));
-                        distLabel.setText(NavigatableComponent.getSystemOfMeasurement().getDistText(dist));
+                    // Show name of profile in title 
+                    setTitle(String.format("%s: %s", tr("Elevation Profile"), profile.getName()));
+
+                    if (profile.hasElevationData()) {
+                        // Show elevation data
+                        minHeightLabel.setText(
+                                ElevationHelper.getElevationText(profile.getMinHeight()));
+                        maxHeightLabel.setText(
+                                ElevationHelper.getElevationText(profile.getMaxHeight()));
+                        avrgHeightLabel.setText(
+                                ElevationHelper.getElevationText(profile.getAverageHeight()));
+                        elevationGainLabel.setText(
+                                ElevationHelper.getElevationText(profile.getGain()));
+                    }
+
+                    // compute values for time and distance
+                    long diff = profile.getTimeDifference();
+                    long minutes = diff / (1000 * 60);
+                    long hours = minutes / 60;
+                    minutes = minutes % 60;
+
+                    double dist = profile.getDistance();
+
+                    totalTimeLabel.setText(String.format("%d:%d h", hours, minutes));
+                    distLabel.setText(NavigatableComponent.getSystemOfMeasurement().getDistText(dist));
                 } else { // no elevation data, -> switch back to empty view
-                        setTitle(String.format("%s: (No data)", tr("Elevation Profile")));
-                        
-                        minHeightLabel.setText(EMPTY_DATA_STRING);
-                        maxHeightLabel.setText(EMPTY_DATA_STRING);
-                        avrgHeightLabel.setText(EMPTY_DATA_STRING);
-                        elevationGainLabel.setText(EMPTY_DATA_STRING);
-                        totalTimeLabel.setText(EMPTY_DATA_STRING);
-                        distLabel.setText(EMPTY_DATA_STRING);
-                }
-                
+                    setTitle(String.format("%s: (No data)", tr("Elevation Profile")));
+
+                    minHeightLabel.setText(EMPTY_DATA_STRING);
+                    maxHeightLabel.setText(EMPTY_DATA_STRING);
+                    avrgHeightLabel.setText(EMPTY_DATA_STRING);
+                    elevationGainLabel.setText(EMPTY_DATA_STRING);
+                    totalTimeLabel.setText(EMPTY_DATA_STRING);
+                    distLabel.setText(EMPTY_DATA_STRING);
+                }
+
                 fireModelChanged();
-                repaint();
+                repaint();          
         }
 
@@ -340 +278 @@
         protected void fireModelChanged() {
                 for (IElevationModelListener listener : listeners) {
-                        listener.elevationProfileChanged(getModel());
+                        listener.elevationProfileChanged(getModel().getCurrentProfile());
                 }
         }
@@ -383 +321 @@
                 if (activeLayer != newLayer) {
                         activeLayer = newLayer;
-                        int slices = 250;
-                        if (profPanel != null && profPanel.getPlotArea().width > 0) {
-                                slices = profPanel.getPlotArea().width;
-                        }
-
+
+                        // layer does not exist -> create
                         if (!layerMap.containsKey(newLayer)) {
                                 GpxData gpxData = newLayer.data;
-                                ElevationModel em = new ElevationModel(newLayer.getName(),
-                                                gpxData, slices);
-                                layerMap.put(newLayer, em);
+                                ElevationModel newEM = new ElevationModel(newLayer.getName(),
+                                                gpxData);
+                                layerMap.put(newLayer, newEM);
                         }
                         
                         ElevationModel em = layerMap.get(newLayer);
-                        em.setSliceSize(slices);
                         setModel(em);                   
                 }
@@ -418 +352 @@
                         layerMap.remove(oldLayer);
                 }
+                
                 if (layerMap.size() == 0) {
                         setModel(null);
@@ -433 +368 @@
          */
         public void componentHidden(ComponentEvent e) {
-                // TODO Auto-generated method stub
-
         }
 
@@ -445 +378 @@
          */
         public void componentMoved(ComponentEvent e) {
-                // TODO Auto-generated method stub
-
         }
 
@@ -456 +387 @@
          */
         public void componentResized(ComponentEvent e) {
-                int slices = 100;
-                if (profPanel != null) {
-                        slices = profPanel.getPlotArea().width;
-                }
-
-                if (profile != null && profile.getSliceSize() != slices) {
-                        profile.setSliceSize(slices);
-                }
         }
 
@@ -474 +397 @@
          */
         public void componentShown(ComponentEvent e) {
-
         }
 }

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

@@ -29 +29 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.plugins.elevation.IElevationProfile;
 import org.openstreetmap.josm.plugins.elevation.ElevationHelper;
 import org.openstreetmap.josm.plugins.elevation.gpx.ElevationWayPointKind;
+import org.openstreetmap.josm.plugins.elevation.gpx.IElevationProfile;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -74 +74 @@
      */
     public void setProfile(IElevationProfile profile) {
-        this.profile = profile;
-        Main.map.repaint();
+        if (this.profile != profile) {
+                this.profile = profile;
+                Main.map.repaint();
+        }
     }
 
@@ -156 +158 @@
     public void paint(Graphics2D g, MapView mv, Bounds box) {
         WayPoint lastWpt = null;
-        int lastEle = 0;
 
         renderer.beginRendering();
@@ -173 +174 @@
 
                 // remember some things for next iteration
-                lastEle = (int) ElevationHelper.getElevation(wpt);
                 lastWpt = wpt;
             }

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

@@ -37 +37 @@
 
 import org.openstreetmap.josm.data.gpx.WayPoint;
-import org.openstreetmap.josm.plugins.elevation.IElevationProfile;
 import org.openstreetmap.josm.plugins.elevation.ElevationHelper;
 import org.openstreetmap.josm.plugins.elevation.gpx.ElevationWayPointKind;
+import org.openstreetmap.josm.plugins.elevation.gpx.IElevationModel;
+import org.openstreetmap.josm.plugins.elevation.gpx.IElevationProfile;
 
 /**
@@ -51 +52 @@
          */
         private static final long serialVersionUID = -7343429725259575319L;
-        private IElevationProfile profile;
+        private IElevationModel model;
         private Rectangle plotArea;
         private IElevationProfileRenderer renderer = new DefaultElevationProfileRenderer();
@@ -62 +63 @@
          * @param profile The elevation profile to show in the panel.
          */
-        public ElevationProfilePanel(IElevationProfile profile) {
+        public ElevationProfilePanel(IElevationModel profile) {
                 super();
-                this.profile = profile;
+                this.model = profile;
                 setDoubleBuffered(true);
                 setBackground(Color.WHITE);
@@ -76 +77 @@
          * @return
          */
-        public IElevationProfile getProfile() {
-                return profile;
+        public IElevationModel getProfile() {
+                return model;
         }
 
         /**
          * Sets the new elevation profile instance.
-         * @param profile
-         */
-        public void setElevationModel(IElevationProfile profile) {
-                if (this.profile != profile) {
-                        this.profile = profile;
+         * @param model
+         */
+        public void setElevationModel(IElevationModel model) {
+                if (this.model != model) {
+                        this.model = model;
                         invalidate();
                 }
@@ -121 +122 @@
         public void setSelectedIndex(int selectedIndex) {
                 this.selectedIndex = selectedIndex;
+                
+                if (model != null) {
+                    model.setCurrentProfile(selectedIndex);
+                }
         }
         
@@ -128 +133 @@
          */
         public WayPoint getSelectedWayPoint() {
-                if (this.selectedIndex != -1 && profile != null && profile.getWayPoints() != null && profile.getWayPoints().size() > this.selectedIndex) {
+                if (model == null) return null;
+                
+                IElevationProfile profile = model.getCurrentProfile();
+            
+                if (profile != null && profile.getWayPoints() != null && profile.getWayPoints().size() > this.selectedIndex) {
                         return profile.getWayPoints().get(this.selectedIndex);
                 } else {
@@ -190 +199 @@
         
                         
-                
-                        if (profile != null && profile.hasElevationData()) {
+                        if (model != null) {
+                            IElevationProfile profile = model.getCurrentProfile();
+                            if (profile != null && profile.hasElevationData()) {
                                 drawAlignedString(formatDate(profile.getStart()), 5, y1 + 5,
-                                                TextAlignment.Left, g);
+                                        TextAlignment.Left, g);
                                 drawAlignedString(formatDate(profile.getEnd()),
-                                                getPlotRight(), y1 + 5, TextAlignment.Right, g);
-                                
-                                
+                                        getPlotRight(), y1 + 5, TextAlignment.Right, g);
+
+
                                 drawProfile(g);
                                 drawElevationLines(g);
-                        } else {
+                            } else {
+                                // No profile or profile supports no elevation data
                                 drawAlignedString(tr("(No elevation data)"), getPlotHCenter(),
-                                                getPlotVCenter(), TextAlignment.Centered, g);
+                                        getPlotVCenter(), TextAlignment.Centered, g);
+                            }
                         }
                 } finally {
@@ -268 +280 @@
          */
         private void drawElevationLines(Graphics g) {
+                IElevationProfile profile = model.getCurrentProfile();
+            
                 double diff = profile.getHeightDifference();
 
@@ -373 +387 @@
         private int getYForEelevation(int elevation) {
                 int y1 = getPlotBottom();
+                
+                IElevationProfile profile = model.getCurrentProfile();
 
                 if (!profile.hasElevationData()) {
@@ -380 +396 @@
                 double diff = profile.getHeightDifference();
 
-                return y1
-                                - (int) Math
-                                                .round(((elevation - profile.getMinHeight()) / diff * plotArea.height));
+                return y1 - (int) Math.round(((elevation - profile.getMinHeight()) / diff * plotArea.height));
         }
 
@@ -391 +405 @@
          */
         private void drawProfile(Graphics g) {
+                IElevationProfile profile = model.getCurrentProfile();
+                
                 int n = Math.min(plotArea.width, profile.getNumberOfWayPoints());
+                
+                if (n == 0) return; // nothing to draw
+                // step size
+                int step = profile.getNumberOfWayPoints() / n;
 
                 // int y0 = plotArea.y + 1;
@@ -397 +417 @@
                 Color oldC = g.getColor();
 
-                for (int i = 0; i < n; i++) {
+                for (int i = 0; i < n; i += step) {
                         WayPoint wpt = profile.getWayPoints().get(i);
                         int eleVal = (int) ElevationHelper.getElevation(wpt);
@@ -418 +438 @@
                         g.setColor(c);
                         g.drawLine(x, yBottom, x, yEle);        
-                        
-                        int geoidVal = 0;
-                        switch(ElevationHelper.getGeoidKind()) {
-                                case Auto: geoidVal = ElevationHelper.getGeoidCorrection(wpt); break;
-                                case Fixed: // not impl
-                        }
-                        
                         g.setColor(ElevationColors.EPLightBlue);
-                        
-                        int yGeoid = getYForEelevation(eleVal - geoidVal);
-                        g.drawLine(x, Math.min(yGeoid, yBottom), x, yEle);
                 }
                 g.setColor(oldC);

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

@@ -20 +20 @@
 import org.openstreetmap.josm.data.gpx.WayPoint;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.plugins.elevation.IElevationProfile;
 import org.openstreetmap.josm.plugins.elevation.gpx.ElevationWayPointKind;
+import org.openstreetmap.josm.plugins.elevation.gpx.IElevationProfile;
 
 /**