Changeset 29921 in osm for applications/editors/josm/plugins/ElevationProfile/src

Timestamp:

2013-09-08T19:49:30+02:00 (11 years ago)

Author:

oliverw

Message:

• Introduced ColorMap/interpolate elevation colors
• Introduced IVertexRenderer
• Renamed ElevationRenderer to GridRenderer

Location:

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

Files:

• ColorMap.java (added)
• ColoredElevationLayer.java (modified) (4 diffs)
• EleVertex.java (modified) (1 diff)
• ElevationHelper.java (modified) (1 diff)
• ElevationProfilePlugin.java (modified) (4 diffs)
• GridRenderer.java (moved) (moved from applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationRenderer.java ) (3 diffs)
• HgtReader.java (modified) (1 diff)
• IVertexRenderer.java (added)
• SimpleVertexRenderer.java (added)
• gui/ElevationColors.java (modified) (3 diffs)

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

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.elevation;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
-import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Point;
@@ -16 +14 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.plugins.elevation.gui.ElevationColors;
 import org.openstreetmap.josm.plugins.elevation.gui.Triangle;
 import org.openstreetmap.josm.tools.ImageProvider;
 
 public class ColoredElevationLayer extends Layer implements IEleRenderingListener {
-    private ElevationRenderer renderer;
-    
+    private GridRenderer gridRenderer;
+    private IVertexRenderer vertexRenderer;
 
     public ColoredElevationLayer(String name) {
         super(name);
 
-        // 
-        setOpacity(0.5);
+        // make this layer transparent by 20%
+        setOpacity(0.8);
+        vertexRenderer = new SimpleVertexRenderer();
     }
 
     @Override
     public void paint(Graphics2D g, MapView mv, Bounds box) {
-        if (renderer == null) {
-            renderer = new ElevationRenderer(getName(), box, this);
+        if (gridRenderer == null) {
+            gridRenderer = new GridRenderer(getName(), box, this);
             System.out.println("Start renderer...");
-            Main.worker.submit(renderer);
+            Main.worker.submit(gridRenderer);
         }
         
-        if (renderer.getVertices().size() > 0) {
-            BlockingDeque<EleVertex> list = renderer.getVertices();
+        if (gridRenderer.getVertices().size() > 0) {
+            BlockingDeque<EleVertex> list = gridRenderer.getVertices();
             for (EleVertex eleVertex : list) {
                 Point p0 = mv.getPoint(eleVertex.get(0));
@@ -47 +45 @@
                 Triangle t = new Triangle(p0, p1, p2);
                 
-                
-                //g.setColor(Color.magenta);
-                //g.draw(t);
-                g.setColor(ElevationColors.getElevationColor(eleVertex.getEle()));
+                // obtain vertex color
+                g.setColor(vertexRenderer.getElevationColor(eleVertex));
                 g.fill(t);
             }
@@ -106 +102 @@
     }
 
+    public IVertexRenderer getVertexRenderer() {
+        return vertexRenderer;
+    }
+
+    public void setVertexRenderer(IVertexRenderer vertexRenderer) {
+        this.vertexRenderer = vertexRenderer;
+    }
 }

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

@@ -107 +107 @@
         
         // TODO: Check for proper limit
-        return z < 75 || getArea() < (30 * 30); // = 3 * 25
+        return /*z < 75 || */getArea() < (30 * 30); // = 3 * 25
     }    
     

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

@@ -289 +289 @@
                         double eleHgt = hgt.getElevationFromHgt(ll);
                         
-                        System.out.println("Get elevation from HGT " + ll + " => " + eleHgt);
+                        //System.out.println("Get elevation from HGT " + ll + " => " + eleHgt);
                         if (isValidElevation(eleHgt)) {                     
                             return eleHgt;

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

@@ -15 +15 @@
 package org.openstreetmap.josm.plugins.elevation;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Color;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -25 +29 @@
 import org.openstreetmap.josm.plugins.elevation.gui.ElevationProfileDialog;
 import org.openstreetmap.josm.plugins.elevation.gui.ElevationProfileLayer;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -51 +54 @@
             JosmAction action = new AddElevationLayerAction();
             
+            createColorMaps();
+            
             MainMenu.add(Main.main.menu.viewMenu, action, false, 0);
-            
         } catch (Exception e1) {
             System.err.println("Init of ElevationProfilePlugin failed: " + e1);
@@ -89 +93 @@
         return currentLayer;
     }
+    
+    private void createColorMaps() {
+        // Data taken from http://proceedings.esri.com/library/userconf/proc98/proceed/to850/pap842/p842.htm
+        ColorMap.create("Physical_US",
+                new Color[]{
+                new Color(18,129,242),
+                new Color(113,153,89),
+                new Color(117,170,101),
+                new Color(149,190,113),
+                new Color(178,214,117),
+                new Color(202,226,149),
+                new Color(222,238,161),
+                new Color(242,238,161),
+                new Color(238,222,153),
+                new Color(242,206,133),
+                new Color(234,182,129),
+                new Color(218,157,121),
+                new Color(194,141,125),
+                new Color(214,157,145),
+                new Color(226,174,165),
+                new Color(222,186,182),
+                new Color(238,198,210),
+                new Color(255,206,226),
+                new Color(250,218,234),
+                new Color(255,222,230),
+                new Color(255,230,242),
+                new Color(255,242,255)
+                }, 
+                // elevation in meters - the page above uses feet, so these values differs slightly
+                new int[]{
+                -3000,
+                0,
+                150,
+                300,
+                450,
+                600,
+                750,
+                900,
+                1050,
+                1200,
+                1350,
+                1500,
+                1650,
+                1800,
+                1950,
+                2100,
+                2250,
+                2400,
+                2550,
+                2700,
+                2750,
+                3000            
+                }
+                );
+    }
 }

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

@@ -17 +17 @@
 import org.xml.sax.SAXException;
 
-public class ElevationRenderer extends PleaseWaitRunnable {
+public class GridRenderer extends PleaseWaitRunnable {
     private Bounds box;
     private IEleRenderingListener listener;
@@ -26 +26 @@
     private volatile boolean stop = false;
     
-    public ElevationRenderer(String title, Bounds box, IEleRenderingListener listener) {
+    public GridRenderer(String title, Bounds box, IEleRenderingListener listener) {
         this(title, NullProgressMonitor.INSTANCE, true, box, listener);
     }
 
-    public ElevationRenderer(String title, boolean ignoreException, Bounds box, IEleRenderingListener listener) {
+    public GridRenderer(String title, boolean ignoreException, Bounds box, IEleRenderingListener listener) {
         this(title, NullProgressMonitor.INSTANCE, ignoreException, box, listener);
     }
 
-    public ElevationRenderer(Component parent, String title,
+    public GridRenderer(Component parent, String title,
             boolean ignoreException, Bounds box) throws IllegalArgumentException {
         super(parent, title, ignoreException);
@@ -42 +42 @@
     }
 
-    public ElevationRenderer(String title, ProgressMonitor progressMonitor,
+    public GridRenderer(String title, ProgressMonitor progressMonitor,
             boolean ignoreException, Bounds box, IEleRenderingListener listener) {
         super(title, progressMonitor, ignoreException);

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

@@ -57 +57 @@
                 }
             } 
-            
-            System.out.println("Get elevation from HGT file " + file);
             
             // read elevation value

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

@@ -33 +33 @@
         public static Color EPMidBeige = new Color(227, 222, 215);
         
-                
+        // TODO: Move to ColorMap.java or delete it     
         static class ColorMapEntry {
             private int ele; // limit
@@ -52 +52 @@
         }
         
+        
+        
         private static ColorMapEntry[] colors = new ColorMapEntry[]{
                   new ColorMapEntry(new Color(0,128, 0), 0),  
@@ -62 +64 @@
                 };
         
-        public static Color interpolate(java.awt.Color c1, java.awt.Color c2) {
-            int r = (c1.getRed() + c2.getRed()) / 2;
-            int g = (c1.getGreen() + c2.getGreen()) / 2;
-            int b = (c1.getBlue() + c2.getBlue()) / 2;
-            return new Color(r, g, b);
-        }
-        
+                
         public static Color getElevationColor(double ele) {
             if (!ElevationHelper.isValidElevation(ele)) {